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

basic dir handling in default shader #108

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

basic dir handling in default shader #108

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
046916d
basic dir handling in default shader
rmannibucau Jul 20, 2021
6c3d67a
@kriegaex feedback on the lack of minijarfilter handling for directories
rmannibucau Jul 21, 2021
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
177 changes: 129 additions & 48 deletions src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
Expand All @@ -40,6 +41,7 @@
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.Callable;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.jar.JarOutputStream;
Expand Down Expand Up @@ -231,60 +233,140 @@ private void shadeJars( ShadeRequest shadeRequest, Set<String> resources, List<R
logger.debug( "Processing JAR " + jar );

List<Filter> jarFilters = getFilters( jar, shadeRequest.getFilters() );

try ( JarFile jarFile = newJarFile( jar ) )
if ( jar.isDirectory() )
{
shadeDir( shadeRequest, resources, transformers, remapper, jos, duplicates, jar, jar, "", jarFilters );
}
else
{
shadeJar( shadeRequest, resources, transformers, remapper, jos, duplicates, jar, jarFilters );
}
}
}

for ( Enumeration<JarEntry> j = jarFile.entries(); j.hasMoreElements(); )
private void shadeDir( ShadeRequest shadeRequest, Set<String> resources,
List<ResourceTransformer> transformers, RelocatorRemapper remapper,
JarOutputStream jos, MultiValuedMap<String, File> duplicates,
File jar, File current, String prefix, List<Filter> jarFilters ) throws IOException
{
final File[] children = current.listFiles();
if ( children == null )
{
return;
}
for ( final File file : children )
{
final String name = prefix + file.getName();
if ( file.isDirectory() )
{
try
{
shadeDir(
shadeRequest, resources, transformers, remapper, jos,
duplicates, jar, file,
prefix + file.getName() + '/', jarFilters );
continue;
}
catch ( Exception e )
{
JarEntry entry = j.nextElement();
throw new IOException(
String.format( "Problem shading JAR %s entry %s: %s", current, name, e ), e );
}
}
if ( isFiltered( jarFilters, name ) || isExcludedEntry( name ) )
{
continue;
}

String name = entry.getName();

if ( entry.isDirectory() || isFiltered( jarFilters, name ) )
{
continue;
}
try
{
shadeSingleJar(
shadeRequest, resources, transformers, remapper, jos, duplicates, jar,
new Callable<InputStream>()
{
@Override
public InputStream call() throws Exception
{
return new FileInputStream( file );
}
}, name, file.lastModified(), -1 /*ignore*/ );
}
catch ( Exception e )
{
throw new IOException( String.format( "Problem shading JAR %s entry %s: %s", current, name, e ),
e );
}
}
}

private void shadeJar( ShadeRequest shadeRequest, Set<String> resources,
List<ResourceTransformer> transformers, RelocatorRemapper remapper,
JarOutputStream jos, MultiValuedMap<String, File> duplicates,
File jar, List<Filter> jarFilters ) throws IOException
{
try ( JarFile jarFile = newJarFile( jar ) )
{

if ( "META-INF/INDEX.LIST".equals( name ) )
{
// we cannot allow the jar indexes to be copied over or the
// jar is useless. Ideally, we could create a new one
// later
continue;
}
for ( Enumeration<JarEntry> j = jarFile.entries(); j.hasMoreElements(); )
{
final JarEntry entry = j.nextElement();

if ( "module-info.class".equals( name ) )
{
logger.warn( "Discovered module-info.class. "
+ "Shading will break its strong encapsulation." );
continue;
}
String name = entry.getName();

try
{
shadeSingleJar( shadeRequest, resources, transformers, remapper, jos, duplicates, jar,
jarFile, entry, name );
}
catch ( Exception e )
{
throw new IOException( String.format( "Problem shading JAR %s entry %s: %s", jar, name, e ),
e );
}
if ( entry.isDirectory() || isFiltered( jarFilters, name ) || isExcludedEntry( name ) )
{
continue;
}

try
{
shadeSingleJar(
shadeRequest, resources, transformers, remapper, jos, duplicates, jar,
new Callable<InputStream>()
{
@Override
public InputStream call() throws Exception
{
return jarFile.getInputStream( entry );
}
}, name, entry.getTime(), entry.getMethod() );
}
catch ( Exception e )
{
throw new IOException( String.format( "Problem shading JAR %s entry %s: %s", jar, name, e ),
e );
}
}

}
}

private boolean isExcludedEntry( final String name )
{
if ( "META-INF/INDEX.LIST".equals( name ) )
{
// we cannot allow the jar indexes to be copied over or the
// jar is useless. Ideally, we could create a new one
// later
return true;
}

if ( "module-info.class".equals( name ) )
{
logger.warn( "Discovered module-info.class. "
+ "Shading will break its strong encapsulation." );
return true;
}
return false;
}

private void shadeSingleJar( ShadeRequest shadeRequest, Set<String> resources,
List<ResourceTransformer> transformers, RelocatorRemapper remapper,
JarOutputStream jos, MultiValuedMap<String, File> duplicates, File jar,
JarFile jarFile, JarEntry entry, String name )
throws IOException, MojoExecutionException
Callable<InputStream> inputProvider, String name, long time, int method )
throws Exception
{
try ( InputStream in = jarFile.getInputStream( entry ) )
try ( InputStream in = inputProvider.call() )
{
String mappedName = remapper.map( name );

Expand All @@ -295,14 +377,14 @@ private void shadeSingleJar( ShadeRequest shadeRequest, Set<String> resources,
String dir = mappedName.substring( 0, idx );
if ( !resources.contains( dir ) )
{
addDirectory( resources, jos, dir, entry.getTime() );
addDirectory( resources, jos, dir, time );
}
}

duplicates.put( name, jar );
if ( name.endsWith( ".class" ) )
{
addRemappedClass( remapper, jos, jar, name, entry.getTime(), in );
addRemappedClass( remapper, jos, jar, name, time, in );
}
else if ( shadeRequest.isShadeSourcesContent() && name.endsWith( ".java" ) )
{
Expand All @@ -312,12 +394,12 @@ else if ( shadeRequest.isShadeSourcesContent() && name.endsWith( ".java" ) )
return;
}

addJavaSource( resources, jos, mappedName, entry.getTime(), in, shadeRequest.getRelocators() );
addJavaSource( resources, jos, mappedName, time, in, shadeRequest.getRelocators() );
}
else
{
if ( !resourceTransformed( transformers, mappedName, in, shadeRequest.getRelocators(),
entry.getTime() ) )
time ) )
{
// Avoid duplicates that aren't accounted for by the resource transformers
if ( resources.contains( mappedName ) )
Expand All @@ -326,7 +408,7 @@ else if ( shadeRequest.isShadeSourcesContent() && name.endsWith( ".java" ) )
return;
}

addResource( resources, jos, mappedName, entry, jarFile );
addResource( resources, jos, mappedName, inputProvider, time, method );
}
else
{
Expand Down Expand Up @@ -655,24 +737,24 @@ private void addJavaSource( Set<String> resources, JarOutputStream jos, String n
resources.add( name );
}

private void addResource( Set<String> resources, JarOutputStream jos, String name, JarEntry originalEntry,
JarFile jarFile ) throws IOException
private void addResource( Set<String> resources, JarOutputStream jos, String name, Callable<InputStream> input,
long time, int method ) throws Exception
{
ZipHeaderPeekInputStream inputStream = new ZipHeaderPeekInputStream( jarFile.getInputStream( originalEntry ) );
ZipHeaderPeekInputStream inputStream = new ZipHeaderPeekInputStream( input.call() );
try
{
final JarEntry entry = new JarEntry( name );

// We should not change compressed level of uncompressed entries, otherwise JVM can't load these nested jars
if ( inputStream.hasZipHeader() && originalEntry.getMethod() == ZipEntry.STORED )
if ( inputStream.hasZipHeader() && method == ZipEntry.STORED )
{
new CrcAndSize( inputStream ).setupStoredEntry( entry );
inputStream.close();
inputStream = new ZipHeaderPeekInputStream( jarFile.getInputStream( originalEntry ) );
inputStream = new ZipHeaderPeekInputStream( input.call() );
}


entry.setTime( originalEntry.getTime() );
entry.setTime( time );

jos.putNextEntry( entry );

Expand Down Expand Up @@ -770,5 +852,4 @@ public String map( String name )
}

}

}
Loading