This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit 16ea6e135b4c2eeee2aedb74f9b9319ef8384d66 Author: Tim te Beek <[email protected]> AuthorDate: Sat Aug 19 17:30:28 2023 +0000 [MNG-6829] Replace trimmed StringUtils#isEmpty(String) and #isNotEmpty(String) Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.java.migrate.apache.commons.lang.IsNotEmptyToJdk Co-authored-by: Moderne <[email protected]> --- .../src/main/java/org/apache/maven/scm/plugin/BootstrapMojo.java | 2 +- .../org/apache/maven/scm/provider/hg/command/tag/HgTagCommand.java | 3 +-- .../scm/provider/git/gitexe/command/branch/GitBranchCommand.java | 3 +-- .../maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java | 3 +-- .../maven/scm/provider/git/gitexe/command/untag/GitUntagCommand.java | 3 +-- .../scm/provider/git/jgit/command/branch/JGitBranchCommand.java | 3 +-- .../maven/scm/provider/git/jgit/command/diff/JGitDiffCommand.java | 5 ++--- .../maven/scm/provider/git/jgit/command/tag/JGitTagCommand.java | 3 +-- .../maven/scm/provider/git/jgit/command/untag/JGitUntagCommand.java | 3 +-- .../scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java | 2 +- .../scm/provider/svn/svnexe/command/status/SvnStatusConsumer.java | 3 +-- .../maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java | 2 +- 12 files changed, 13 insertions(+), 22 deletions(-) diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BootstrapMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BootstrapMojo.java index c7c60a1fa..8e6b0ec6b 100644 --- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BootstrapMojo.java +++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BootstrapMojo.java @@ -129,7 +129,7 @@ public class BootstrapMojo extends CheckoutMojo { } } - if (!StringUtils.isEmpty(this.profiles)) { + if (!(this.profiles == null || this.profiles.isEmpty())) { cl.createArg().setValue("-P" + this.profiles); } diff --git a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/tag/HgTagCommand.java b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/tag/HgTagCommand.java index feaeb4bdb..3e0ffa660 100644 --- a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/tag/HgTagCommand.java +++ b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/tag/HgTagCommand.java @@ -22,7 +22,6 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang3.StringUtils; import org.apache.maven.scm.ScmException; import org.apache.maven.scm.ScmFile; import org.apache.maven.scm.ScmFileSet; @@ -64,7 +63,7 @@ public class HgTagCommand extends AbstractTagCommand implements Command { ScmTagParameters scmTagParameters) throws ScmException { - if (tag == null || StringUtils.isEmpty(tag.trim())) { + if (tag == null || tag.trim().isEmpty()) { throw new ScmException("tag must be specified"); } diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/branch/GitBranchCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/branch/GitBranchCommand.java index 380da9972..976865797 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/branch/GitBranchCommand.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/branch/GitBranchCommand.java @@ -20,7 +20,6 @@ package org.apache.maven.scm.provider.git.gitexe.command.branch; import java.io.File; -import org.apache.commons.lang3.StringUtils; import org.apache.maven.scm.ScmException; import org.apache.maven.scm.ScmFileSet; import org.apache.maven.scm.ScmFileStatus; @@ -44,7 +43,7 @@ public class GitBranchCommand extends AbstractBranchCommand implements GitComman /** {@inheritDoc} */ public ScmResult executeBranchCommand(ScmProviderRepository repo, ScmFileSet fileSet, String branch, String message) throws ScmException { - if (branch == null || StringUtils.isEmpty(branch.trim())) { + if (branch == null || branch.trim().isEmpty()) { throw new ScmException("branch name must be specified"); } diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java index 499547ee5..38ca106cc 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java @@ -21,7 +21,6 @@ package org.apache.maven.scm.provider.git.gitexe.command.tag; import java.io.File; import java.io.IOException; -import org.apache.commons.lang3.StringUtils; import org.apache.maven.scm.ScmException; import org.apache.maven.scm.ScmFileSet; import org.apache.maven.scm.ScmFileStatus; @@ -55,7 +54,7 @@ public class GitTagCommand extends AbstractTagCommand implements GitCommand { public ScmResult executeTagCommand( ScmProviderRepository repo, ScmFileSet fileSet, String tag, ScmTagParameters scmTagParameters) throws ScmException { - if (tag == null || StringUtils.isEmpty(tag.trim())) { + if (tag == null || tag.trim().isEmpty()) { throw new ScmException("tag name must be specified"); } diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/untag/GitUntagCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/untag/GitUntagCommand.java index dac363bda..4ab067527 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/untag/GitUntagCommand.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/untag/GitUntagCommand.java @@ -20,7 +20,6 @@ package org.apache.maven.scm.provider.git.gitexe.command.untag; import java.io.File; -import org.apache.commons.lang3.StringUtils; import org.apache.maven.scm.ScmException; import org.apache.maven.scm.ScmFileSet; import org.apache.maven.scm.ScmResult; @@ -41,7 +40,7 @@ public class GitUntagCommand extends AbstractUntagCommand implements GitCommand public ScmResult executeUntagCommand( ScmProviderRepository repo, ScmFileSet fileSet, ScmUntagParameters scmUntagParameters) throws ScmException { String tag = scmUntagParameters.getTag(); - if (tag == null || StringUtils.isEmpty(tag.trim())) { + if (tag == null || tag.trim().isEmpty()) { throw new ScmException("tag name must be specified"); } diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommand.java index 537e2f7df..c3cf1e450 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommand.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommand.java @@ -24,7 +24,6 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.apache.commons.lang3.StringUtils; import org.apache.maven.scm.ScmException; import org.apache.maven.scm.ScmFile; import org.apache.maven.scm.ScmFileSet; @@ -58,7 +57,7 @@ public class JGitBranchCommand extends AbstractBranchCommand implements GitComma @Override protected ScmResult executeBranchCommand( ScmProviderRepository repo, ScmFileSet fileSet, String branch, String message) throws ScmException { - if (branch == null || StringUtils.isEmpty(branch.trim())) { + if (branch == null || branch.trim().isEmpty()) { throw new ScmException("branch name must be specified"); } diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommand.java index c5e8d5bbd..a4b08971b 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommand.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommand.java @@ -22,7 +22,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; -import org.apache.commons.lang3.StringUtils; import org.apache.maven.scm.ScmException; import org.apache.maven.scm.ScmFileSet; import org.apache.maven.scm.ScmVersion; @@ -70,13 +69,13 @@ public class JGitDiffCommand extends AbstractDiffCommand implements GitCommand { AbstractTreeIterator oldTree = null; if (startRevision != null - && StringUtils.isNotEmpty(startRevision.getName().trim())) { + && !startRevision.getName().trim().isEmpty()) { String startRev = startRevision.getName().trim(); oldTree = getTreeIterator(git.getRepository(), startRev); } AbstractTreeIterator newTree = null; - if (endRevision != null && StringUtils.isNotEmpty(endRevision.getName().trim())) { + if (endRevision != null && !endRevision.getName().trim().isEmpty()) { String endRev = endRevision.getName().trim(); newTree = getTreeIterator(git.getRepository(), endRev); } diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommand.java index 361bf58d7..d288d6da4 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommand.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommand.java @@ -21,7 +21,6 @@ package org.apache.maven.scm.provider.git.jgit.command.tag; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang3.StringUtils; import org.apache.maven.scm.ScmException; import org.apache.maven.scm.ScmFile; import org.apache.maven.scm.ScmFileSet; @@ -60,7 +59,7 @@ public class JGitTagCommand extends AbstractTagCommand implements GitCommand { public ScmResult executeTagCommand( ScmProviderRepository repo, ScmFileSet fileSet, String tag, ScmTagParameters scmTagParameters) throws ScmException { - if (tag == null || StringUtils.isEmpty(tag.trim())) { + if (tag == null || tag.trim().isEmpty()) { throw new ScmException("tag name must be specified"); } diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/untag/JGitUntagCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/untag/JGitUntagCommand.java index 57a482289..6d54e6abb 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/untag/JGitUntagCommand.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/untag/JGitUntagCommand.java @@ -20,7 +20,6 @@ package org.apache.maven.scm.provider.git.jgit.command.untag; import java.util.Collection; -import org.apache.commons.lang3.StringUtils; import org.apache.maven.scm.ScmException; import org.apache.maven.scm.ScmFileSet; import org.apache.maven.scm.ScmResult; @@ -45,7 +44,7 @@ public class JGitUntagCommand extends AbstractUntagCommand implements GitCommand ScmProviderRepository repository, ScmFileSet fileSet, ScmUntagParameters scmUntagParameters) throws ScmException { String tagName = scmUntagParameters.getTag(); - if (tagName == null || StringUtils.isEmpty(tagName.trim())) { + if (tagName == null || tagName.trim().isEmpty()) { throw new ScmException("tag name must be specified"); } String escapedTagName = tagName.trim().replace(' ', '_'); diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java index 9bb1097c5..a89363cce 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java @@ -56,7 +56,7 @@ public class SvnBranchCommand extends AbstractBranchCommand implements SvnComman public ScmResult executeBranchCommand( ScmProviderRepository repo, ScmFileSet fileSet, String branch, ScmBranchParameters scmBranchParameters) throws ScmException { - if (branch == null || StringUtils.isEmpty(branch.trim())) { + if (branch == null || branch.trim().isEmpty()) { throw new ScmException("branch name must be specified"); } diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/status/SvnStatusConsumer.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/status/SvnStatusConsumer.java index 55fdc1a4c..0dba6f021 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/status/SvnStatusConsumer.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/status/SvnStatusConsumer.java @@ -22,7 +22,6 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang3.StringUtils; import org.apache.maven.scm.ScmFile; import org.apache.maven.scm.ScmFileStatus; import org.apache.maven.scm.util.AbstractConsumer; @@ -53,7 +52,7 @@ public class SvnStatusConsumer extends AbstractConsumer { if (logger.isDebugEnabled()) { logger.debug(line); } - if (StringUtils.isEmpty(line.trim())) { + if (line.trim().isEmpty()) { return; } diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java index 6fd01444f..b12234e61 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java @@ -76,7 +76,7 @@ public class SvnTagCommand extends AbstractTagCommand implements SvnCommand { } else { logger.debug("SvnTagCommand :: scmTagParameters.remoteTagging : " + scmTagParameters.isRemoteTagging()); } - if (tag == null || StringUtils.isEmpty(tag.trim())) { + if (tag == null || tag.trim().isEmpty()) { throw new ScmException("tag must be specified"); }
