- remove usage of org.apache.commons.lang.StringUtils (except in libr…

…ary jenkins-client-0.3.8.jar
MCMicS · Oct 3, 2023 · fa87d57 · fa87d57
1 parent 6346a67
commit fa87d57
Show file tree

Hide file tree

Showing 30 changed files with 116 additions and 93 deletions.
diff --git a/src/main/java/org/codinjutsu/tools/jenkins/JenkinsAppSettings.java b/src/main/java/org/codinjutsu/tools/jenkins/JenkinsAppSettings.java
@@ -20,9 +20,9 @@
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.xmlb.XmlSerializerUtil;
 import lombok.Data;
-import org.apache.commons.lang.StringUtils;
 import org.codinjutsu.tools.jenkins.model.Build;
 import org.codinjutsu.tools.jenkins.model.BuildStatusEnum;
 import org.jetbrains.annotations.NotNull;
@@ -80,7 +80,7 @@ public void setServerUrl(String serverUrl) {
     @Deprecated(since = "0.13.18")
     public boolean isServerUrlSet() {
         final String serverUrl = myState.getServerUrl();
-        return StringUtils.isNotEmpty(serverUrl) && !DUMMY_JENKINS_SERVER_URL.equals(serverUrl);
+        return StringUtil.isNotEmpty(serverUrl) && !DUMMY_JENKINS_SERVER_URL.equals(serverUrl);
     }
 
     public int getBuildDelay() {

diff --git a/src/main/java/org/codinjutsu/tools/jenkins/JenkinsSettings.java b/src/main/java/org/codinjutsu/tools/jenkins/JenkinsSettings.java
@@ -23,11 +23,11 @@
 import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.components.StoragePathMacros;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.xmlb.XmlSerializerUtil;
 import com.intellij.util.xmlb.annotations.Attribute;
 import com.intellij.util.xmlb.annotations.Tag;
 import lombok.*;
-import org.apache.commons.lang.StringUtils;
 import org.codinjutsu.tools.jenkins.model.Job;
 import org.codinjutsu.tools.jenkins.security.JenkinsVersion;
 import org.codinjutsu.tools.jenkins.util.JobUtil;
@@ -89,12 +89,13 @@ public void setCrumbData(String crumbData) {
 
     public String getPassword() {
         String password = PasswordSafe.getInstance().getPassword(getPasswordCredentialAttributes());
-        return StringUtils.defaultIfEmpty(password, "");
+        return StringUtil.defaultIfEmpty(password, "");
     }
 
     @Deprecated
     public void setPassword(String password) {
-        PasswordSafe.getInstance().setPassword(getPasswordCredentialAttributes(), StringUtils.isNotBlank(password) ? password : "");
+        PasswordSafe.getInstance().setPassword(getPasswordCredentialAttributes(),
+                org.codinjutsu.tools.jenkins.util.StringUtil.isNotBlank(password) ? password : "");
     }
 
     @NotNull
@@ -135,7 +136,7 @@ public void setLastSelectedView(String viewName) {
     }
 
     public boolean isSecurityMode() {
-        return StringUtils.isNotBlank(getUsername());
+        return org.codinjutsu.tools.jenkins.util.StringUtil.isNotBlank(getUsername());
     }
 
     public JenkinsVersion getVersion() {

diff --git a/src/main/java/org/codinjutsu/tools/jenkins/logic/ConfigurationValidator.java b/src/main/java/org/codinjutsu/tools/jenkins/logic/ConfigurationValidator.java
@@ -2,10 +2,10 @@
 
 import com.intellij.openapi.components.Service;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.text.StringUtil;
 import lombok.Builder;
 import lombok.Singular;
 import lombok.Value;
-import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.net.URL;
@@ -56,15 +56,15 @@ private void validatePort(@NotNull ValidationResult.ValidationResultBuilder vali
 
     private void validateHost(@NotNull ValidationResult.ValidationResultBuilder validationResult,
                               @NotNull URL configuration, @NotNull URL jenkins, @NotNull URL configureUrl) {
-        if (!StringUtils.equals(configuration.getHost(), jenkins.getHost())) {
+        if (!StringUtil.equals(configuration.getHost(), jenkins.getHost())) {
             validationResult.error(String.format("Jenkins Server Host Mismatch: expected='%s' - actual='%s'. Look at the value of 'Jenkins URL' at %s",
                     configuration.getHost(), jenkins.getHost(), configureUrl));
         }
     }
 
     private void validateProtocol(@NotNull ValidationResult.ValidationResultBuilder validationResult,
                               @NotNull URL configuration, @NotNull URL jenkins, @NotNull URL configureUrl) {
-        if (!StringUtils.equals(configuration.getProtocol(), jenkins.getProtocol())) {
+        if (!StringUtil.equals(configuration.getProtocol(), jenkins.getProtocol())) {
             validationResult.error(String.format("Jenkins Server Protocol Mismatch: expected='%s' - actual='%s'. Look at the value of 'Jenkins URL' at %s",
                     configuration.getProtocol(), jenkins.getProtocol(), configureUrl));
         }
@@ -79,7 +79,7 @@ private void validatePath(@NotNull ValidationResult.ValidationResultBuilder vali
     }
 
     private boolean isSameUrlPath(@NotNull String leftUrl, @NotNull String rightUrl) {
-        return StringUtils.equals(urlBuilder.removeTrailingSlash(leftUrl), urlBuilder.removeTrailingSlash(rightUrl));
+        return StringUtil.equals(urlBuilder.removeTrailingSlash(leftUrl), urlBuilder.removeTrailingSlash(rightUrl));
     }
 
     @NotNull

diff --git a/src/main/java/org/codinjutsu/tools/jenkins/logic/JenkinsJsonParser.java b/src/main/java/org/codinjutsu/tools/jenkins/logic/JenkinsJsonParser.java
@@ -21,7 +21,7 @@
 import com.github.cliftonlabs.json_simple.JsonObject;
 import com.github.cliftonlabs.json_simple.Jsoner;
 import com.intellij.openapi.diagnostic.Logger;
-import org.apache.commons.lang.StringUtils;
+import com.intellij.openapi.util.text.StringUtil;
 import org.apache.commons.lang3.ObjectUtils;
 import org.codinjutsu.tools.jenkins.exception.JenkinsPluginRuntimeException;
 import org.codinjutsu.tools.jenkins.model.*;
@@ -74,7 +74,8 @@ public Jenkins createWorkspace(String jsonData) {
         final JsonObject jsonObject = parseJson(jsonData);
         final Optional<View> primaryView = Optional.ofNullable((JsonObject) jsonObject.get(PRIMARY_VIEW)).map(this::getView);
 
-        final String description = getNonNullStringOrDefaultForNull(jsonObject, SERVER_DESCRIPTION, StringUtils.EMPTY);
+        final String description = getNonNullStringOrDefaultForNull(jsonObject, SERVER_DESCRIPTION,
+                org.codinjutsu.tools.jenkins.util.StringUtil.EMPTY);
         final String jenkinsUrl = urlMapper.apply(getServerUrl(jsonObject));
         final Jenkins jenkins = new Jenkins(description, jenkinsUrl);
         primaryView.ifPresent(jenkins::setPrimaryView);
@@ -371,7 +372,8 @@ private JobParameter getJobParameter(JsonObject parameterObj) {
             jobParameterBuilder.description(description);
         }
 
-        String type = parameterObj.getStringOrDefault(createJsonKey(PARAMETER_TYPE, StringUtils.EMPTY));
+        String type = parameterObj.getStringOrDefault(createJsonKey(PARAMETER_TYPE,
+                org.codinjutsu.tools.jenkins.util.StringUtil.EMPTY));
         String parameterClass = parameterObj.getString(createJsonKey(CLASS));
         final JobParameterType jobParameterType = JobParameterType.getType(type, parameterClass);
         jobParameterBuilder.jobParameterType(jobParameterType);
@@ -404,7 +406,7 @@ private Job.Health getHealth(JsonArray healths) {
         JsonObject healthObject = (JsonObject) healths.get(0);
         String description = healthObject.getString(createJsonKey(JOB_HEALTH_DESCRIPTION));
         String healthLevel = healthObject.getString(createJsonKey(JOB_HEALTH_ICON));
-        if (StringUtils.isNotEmpty(healthLevel)) {
+        if (StringUtil.isNotEmpty(healthLevel)) {
             if (healthLevel.endsWith(".png"))
                 healthLevel = healthLevel.substring(0, healthLevel.lastIndexOf(".png"));
             else {
@@ -413,7 +415,7 @@ private Job.Health getHealth(JsonArray healths) {
         } else {
             healthLevel = null;
         }
-        if (StringUtils.isEmpty(healthLevel)) {
+        if (StringUtil.isEmpty(healthLevel)) {
             return null;
         } else {
             return new Job.Health(healthLevel, description);
@@ -499,14 +501,16 @@ public List<String> getFillValueItems(String fillValueItemsData) {
 
     private @NotNull String getServerUrl(JsonObject jsonObject) {
         final Optional<View> primaryView = Optional.ofNullable((JsonObject) jsonObject.get(PRIMARY_VIEW)).map(this::getView);
-        final String primaryViewUrl = primaryView.map(View::getUrl).orElse(StringUtils.EMPTY);
+        final String primaryViewUrl = primaryView.map(View::getUrl)
+                .orElse(org.codinjutsu.tools.jenkins.util.StringUtil.EMPTY);
         return getNonNullStringOrDefaultForNull(jsonObject, SERVER_URL, primaryViewUrl);
     }
 
     @NotNull
     private Computer getComputer(JsonObject computerJson) {
         final String displayName = computerJson.getString(createJsonKey("displayName"));
-        final String description = computerJson.getStringOrDefault(createJsonKey("description", StringUtils.EMPTY));
+        final String description = computerJson.getStringOrDefault(createJsonKey("description",
+                org.codinjutsu.tools.jenkins.util.StringUtil.EMPTY));
         final boolean offline = computerJson.getBooleanOrDefault(createJsonKey("offline", false));
         final JsonArray labelsJson = getArray(computerJson, "assignedLabels");
         final Computer.ComputerBuilder computerBuilder = Computer.builder()
@@ -537,7 +541,7 @@ private List<String> getComputerLabels(JsonArray labelsJson) {
 
 
     private void checkJsonDataAndThrowExceptionIfNecessary(String jsonData) {
-        if (StringUtils.isEmpty(jsonData) || "{}".equals(jsonData)) {
+        if (StringUtil.isEmpty(jsonData) || "{}".equals(jsonData)) {
             final String message = "Empty JSON data!";
             LOG.error(message);
             throw new JenkinsPluginRuntimeException(message);
@@ -555,6 +559,7 @@ private void checkJsonDataAndThrowExceptionIfNecessary(String jsonData) {
     }
 
     private @NotNull String getStringNonNull(JsonObject jsonObject, @NotNull String key) {
-        return Optional.ofNullable(jsonObject.getString(createJsonKey(key))).orElse(StringUtils.EMPTY);
+        return Optional.ofNullable(jsonObject.getString(createJsonKey(key)))
+                .orElse(org.codinjutsu.tools.jenkins.util.StringUtil.EMPTY);
     }
 }
diff --git a/src/main/java/org/codinjutsu/tools/jenkins/logic/RequestManager.java b/src/main/java/org/codinjutsu/tools/jenkins/logic/RequestManager.java
@@ -21,11 +21,11 @@
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.offbytwo.jenkins.JenkinsServer;
 import com.offbytwo.jenkins.helper.BuildConsoleStreamListener;
 import com.offbytwo.jenkins.model.*;
-import org.apache.commons.lang.StringUtils;
 import org.codinjutsu.tools.jenkins.JenkinsAppSettings;
 import org.codinjutsu.tools.jenkins.JenkinsSettings;
 import org.codinjutsu.tools.jenkins.exception.*;
@@ -90,7 +90,7 @@ public Jenkins loadJenkinsWorkspace(JenkinsAppSettings configuration, JenkinsSet
         var jenkinsWorkspaceData = securityClient.execute(url);
         final var serverUrl = configuration.getServerUrl();
         final var configuredJenkinsUrl = Optional.of(jenkinsSettings.getJenkinsUrl())
-                .filter(StringUtils::isNotEmpty)
+                .filter(StringUtil::isNotEmpty)
                 .orElse(serverUrl);
 
         if (configuredJenkinsUrl.contains(BUILDHIVE_CLOUDBEES)) {//TODO hack need to refactor
@@ -313,7 +313,7 @@ public String testAuthenticate(String serverUrl, String username, String passwor
         SecurityClientFactory.setVersion(version);
         final int connectionTimout = getConnectionTimout(connectionTimoutInSeconds);
         final SecurityClient securityClientForTest;
-        if (StringUtils.isNotBlank(username)) {
+        if (org.codinjutsu.tools.jenkins.util.StringUtil.isNotBlank(username)) {
             securityClientForTest = SecurityClientFactory.basic(username, password, crumbData, connectionTimout);
         } else {
             securityClientForTest = SecurityClientFactory.none(crumbData, connectionTimout);

diff --git a/src/main/java/org/codinjutsu/tools/jenkins/logic/RssParser.java b/src/main/java/org/codinjutsu/tools/jenkins/logic/RssParser.java
@@ -18,7 +18,7 @@
 
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.JDOMUtil;
-import org.apache.commons.lang.StringUtils;
+import com.intellij.openapi.util.text.StringUtil;
 import org.codinjutsu.tools.jenkins.exception.JenkinsPluginRuntimeException;
 import org.codinjutsu.tools.jenkins.model.Build;
 import org.codinjutsu.tools.jenkins.model.BuildStatusEnum;
@@ -53,7 +53,7 @@ public Map<String, Build> loadJenkinsRssLatestBuilds(String rssData) {
 
     @NotNull
     private Element getFeeds(@Nullable String xmlData) {
-        if (StringUtils.isEmpty(xmlData)) {
+        if (StringUtil.isEmpty(xmlData)) {
             LOG.error("Empty XML data");
             throw new IllegalStateException("Empty XML data");
         }
@@ -77,7 +77,7 @@ private Map<String, Build> createLatestBuildList(@NotNull Element feeds) {
         final var elements = feeds.getChildren(RSS_ENTRY, feeds.getNamespace());
         for (Element element : elements) {
             final var title = Optional.ofNullable(element.getChildText(RSS_TITLE, feeds.getNamespace()))
-                    .orElse(StringUtils.EMPTY);
+                    .orElse(org.codinjutsu.tools.jenkins.util.StringUtil.EMPTY);
             final var publishedBuild = element.getChildText(RSS_PUBLISHED, feeds.getNamespace());
             final var buildUrlElement = element.getChild(RSS_LINK, feeds.getNamespace());
             final var buildUrl = Optional.ofNullable(buildUrlElement.getAttributeValue(RSS_LINK_HREF));
@@ -87,8 +87,9 @@ private Map<String, Build> createLatestBuildList(@NotNull Element feeds) {
             final var status = RssUtil.extractStatus(title);
 
             if (!BuildStatusEnum.NULL.equals(status)) {
-                buildMap.put(jobName, Build.createBuildFromRss(buildUrl.orElse(StringUtils.EMPTY), number,
-                        status.getStatus(), false, publishedBuild, title, rssDateFormat));
+                buildMap.put(jobName, Build.createBuildFromRss(buildUrl
+                                .orElse(org.codinjutsu.tools.jenkins.util.StringUtil.EMPTY),
+                        number, status.getStatus(), false, publishedBuild, title, rssDateFormat));
             }
         }
 

diff --git a/src/main/java/org/codinjutsu/tools/jenkins/logic/UrlMapperService.java b/src/main/java/org/codinjutsu/tools/jenkins/logic/UrlMapperService.java
@@ -1,7 +1,7 @@
 package org.codinjutsu.tools.jenkins.logic;
 
 import com.intellij.openapi.components.Service;
-import org.apache.commons.lang.StringUtils;
+import com.intellij.openapi.util.text.StringUtil;
 import org.codinjutsu.tools.jenkins.JenkinsSettings;
 import org.jetbrains.annotations.NotNull;
 
@@ -13,13 +13,13 @@ final class UrlMapperService {
 
     public @NotNull UnaryOperator<String> getMapper(@NotNull JenkinsSettings jenkinsSettings, @NotNull String serverUrl) {
         return Optional.of(jenkinsSettings.getJenkinsUrl())
-                .filter(StringUtils::isNotEmpty)
+                .filter(StringUtil::isNotEmpty)
                 .map(jenkinsUrl -> getMapper(jenkinsUrl, serverUrl))
                 .orElseGet(UnaryOperator::identity);
     }
 
     public @NotNull UnaryOperator<String> getMapper(@NotNull String jenkinsUrl, @NotNull String serverUrl) {
-        final boolean useDefault = StringUtils.isEmpty(jenkinsUrl) || StringUtils.equalsIgnoreCase(jenkinsUrl, serverUrl);
+        final boolean useDefault = StringUtil.isEmpty(jenkinsUrl) || StringUtil.equalsIgnoreCase(jenkinsUrl, serverUrl);
         return useDefault ? UnaryOperator.identity() :
                 new JenkinsUrlMapper(serverUrl, jenkinsUrl);
     }

diff --git a/src/main/java/org/codinjutsu/tools/jenkins/model/Build.java b/src/main/java/org/codinjutsu/tools/jenkins/model/Build.java
@@ -16,10 +16,10 @@
 
 package org.codinjutsu.tools.jenkins.model;
 
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.text.DateFormatUtil;
 import lombok.Builder;
 import lombok.Value;
-import org.apache.commons.lang.StringUtils;
 import org.codinjutsu.tools.jenkins.util.DateUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -114,7 +114,7 @@ public String getDisplayNumber() {
     @NotNull
     public String getNameToRender() {
         return Optional.ofNullable(getFullDisplayName())
-                .filter(StringUtils::isNotEmpty)
+                .filter(StringUtil::isNotEmpty)
                 .orElseGet(() -> String.format("%s (%s)", getDisplayNumber(),
                         DateFormatUtil.formatDateTime(getTimestamp())));
     }

diff --git a/src/main/java/org/codinjutsu/tools/jenkins/model/Jenkins.java b/src/main/java/org/codinjutsu/tools/jenkins/model/Jenkins.java
@@ -16,7 +16,7 @@
 
 package org.codinjutsu.tools.jenkins.model;
 
-import org.apache.commons.lang.StringUtils;
+import com.intellij.openapi.util.text.StringUtil;
 import org.codinjutsu.tools.jenkins.JenkinsAppSettings;
 import org.jetbrains.annotations.Nullable;
 
@@ -81,7 +81,7 @@ public String getServerUrl() {
 
     public View getViewByName(String lastSelectedViewName) {
         for (View view : views) {
-            if (StringUtils.equals(lastSelectedViewName, view.getName())) {
+            if (StringUtil.equals(lastSelectedViewName, view.getName())) {
                 return view;
             }
         }

diff --git a/src/main/java/org/codinjutsu/tools/jenkins/model/Job.java b/src/main/java/org/codinjutsu/tools/jenkins/model/Job.java
@@ -16,14 +16,14 @@
 
 package org.codinjutsu.tools.jenkins.model;
 
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.ObjectUtils;
 import com.intellij.util.ui.EmptyIcon;
 import icons.JenkinsControlIcons;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Singular;
 import lombok.Value;
-import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -116,13 +116,13 @@ public void updateContentWith(Job updatedJob) {
 
     @NotNull
     public String getNameToRenderSingleJob() {
-        return Optional.ofNullable(getFullDisplayName()).filter(StringUtils::isNotEmpty)
+        return Optional.ofNullable(getFullDisplayName()).filter(StringUtil::isNotEmpty)
                 .orElseGet(this::preferDisplayName);
     }
 
     @NotNull
     public String preferDisplayName() {
-        return Optional.ofNullable(getDisplayName()).filter(StringUtils::isNotEmpty)
+        return Optional.ofNullable(getDisplayName()).filter(StringUtil::isNotEmpty)
                 .orElseGet(this::getName);
     }
 

diff --git a/src/main/java/org/codinjutsu/tools/jenkins/model/JobParameterType.java b/src/main/java/org/codinjutsu/tools/jenkins/model/JobParameterType.java
@@ -1,7 +1,7 @@
 package org.codinjutsu.tools.jenkins.model;
 
+import com.intellij.openapi.util.text.StringUtil;
 import lombok.Value;
-import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -19,7 +19,7 @@ public class JobParameterType {
     @NotNull
     public static JobParameterType getType(@NotNull String parameterType, @Nullable String parameterClass) {
         Optional<JobParameterType> jobParameter = Optional.empty();
-        if (StringUtils.isEmpty(parameterClass)) {
+        if (StringUtil.isEmpty(parameterClass)) {
             jobParameter = BuildInJobParameter.getBuiltInJobParameter()
                     .filter(parameter -> parameter.getType().equals(parameterType)).findFirst();
         }

diff --git a/src/main/java/org/codinjutsu/tools/jenkins/security/BasicSecurityClient.java b/src/main/java/org/codinjutsu/tools/jenkins/security/BasicSecurityClient.java
@@ -17,7 +17,7 @@
 package org.codinjutsu.tools.jenkins.security;
 
 import com.intellij.openapi.diagnostic.Logger;
-import org.apache.commons.lang.StringUtils;
+import com.intellij.openapi.util.text.StringUtil;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpStatus;
 import org.apache.http.auth.UsernamePasswordCredentials;
@@ -53,7 +53,7 @@ public String connect(URL url) {
 
     @Nullable
     private String doAuthentication(URL jenkinsUrl) throws AuthenticationException {
-        if (StringUtils.isNotEmpty(username) && StringUtils.isNotEmpty(password)) {
+        if (StringUtil.isNotEmpty(username) && StringUtil.isNotEmpty(password)) {
             final var targetHost = new HttpHost(jenkinsUrl.getHost(), jenkinsUrl.getPort(), jenkinsUrl.getProtocol());
             final var credentials = new UsernamePasswordCredentials(username, password);
             addAuthenticationPreemptive(targetHost, credentials);