Skip to content

[MDEP-952] Remove StringUtils dependency #492

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

Merged
merged 2 commits into from
Dec 6, 2024
Merged

[MDEP-952] Remove StringUtils dependency #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8324695
Remove StringUtils dependency
elharo Nov 24, 2024
fb3529b
StringUtil
elharo Nov 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/main/java/org/apache/maven/plugins/dependency/utils/filters/DestFileFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import java.util.LinkedHashSet;
import java.util.Set;

import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugins.dependency.fromConfiguration.ArtifactItem;
import org.apache.maven.plugins.dependency.utils.DependencyUtil;
Expand Down Expand Up @@ -284,7 +283,7 @@ public boolean isArtifactIncluded(ArtifactItem item) throws ArtifactFilterExcept
}

File destFile;
if (StringUtils.isEmpty(item.getDestFileName())) {
if (item.getDestFileName() == null || item.getDestFileName().isEmpty()) {
String formattedFileName = DependencyUtil.getFormattedFileName(
artifact, removeVersion, prependGroupId, useBaseVersion, removeClassifier);
destFile = new File(destFolder, formattedFileName);
Expand All @@ -298,13 +297,13 @@ public boolean isArtifactIncluded(ArtifactItem item) throws ArtifactFilterExcept
}

/**
* Using simply {@code File.getLastModified} will return sometimes a wrong value see JDK bug for details.
* {@code File.getLastModified} sometimes returns a wrong value. See JDK bug for details.
* <p>
* https://bugs.openjdk.java.net/browse/JDK-8177809
*
* @param file {@link File}
* @return the last modification time in milliseconds.
* @throws ArtifactFilterException in case of a IO Exception.
* @throws ArtifactFilterException in case of an IOException
*/
private long getLastModified(File file) throws ArtifactFilterException {
try {
Expand Down
13 changes: 6 additions & 7 deletions src/main/java/org/apache/maven/plugins/dependency/utils/markers/UnpackFileMarkerHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

import java.io.File;

import org.apache.commons.lang3.StringUtils;
import org.apache.maven.plugins.dependency.fromConfiguration.ArtifactItem;

/**
Expand Down Expand Up @@ -52,22 +51,22 @@ public UnpackFileMarkerHandler(ArtifactItem artifactItem, File markerFilesDirect
protected File getMarkerFile() {
/*
* Build a hash of all include/exclude strings, to determine if an artifactItem has been unpacked using the
* include/exclude parameters, this will allow an artifact to be included multiple times with different
* include/exclude parameters
* include/exclude parameters. This allows an artifact to be included multiple times with different
* include/exclude parameters.
*/
File markerFile;
if (this.artifactItem == null
|| (StringUtils.isEmpty(this.artifactItem.getIncludes())
&& StringUtils.isEmpty(this.artifactItem.getExcludes()))) {
|| this.artifactItem.getIncludes().isEmpty()
&& this.artifactItem.getExcludes().isEmpty()) {
markerFile = super.getMarkerFile();
} else {
int includeExcludeHash = 0;

if (StringUtils.isNotEmpty(this.artifactItem.getIncludes())) {
if (!this.artifactItem.getIncludes().isEmpty()) {
includeExcludeHash += this.artifactItem.getIncludes().hashCode();
}

if (StringUtils.isNotEmpty(this.artifactItem.getExcludes())) {
if (!this.artifactItem.getExcludes().isEmpty()) {
includeExcludeHash += this.artifactItem.getExcludes().hashCode();
}

Expand Down