This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MSHADE-364
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
commit e2ddd0713b91f6692ba007c848dbf172bd9f4d3c
Author: Romain Manni-Bucau <rmannibu...@gmail.com>
AuthorDate: Tue May 12 17:13:57 2020 +0200
dropping some finals, fixing some english wordings (plural/singular)
---
.../apache/maven/plugins/shade/DefaultShader.java | 18 ++++++++--
.../maven/plugins/shade/DefaultShaderTest.java | 42 +++++++++++-----------
2 files changed, 37 insertions(+), 23 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 ffd902d..2905e02 100644
--- a/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
+++ b/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
@@ -342,11 +342,25 @@ public class DefaultShader
final Collection<String> overlaps = new ArrayList<>();
if ( !classes.isEmpty() )
{
- overlaps.add( "classes" );
+ if ( resources.size() == 1 )
+ {
+ overlaps.add( "classe" );
+ }
+ else
+ {
+ overlaps.add( "classes" );
+ }
}
if ( !resources.isEmpty() )
{
- overlaps.add( "resources" );
+ if ( resources.size() == 1 )
+ {
+ overlaps.add( "resource" );
+ }
+ else
+ {
+ overlaps.add( "resources" );
+ }
}
final List<String> all = new ArrayList<>( classes.size() +
resources.size() );
diff --git
a/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java
b/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java
index b1aaae5..012a366 100644
--- a/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java
+++ b/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java
@@ -85,7 +85,7 @@ public class DefaultShaderTest
final String failureWarnMessage = logs.warnMessages.toString();
assertTrue(failureWarnMessage, logs.warnMessages.contains(
- "plexus-utils-1.4.1.jar, test-project-1.0-SNAPSHOT.jar define
1 overlapping resources:"));
+ "plexus-utils-1.4.1.jar, test-project-1.0-SNAPSHOT.jar define
1 overlapping resource:"));
assertTrue(failureWarnMessage, logs.warnMessages.contains("-
META-INF/MANIFEST.MF"));
final String failureDebugMessage = logs.debugMessages.toString();
@@ -94,18 +94,18 @@ public class DefaultShaderTest
}
public void testOverlappingResourcesAreLoggedExceptATransformerHandlesIt()
throws Exception {
- final TemporaryFolder temporaryFolder = new TemporaryFolder();
- final Set<File> set = new LinkedHashSet<>();
+ TemporaryFolder temporaryFolder = new TemporaryFolder();
+ Set<File> set = new LinkedHashSet<>();
temporaryFolder.create();
- final File j1 = temporaryFolder.newFile("j1.jar");
- try (final JarOutputStream jos = new JarOutputStream(new
FileOutputStream( j1 ) ) )
+ File j1 = temporaryFolder.newFile("j1.jar");
+ try ( JarOutputStream jos = new JarOutputStream(new FileOutputStream(
j1 ) ) )
{
jos.putNextEntry(new JarEntry( "foo.txt" ));
jos.write("c1".getBytes(StandardCharsets.UTF_8));
jos.closeEntry();
}
- final File j2 = temporaryFolder.newFile("j2.jar");
- try (final JarOutputStream jos = new JarOutputStream(new
FileOutputStream( j2 ) ) )
+ File j2 = temporaryFolder.newFile("j2.jar");
+ try ( JarOutputStream jos = new JarOutputStream(new FileOutputStream(
j2 ) ) )
{
jos.putNextEntry(new JarEntry( "foo.txt" ));
jos.write("c2".getBytes(StandardCharsets.UTF_8));
@@ -114,25 +114,25 @@ public class DefaultShaderTest
set.add( j1 );
set.add( j2 );
- final AppendingTransformer transformer = new AppendingTransformer();
- final Field resource = AppendingTransformer.class.getDeclaredField(
"resource" );
+ AppendingTransformer transformer = new AppendingTransformer();
+ Field resource = AppendingTransformer.class.getDeclaredField(
"resource" );
resource.setAccessible( true );
resource.set( transformer, "foo.txt" );
- final ShadeRequest shadeRequest = new ShadeRequest();
+ ShadeRequest shadeRequest = new ShadeRequest();
shadeRequest.setJars( set );
shadeRequest.setRelocators( Collections.<Relocator>emptyList() );
shadeRequest.setResourceTransformers(
Collections.<ResourceTransformer>singletonList( transformer) );
shadeRequest.setFilters( Collections.<Filter>emptyList() );
shadeRequest.setUberJar( new File(
"target/foo-custom_testOverlappingResourcesAreLogged.jar" ) );
- final DefaultShader shaderWithTransformer = new DefaultShader();
+ DefaultShader shaderWithTransformer = new DefaultShader();
final MockLogger logWithTransformer = new MockLogger();
shaderWithTransformer.enableLogging( logWithTransformer );
shaderWithTransformer.shade( shadeRequest );
- final DefaultShader shaderWithoutTransformer = new DefaultShader();
- final MockLogger logWithoutTransformer = new MockLogger();
+ DefaultShader shaderWithoutTransformer = new DefaultShader();
+ MockLogger logWithoutTransformer = new MockLogger();
shaderWithoutTransformer.enableLogging( logWithoutTransformer );
shadeRequest.setResourceTransformers(
Collections.<ResourceTransformer>emptyList() );
shaderWithoutTransformer.shade( shadeRequest );
@@ -141,7 +141,7 @@ public class DefaultShaderTest
assertTrue(logWithTransformer.warnMessages.toString(),
logWithTransformer.warnMessages.isEmpty());
assertTrue(logWithoutTransformer.warnMessages.toString(),
logWithoutTransformer.warnMessages.containsAll(
- Arrays.<String>asList( "j1.jar, j2.jar define 1 overlapping
resources:", "- foo.txt" ) ) );
+ Arrays.<String>asList( "j1.jar, j2.jar define 1 overlapping
resource:", "- foo.txt" ) ) );
}
public void testShaderWithDefaultShadedPattern()
@@ -300,43 +300,43 @@ public class DefaultShaderTest
private final List<String> debugMessages = new ArrayList<>();
private final List<String> warnMessages = new ArrayList<>();
- public MockLogger()
+ private MockLogger()
{
super( Logger.LEVEL_INFO, "test" );
}
@Override
- public void debug( final String s, final Throwable throwable )
+ public void debug( String s, Throwable throwable )
{
debugMessages.add( s.replace( '\\', '/' ).trim() );
}
@Override
- public void info( final String s, final Throwable throwable )
+ public void info( String s, Throwable throwable )
{
// no-op
}
@Override
- public void warn( final String s, final Throwable throwable )
+ public void warn( String s, Throwable throwable )
{
warnMessages.add( s.replace( '\\', '/' ).trim() );
}
@Override
- public void error( final String s, final Throwable throwable )
+ public void error( String s, Throwable throwable )
{
// no-op
}
@Override
- public void fatalError( final String s, final Throwable throwable )
+ public void fatalError( String s, Throwable throwable )
{
// no-op
}
@Override
- public Logger getChildLogger( final String s )
+ public Logger getChildLogger( String s )
{
return this;
}
