Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MNG-6829] Replace any StringUtils#isEmpty(String) and #isNotEmpty(String) #38

Merged
merged 3 commits into from
May 15, 2023
Merged

[MNG-6829] Replace any StringUtils#isEmpty(String) and #isNotEmpty(String) #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35669d6
[MNG-6829] Replace any StringUtils#isEmpty(String) and #isNotEmpty(St…
timtebeek May 15, 2023
72bd604
Appease Spotless
timtebeek May 15, 2023
1549941
Apply spotless
timtebeek May 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 7 additions & 5 deletions ...ain/java/org/apache/maven/plugin/resources/remote/AbstractProcessRemoteResourcesMojo.java
View file
Open in desktop
Expand Up @@ -384,13 +384,15 @@ public void execute() throws MojoExecutionException {
return;
}

if (StringUtils.isEmpty(encoding)) {
if (encoding == null || encoding.isEmpty()) {
getLog().warn("File encoding has not been set, using platform encoding " + ReaderFactory.FILE_ENCODING
+ ", i.e. build is platform dependent!");
}

if (resolveScopes == null) {
resolveScopes = new String[] {StringUtils.isEmpty(this.includeScope) ? JavaScopes.TEST : this.includeScope};
resolveScopes = new String[] {
(this.includeScope == null || this.includeScope.isEmpty()) ? JavaScopes.TEST : this.includeScope
};
}

if (supplementalModels == null) {
Expand Down Expand Up @@ -804,7 +806,7 @@ public Object internalGet(String key) {
String inceptionYear = project.getInceptionYear();
String year = new SimpleDateFormat("yyyy").format((outputDate == null) ? new Date() : outputDate);

if (StringUtils.isEmpty(inceptionYear)) {
if (inceptionYear == null || inceptionYear.isEmpty()) {
if (getLog().isDebugEnabled()) {
getLog().debug("inceptionYear not specified, defaulting to " + year);
}
Expand Down Expand Up @@ -849,10 +851,10 @@ private List<File> downloadBundles(List<String> bundles) throws MojoExecutionExc
String g = s[0];
String a = s[1];
String v = s[2];
String type = (s.length >= 4 ? s[3] : "jar");
String type = s.length >= 4 ? s[3] : "jar";
ArtifactType artifactType =
RepositoryUtils.newArtifactType(type, artifactHandlerManager.getArtifactHandler(type));
String classifier = (s.length == 5 ? s[4] : artifactType.getClassifier());
String classifier = s.length == 5 ? s[4] : artifactType.getClassifier();

DefaultArtifact artifact =
new DefaultArtifact(g, a, classifier, artifactType.getExtension(), v, artifactType);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java
View file
Open in desktop
Expand Up @@ -93,7 +93,7 @@ public void execute() throws MojoExecutionException {
return;
}

if (StringUtils.isEmpty(sourceEncoding)) {
if (sourceEncoding == null || sourceEncoding.isEmpty()) {
getLog().warn("sourceEncoding has not been set, using platform encoding " + ReaderFactory.FILE_ENCODING
+ ", i.e. build is platform dependent!");
sourceEncoding = ReaderFactory.FILE_ENCODING;
Expand Down