Added tests for StandardFilesMergeTransformer

Author: Jan Diederich

src/main/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.groovy

@@ -8,6 +8,7 @@ import com.github.jengelman.gradle.plugins.shadow.relocation.Relocator
 import com.github.jengelman.gradle.plugins.shadow.transformers.StandardFilesMergeTransformer
 import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
 import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
+import groovy.util.logging.Slf4j
 import org.apache.commons.io.FilenameUtils
 import org.apache.commons.io.IOUtils
 import org.apache.tools.zip.UnixStat
@@ -39,17 +40,14 @@ import org.objectweb.asm.ClassReader
 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.ClassWriter
 import org.objectweb.asm.commons.ClassRemapper
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
 
 import javax.annotation.Nullable
 import java.util.zip.ZipException
 
+@Slf4j
 class ShadowCopyAction implements CopyAction {
     static final long CONSTANT_TIME_FOR_ZIP_ENTRIES = (new GregorianCalendar(1980, 1, 1, 0, 0, 0)).getTimeInMillis()
 
-    final static Logger log = LoggerFactory.getLogger(ShadowCopyAction.class);
-
     private final File zipFile
     private final ZipCompressor compressor
     private final DocumentationRegistry documentationRegistry

src/main/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.java

@@ -1,14 +1,5 @@
 package com.github.jengelman.gradle.plugins.shadow.tasks;
 
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.Callable;
-
-import javax.annotation.Nonnull;
-
 import com.github.jengelman.gradle.plugins.shadow.ShadowStats;
 import com.github.jengelman.gradle.plugins.shadow.internal.DefaultDependencyFilter;
 import com.github.jengelman.gradle.plugins.shadow.internal.DependencyFilter;
@@ -27,14 +18,12 @@
 import com.github.jengelman.gradle.plugins.shadow.transformers.StandardFilesMergeTransformer;
 import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer;
 import org.gradle.api.Action;
-import org.gradle.api.Task;
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.file.DuplicatesStrategy;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.internal.DocumentationRegistry;
 import org.gradle.api.internal.file.FileResolver;
 import org.gradle.api.internal.file.copy.CopyAction;
-import org.gradle.api.specs.Spec;
 import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.Classpath;
 import org.gradle.api.tasks.Input;
@@ -47,9 +36,16 @@
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.SourceSetContainer;
 import org.gradle.api.tasks.TaskAction;
-import org.gradle.api.tasks.*;
 import org.gradle.api.tasks.bundling.Jar;
 import org.gradle.api.tasks.util.PatternSet;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.Callable;
 
 @CacheableTask
 public class ShadowJar extends Jar implements ShadowSpec {
@@ -139,7 +135,7 @@ public InheritManifest getManifest() {
     }
 
     @Override
-    @Nonnull
+    @NotNull
     protected CopyAction createCopyAction() {
         DocumentationRegistry documentationRegistry = getServices().get(DocumentationRegistry.class);
         final UnusedTracker unusedTracker = minimizeJar ? UnusedTracker.forProject(getApiJars(),

src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPluginSpec.groovy

@@ -149,7 +149,38 @@ class ShadowPluginSpec extends PluginSpecification {
         BuildResult result = run('shadow')
 
         then:
-        assert result.output =~ /\s*IGNORING Weird-File\.StrangeFormat from test-project-1\.0-SNAPSHOT\.jar, size is different \([0-9]{4} vs [0-9]{2}\)\s+--> origin JAR was Weird-File.StrangeFormat/
+        assert result.output =~ /\s*IGNORING Weird-File\.StrangeFormat from test-project-1\.0-SNAPSHOT\.jar,/
+                                 / size is different \([0-9]{4} vs [0-9]{2}\)\s+--> origin JAR was Weird-File.StrangeFormat/
+
+        /* Shouldn't appear, because the default StandardFileTransformer should've merged it,
+           instead of just dropping all following licenses. */
+        assert !result.output.contains('license.txt')
+    }
+
+    def 'Tests the removal of the default transformer'() {
+        given:
+        URL artifact = this.class.classLoader.getResource('test-artifact-1.0-SNAPSHOT.jar')
+        URL project = this.class.classLoader.getResource('test-project-1.0-SNAPSHOT.jar')
+
+        buildFile << """
+            |task shadow(type: ${ShadowJar.name}) {
+            |    destinationDirectory = buildDir
+            |    archiveBaseName = 'shadow'
+            |    removeDefaultTransformers()            
+            |    from('${artifact.path}')
+            |    from('${project.path}')
+            |}
+        """.stripMargin()
+
+        when:
+        BuildResult result = run('shadow')
+
+        then:
+        assert result.output =~ /\s*IGNORING Weird-File\.StrangeFormat from test-project-1\.0-SNAPSHOT\.jar,/
+                                / size is different \([0-9]{4} vs [0-9]{2}\)\s+--> origin JAR was Weird-File.StrangeFormat/
+                                /\s+IGNORING test\.json from test-project-1\.0-SNAPSHOT.jar, size is different/
+        // Without the StandardFileTransformer there should be a warning about multiple license files with the same name.
+        assert result.output.contains('license.txt')
     }
 
     def 'include project sources'() {
@@ -213,7 +244,6 @@ class ShadowPluginSpec extends PluginSpecification {
 
             repositories { maven { url "${repo.uri}" } }
             dependencies { implementation project(':client') }
-
         """.stripIndent()
 
         File serverOutput = getFile('server/build/libs/server-all.jar')