You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2021/05/02 22:52:12 UTC
[maven-shade-plugin] branch master updated: try resources and
various cleanup
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 4878e9b try resources and various cleanup
4878e9b is described below
commit 4878e9b4d260c36c719e6637e67c994535a29d94
Author: olivier lamy <ol...@apache.org>
AuthorDate: Mon May 3 08:51:57 2021 +1000
try resources and various cleanup
Signed-off-by: olivier lamy <ol...@apache.org>
---
.../java/org/apache/maven/plugins/shade/DefaultShader.java | 12 ++----------
.../java/org/apache/maven/plugins/shade/mojo/ArtifactId.java | 7 +------
.../apache/maven/plugins/shade/mojo/ArtifactSelector.java | 2 +-
.../org/apache/maven/plugins/shade/mojo/RelativizePath.java | 4 +---
.../java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java | 2 +-
.../org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java | 6 ++----
.../maven/plugins/shade/resource/AppendingTransformer.java | 7 +------
.../plugins/shade/resource/ManifestResourceTransformer.java | 7 +------
.../shade/resource/ResourceBundleAppendingTransformer.java | 7 +------
.../plugins/shade/resource/XmlAppendingTransformer.java | 7 +------
10 files changed, 12 insertions(+), 49 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java b/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
index 31e8be0..d5c19c3 100644
--- a/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
+++ b/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
@@ -100,10 +100,9 @@ public class DefaultShader
// noinspection ResultOfMethodCallIgnored
shadeRequest.getUberJar().getParentFile().mkdirs();
- JarOutputStream out = null;
- try
+ try ( JarOutputStream out =
+ new JarOutputStream( new BufferedOutputStream( new FileOutputStream( shadeRequest.getUberJar() ) ) ) )
{
- out = new JarOutputStream( new BufferedOutputStream( new FileOutputStream( shadeRequest.getUberJar() ) ) );
goThroughAllJarEntriesForManifestTransformer( shadeRequest, resources, manifestTransformer, out );
// CHECKSTYLE_OFF: MagicNumber
@@ -140,13 +139,6 @@ public class DefaultShader
transformer.modifyOutputStream( out );
}
}
-
- out.close();
- out = null;
- }
- finally
- {
- IOUtil.close( out );
}
for ( Filter filter : shadeRequest.getFilters() )
diff --git a/src/main/java/org/apache/maven/plugins/shade/mojo/ArtifactId.java b/src/main/java/org/apache/maven/plugins/shade/mojo/ArtifactId.java
index 6e0da71..8351f9f 100644
--- a/src/main/java/org/apache/maven/plugins/shade/mojo/ArtifactId.java
+++ b/src/main/java/org/apache/maven/plugins/shade/mojo/ArtifactId.java
@@ -106,12 +106,7 @@ class ArtifactId
{
return false;
}
- if ( !match( getClassifier(), pattern.getClassifier() ) )
- {
- return false;
- }
-
- return true;
+ return match( getClassifier(), pattern.getClassifier() );
}
private boolean match( String str, String pattern )
diff --git a/src/main/java/org/apache/maven/plugins/shade/mojo/ArtifactSelector.java b/src/main/java/org/apache/maven/plugins/shade/mojo/ArtifactSelector.java
index 0ce080d..d332091 100644
--- a/src/main/java/org/apache/maven/plugins/shade/mojo/ArtifactSelector.java
+++ b/src/main/java/org/apache/maven/plugins/shade/mojo/ArtifactSelector.java
@@ -73,7 +73,7 @@ class ArtifactSelector
public boolean isSelected( Artifact artifact )
{
- return ( artifact != null ) ? isSelected( new ArtifactId( artifact ) ) : false;
+ return artifact != null && isSelected( new ArtifactId( artifact ) );
}
boolean isSelected( ArtifactId id )
diff --git a/src/main/java/org/apache/maven/plugins/shade/mojo/RelativizePath.java b/src/main/java/org/apache/maven/plugins/shade/mojo/RelativizePath.java
index d065325..5612305 100644
--- a/src/main/java/org/apache/maven/plugins/shade/mojo/RelativizePath.java
+++ b/src/main/java/org/apache/maven/plugins/shade/mojo/RelativizePath.java
@@ -54,9 +54,7 @@ public final class RelativizePath
List<String> relativeToDirectories = RelativizePath.parentDirs( relativeTo );
//Get the shortest of the two paths
- int length =
- thingDirectories.size() < relativeToDirectories.size() ? thingDirectories.size()
- : relativeToDirectories.size();
+ int length = Math.min( thingDirectories.size(), relativeToDirectories.size() );
int lastCommonRoot = -1; // index of the lowest directory down from the root that the two have in common.
int index;
diff --git a/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java b/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
index a6e84d9..2f8f6c5 100644
--- a/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
+++ b/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
@@ -1321,7 +1321,7 @@ public class ShadeMojo
private List<ResourceTransformer> toResourceTransformers(
String shade, List<ResourceTransformer> resourceTransformers )
{
- List<ResourceTransformer> forShade = new ArrayList<ResourceTransformer>();
+ List<ResourceTransformer> forShade = new ArrayList<>();
ManifestResourceTransformer lastMt = null;
for ( ResourceTransformer transformer : resourceTransformers )
{
diff --git a/src/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java b/src/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java
index a8b80d3..f712eb0 100644
--- a/src/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java
+++ b/src/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java
@@ -1092,9 +1092,8 @@ public class MavenJDOMWriter
Collection<Xpp3Dom> domChilds = new ArrayList<>();
Collections.addAll( domChilds, childs );
// int domIndex = 0;
- for ( Object o : parent.getChildren() )
+ for ( Element elem : parent.getChildren() )
{
- Element elem = (Element) o;
Xpp3Dom corrDom = null;
for ( Xpp3Dom dm : domChilds )
{
@@ -1115,9 +1114,8 @@ public class MavenJDOMWriter
parent.removeContent( elem );
}
}
- for ( Object domChild : domChilds )
+ for ( Xpp3Dom dm : domChilds )
{
- Xpp3Dom dm = (Xpp3Dom) domChild;
Element elem = factory.element( dm.getName(), parent.getNamespace() );
insertAtPreferredLocation( parent, elem, counter );
counter.increaseCount();
diff --git a/src/main/java/org/apache/maven/plugins/shade/resource/AppendingTransformer.java b/src/main/java/org/apache/maven/plugins/shade/resource/AppendingTransformer.java
index c3cc937..7774604 100644
--- a/src/main/java/org/apache/maven/plugins/shade/resource/AppendingTransformer.java
+++ b/src/main/java/org/apache/maven/plugins/shade/resource/AppendingTransformer.java
@@ -43,12 +43,7 @@ public class AppendingTransformer
public boolean canTransformResource( String r )
{
- if ( resource != null && resource.equalsIgnoreCase( r ) )
- {
- return true;
- }
-
- return false;
+ return resource != null && resource.equalsIgnoreCase( r );
}
public void processResource( String resource, InputStream is, List<Relocator> relocators, long time )
diff --git a/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java b/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java
index fe38979..d835afd 100644
--- a/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java
+++ b/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java
@@ -82,12 +82,7 @@ public class ManifestResourceTransformer
@Override
public boolean canTransformResource( String resource )
{
- if ( JarFile.MANIFEST_NAME.equalsIgnoreCase( resource ) )
- {
- return true;
- }
-
- return false;
+ return JarFile.MANIFEST_NAME.equalsIgnoreCase( resource );
}
@Override
diff --git a/src/main/java/org/apache/maven/plugins/shade/resource/ResourceBundleAppendingTransformer.java b/src/main/java/org/apache/maven/plugins/shade/resource/ResourceBundleAppendingTransformer.java
index 5ea56cf..a84322e 100644
--- a/src/main/java/org/apache/maven/plugins/shade/resource/ResourceBundleAppendingTransformer.java
+++ b/src/main/java/org/apache/maven/plugins/shade/resource/ResourceBundleAppendingTransformer.java
@@ -58,12 +58,7 @@ public class ResourceBundleAppendingTransformer
public boolean canTransformResource( String r )
{
- if ( resourceBundlePattern != null && resourceBundlePattern.matcher( r ).matches() )
- {
- return true;
- }
-
- return false;
+ return resourceBundlePattern != null && resourceBundlePattern.matcher( r ).matches();
}
public void processResource( String resource, InputStream is, List<Relocator> relocators, long time )
diff --git a/src/main/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformer.java b/src/main/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformer.java
index f5f6ac8..c60cebc 100644
--- a/src/main/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformer.java
+++ b/src/main/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformer.java
@@ -58,12 +58,7 @@ public class XmlAppendingTransformer
public boolean canTransformResource( String r )
{
- if ( resource != null && resource.equalsIgnoreCase( r ) )
- {
- return true;
- }
-
- return false;
+ return resource != null && resource.equalsIgnoreCase( r );
}
public void processResource( String resource, InputStream is, List<Relocator> relocators, long time )