Skip to content

Commit 7b9282c

Browse files
timtebeekTeamModerne
timtebeek
and
TeamModerne
authored
[MNG-6829] Replace any StringUtils#isEmpty(String) and #isNotEmpty(String) (#185)
Use this link to re-run the recipe: https://public.moderne.io/recipes/org.openrewrite.java.migrate.apache.commons.lang.IsNotEmptyToJdk?organizationId=QXBhY2hlIE1hdmVu Co-authored-by: Moderne <[email protected]>
1 parent ad666d3 commit 7b9282c

File tree

12 files changed

+30
-37
lines changed

12 files changed

+30
-37
lines changed

‎maven-release-api/src/main/java/org/apache/maven/shared/release/versions/Version.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -198,21 +198,21 @@ protected static String getVersionString(Version info, String buildSpecifier, St
198198
sb.append(joinDigitString(info.digits));
199199
}
200200

201-
if (StringUtils.isNotEmpty(info.annotation)) {
201+
if (info.annotation != null && !info.annotation.isEmpty()) {
202202
sb.append(StringUtils.defaultString(info.annotationSeparator));
203203
sb.append(info.annotation);
204204
}
205205

206-
if (StringUtils.isNotEmpty(info.annotationRevision)) {
207-
if (StringUtils.isEmpty(info.annotation)) {
206+
if (info.annotationRevision != null && !info.annotationRevision.isEmpty()) {
207+
if (info.annotation == null || info.annotation.isEmpty()) {
208208
sb.append(StringUtils.defaultString(info.annotationSeparator));
209209
} else {
210210
sb.append(StringUtils.defaultString(info.annotationRevSeparator));
211211
}
212212
sb.append(info.annotationRevision);
213213
}
214214

215-
if (StringUtils.isNotEmpty(buildSpecifier)) {
215+
if (buildSpecifier != null && !buildSpecifier.isEmpty()) {
216216
sb.append(StringUtils.defaultString(buildSeparator));
217217
sb.append(buildSpecifier);
218218
}
@@ -240,7 +240,7 @@ private List<String> parseDigits(String strDigits) {
240240
}
241241

242242
private static String nullIfEmpty(String s) {
243-
return StringUtils.isEmpty(s) ? null : s;
243+
return (s == null || s.isEmpty()) ? null : s;
244244
}
245245

246246
/**

‎maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import org.apache.maven.shared.release.phase.ReleasePhase;
4242
import org.apache.maven.shared.release.phase.ResourceGenerator;
4343
import org.apache.maven.shared.release.strategy.Strategy;
44-
import org.codehaus.plexus.util.StringUtils;
4544
import org.slf4j.Logger;
4645
import org.slf4j.LoggerFactory;
4746

@@ -459,7 +458,7 @@ public ReleaseDescriptorBuilder addReleaseVersion(String key, String value) {
459458
* @return The working directory
460459
*/
461460
protected File determineWorkingDirectory(File checkoutDirectory, String relativePathProjectDirectory) {
462-
if (StringUtils.isNotEmpty(relativePathProjectDirectory)) {
461+
if (relativePathProjectDirectory != null && !relativePathProjectDirectory.isEmpty()) {
463462
return new File(checkoutDirectory, relativePathProjectDirectory);
464463
} else {
465464
return checkoutDirectory;

‎maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import org.apache.maven.shared.release.ReleaseResult;
3535
import org.apache.maven.shared.release.env.ReleaseEnvironment;
3636
import org.apache.maven.shared.release.util.MavenCrypto;
37-
import org.codehaus.plexus.util.StringUtils;
3837
import org.codehaus.plexus.util.cli.CommandLineException;
3938
import org.codehaus.plexus.util.cli.Commandline;
4039

@@ -128,7 +127,7 @@ public void executeGoals(
128127
cl.createArg().setValue("--batch-mode");
129128
}
130129

131-
if (!StringUtils.isEmpty(additionalArguments)) {
130+
if (!(additionalArguments == null || additionalArguments.isEmpty())) {
132131
cl.createArg().setLine(additionalArguments);
133132
}
134133

‎maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractInputVariablesPhase.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
import org.codehaus.plexus.interpolation.PrefixedPropertiesValueSource;
4949
import org.codehaus.plexus.interpolation.RecursionInterceptor;
5050
import org.codehaus.plexus.interpolation.StringSearchInterpolator;
51-
import org.codehaus.plexus.util.StringUtils;
5251

5352
import static java.util.Objects.requireNonNull;
5453
import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
@@ -201,7 +200,7 @@ public ReleaseResult execute(
201200
tag = prompter.get()
202201
.prompt("What is the branch name for \"" + project.getName() + "\"? ("
203202
+ buffer().project(project.getArtifactId()) + ")");
204-
if (StringUtils.isEmpty(tag)) {
203+
if (tag == null || tag.isEmpty()) {
205204
throw new ReleaseExecutionException("No branch name was given.");
206205
}
207206
} else {

‎maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractMapVersionsPhase.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import org.apache.maven.shared.release.versions.VersionParseException;
4040
import org.codehaus.plexus.components.interactivity.Prompter;
4141
import org.codehaus.plexus.components.interactivity.PrompterException;
42-
import org.codehaus.plexus.util.StringUtils;
4342
import org.slf4j.Logger;
4443

4544
import static java.util.Objects.requireNonNull;
@@ -336,11 +335,11 @@ private String resolveSuggestedVersion(
336335
private String getDevelopmentVersion(String projectId, ReleaseDescriptor releaseDescriptor) {
337336
String projectVersion = releaseDescriptor.getProjectDevelopmentVersion(projectId);
338337

339-
if (StringUtils.isEmpty(projectVersion)) {
338+
if (projectVersion == null || projectVersion.isEmpty()) {
340339
projectVersion = releaseDescriptor.getDefaultDevelopmentVersion();
341340
}
342341

343-
if (StringUtils.isEmpty(projectVersion)) {
342+
if (projectVersion == null || projectVersion.isEmpty()) {
344343
return null;
345344
}
346345

@@ -350,11 +349,11 @@ private String getDevelopmentVersion(String projectId, ReleaseDescriptor release
350349
private String getReleaseVersion(String projectId, ReleaseDescriptor releaseDescriptor) {
351350
String projectVersion = releaseDescriptor.getProjectReleaseVersion(projectId);
352351

353-
if (StringUtils.isEmpty(projectVersion)) {
352+
if (projectVersion == null || projectVersion.isEmpty()) {
354353
projectVersion = releaseDescriptor.getDefaultReleaseVersion();
355354
}
356355

357-
if (StringUtils.isEmpty(projectVersion)) {
356+
if (projectVersion == null || projectVersion.isEmpty()) {
358357
return null;
359358
}
360359

‎maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ private void transformDocument(
409409

410410
private void rewriteBuildOutputTimestampProperty(Properties properties, ReleaseResult result) {
411411
String buildOutputTimestamp = properties.getProperty("project.build.outputTimestamp");
412-
if (buildOutputTimestamp == null || StringUtils.isEmpty(buildOutputTimestamp)) {
412+
if (buildOutputTimestamp == null || (buildOutputTimestamp == null || buildOutputTimestamp.isEmpty())) {
413413
// no Reproducible Builds output timestamp defined
414414
return;
415415
}

‎maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ protected ReleaseResult execute(
7474

7575
try {
7676
String goals = getGoals(releaseDescriptor);
77-
if (!StringUtils.isEmpty(goals)) {
77+
if (!(goals == null || goals.isEmpty())) {
7878
logInfo(result, "Executing goals '" + buffer().strong(goals) + "'...");
7979
if (logArguments) {
8080
// logging arguments may log secrets: should be activated only on dryRun
@@ -151,7 +151,7 @@ protected String getAdditionalArguments(ReleaseDescriptor releaseDescriptor) {
151151
protected File determineWorkingDirectory(File checkoutDirectory, String relativePathProjectDirectory) {
152152
File workingDirectory = checkoutDirectory;
153153

154-
if (StringUtils.isNotEmpty(relativePathProjectDirectory)) {
154+
if (relativePathProjectDirectory != null && !relativePathProjectDirectory.isEmpty()) {
155155
workingDirectory = new File(checkoutDirectory, relativePathProjectDirectory);
156156
}
157157

‎maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
5151
import org.apache.maven.shared.release.util.ReleaseUtil;
5252
import org.codehaus.plexus.util.FileUtils;
53-
import org.codehaus.plexus.util.StringUtils;
5453

5554
import static java.util.Objects.requireNonNull;
5655
import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
@@ -208,7 +207,7 @@ private ReleaseResult performCheckout(
208207
}
209208

210209
String scmRelativePathProjectDirectory = scmResult.getRelativePathProjectDirectory();
211-
if (StringUtils.isEmpty(scmRelativePathProjectDirectory)) {
210+
if (scmRelativePathProjectDirectory == null || scmRelativePathProjectDirectory.isEmpty()) {
212211
Path workingDirectory = Paths.get(releaseDescriptor.getWorkingDirectory());
213212

214213
Path rootProjectBasedir;

‎maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ private ReleaseResult runLogic(
6565
String additionalArguments = getAdditionalArguments(releaseDescriptor);
6666

6767
if (releaseDescriptor.isUseReleaseProfile()) {
68-
if (!StringUtils.isEmpty(additionalArguments)) {
68+
if (!(additionalArguments == null || additionalArguments.isEmpty())) {
6969
additionalArguments = additionalArguments + " -DperformRelease=true";
7070
} else {
7171
additionalArguments = "-DperformRelease=true";
@@ -79,7 +79,7 @@ private ReleaseResult runLogic(
7979

8080
// ensure we don't use the release pom for the perform goals
8181
// ^^ paranoia? A MavenExecutor has already access to this. Probably worth refactoring.
82-
if (!StringUtils.isEmpty(additionalArguments)) {
82+
if (!(additionalArguments == null || additionalArguments.isEmpty())) {
8383
additionalArguments = additionalArguments + " -f " + pomFileName;
8484
} else {
8585
additionalArguments = "-f " + pomFileName;

‎maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import org.apache.maven.shared.release.config.ReleaseDescriptor;
3838
import org.apache.maven.shared.release.util.MavenCrypto;
3939
import org.apache.maven.shared.release.util.MavenCrypto.MavenCryptoException;
40-
import org.codehaus.plexus.util.StringUtils;
4140
import org.slf4j.Logger;
4241
import org.slf4j.LoggerFactory;
4342

@@ -134,20 +133,20 @@ public ScmRepository getConfiguredRepository(String url, ReleaseDescriptor relea
134133
}
135134
}
136135

137-
if (!StringUtils.isEmpty(username)) {
136+
if (!(username == null || username.isEmpty())) {
138137
scmRepo.setUser(username);
139138
}
140-
if (!StringUtils.isEmpty(password)) {
139+
if (!(password == null || password.isEmpty())) {
141140
scmRepo.setPassword(password);
142141
}
143142

144143
if (scmRepo instanceof ScmProviderRepositoryWithHost) {
145144
ScmProviderRepositoryWithHost repositoryWithHost = (ScmProviderRepositoryWithHost) scmRepo;
146-
if (!StringUtils.isEmpty(privateKey)) {
145+
if (!(privateKey == null || privateKey.isEmpty())) {
147146
repositoryWithHost.setPrivateKey(privateKey);
148147
}
149148

150-
if (!StringUtils.isEmpty(passphrase)) {
149+
if (!(passphrase == null || passphrase.isEmpty())) {
151150
repositoryWithHost.setPassphrase(passphrase);
152151
}
153152
}
@@ -156,12 +155,12 @@ public ScmRepository getConfiguredRepository(String url, ReleaseDescriptor relea
156155
SvnScmProviderRepository svnRepo = (SvnScmProviderRepository) repository.getProviderRepository();
157156

158157
String tagBase = releaseDescriptor.getScmTagBase();
159-
if (!StringUtils.isEmpty(tagBase)) {
158+
if (!(tagBase == null || tagBase.isEmpty())) {
160159
svnRepo.setTagBase(tagBase);
161160
}
162161

163162
String branchBase = releaseDescriptor.getScmBranchBase();
164-
if (!StringUtils.isEmpty(branchBase)) {
163+
if (!(branchBase == null || branchBase.isEmpty())) {
165164
svnRepo.setBranchBase(branchBase);
166165
}
167166
}

‎maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import java.util.Arrays;
2727
import java.util.List;
2828

29-
import org.apache.commons.lang3.StringUtils;
3029
import org.apache.maven.model.Model;
3130
import org.apache.maven.project.MavenProject;
3231
import org.apache.maven.shared.release.ReleaseExecutionException;
@@ -164,7 +163,7 @@ public static int getBaseWorkingDirectoryParentCount(final Path baseDirectory, f
164163
}
165164

166165
public static String realignScmUrl(int parentLevels, String url) {
167-
if (!StringUtils.isEmpty(url)) {
166+
if (!(url == null || url.isEmpty())) {
168167
// normalize
169168
url = url.replaceAll("/\\./", "/")
170169
.replaceAll("/\\.$", "")

‎maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -332,21 +332,21 @@ protected static String getVersionString(DefaultVersionInfo info, String buildSp
332332
sb.append(joinDigitString(info.digits));
333333
}
334334

335-
if (StringUtils.isNotEmpty(info.annotation)) {
335+
if (info.annotation != null && !info.annotation.isEmpty()) {
336336
sb.append(StringUtils.defaultString(info.annotationSeparator));
337337
sb.append(info.annotation);
338338
}
339339

340-
if (StringUtils.isNotEmpty(info.annotationRevision)) {
341-
if (StringUtils.isEmpty(info.annotation)) {
340+
if (info.annotationRevision != null && !info.annotationRevision.isEmpty()) {
341+
if (info.annotation == null || info.annotation.isEmpty()) {
342342
sb.append(StringUtils.defaultString(info.annotationSeparator));
343343
} else {
344344
sb.append(StringUtils.defaultString(info.annotationRevSeparator));
345345
}
346346
sb.append(info.annotationRevision);
347347
}
348348

349-
if (StringUtils.isNotEmpty(buildSpecifier)) {
349+
if (buildSpecifier != null && !buildSpecifier.isEmpty()) {
350350
sb.append(StringUtils.defaultString(buildSeparator));
351351
sb.append(buildSpecifier);
352352
}
@@ -379,7 +379,7 @@ private List<String> parseDigits(String strDigits) {
379379
// --------------------------------------------------
380380

381381
private static String nullIfEmpty(String s) {
382-
return StringUtils.isEmpty(s) ? null : s;
382+
return (s == null || s.isEmpty()) ? null : s;
383383
}
384384

385385
/**

0 commit comments

Comments
 (0)