You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2013/03/30 09:06:45 UTC
svn commit: r1462713 - in
/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade:
./ filter/ mojo/ relocation/ resource/
Author: hboutemy
Date: Sat Mar 30 08:06:45 2013
New Revision: 1462713
URL: http://svn.apache.org/r1462713
Log:
code formatting
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/RelativizePath.java
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/relocation/Relocator.java
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java?rev=1462713&r1=1462712&r2=1462713&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java Sat Mar 30 08:06:45 2013
@@ -33,7 +33,13 @@ import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.commons.Remapper;
import org.objectweb.asm.commons.RemappingClassAdapter;
-import java.io.*;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashSet;
@@ -62,7 +68,8 @@ public class DefaultShader
Set<String> resources = new HashSet<String>();
ResourceTransformer manifestTransformer = null;
- List<ResourceTransformer> transformers = new ArrayList<ResourceTransformer>( shadeRequest.getResourceTransformers() );
+ List<ResourceTransformer> transformers =
+ new ArrayList<ResourceTransformer>( shadeRequest.getResourceTransformers() );
for ( Iterator<ResourceTransformer> it = transformers.iterator(); it.hasNext(); )
{
ResourceTransformer transformer = it.next();
@@ -76,8 +83,8 @@ public class DefaultShader
RelocatorRemapper remapper = new RelocatorRemapper( shadeRequest.getRelocators() );
shadeRequest.getUberJar().getParentFile().mkdirs();
- FileOutputStream fileOutputStream = new FileOutputStream(shadeRequest.getUberJar());
- JarOutputStream jos = new JarOutputStream( new BufferedOutputStream(fileOutputStream) );
+ FileOutputStream fileOutputStream = new FileOutputStream( shadeRequest.getUberJar() );
+ JarOutputStream jos = new JarOutputStream( new BufferedOutputStream( fileOutputStream ) );
if ( manifestTransformer != null )
{
@@ -91,7 +98,8 @@ public class DefaultShader
if ( manifestTransformer.canTransformResource( resource ) )
{
resources.add( resource );
- manifestTransformer.processResource( resource, jarFile.getInputStream( entry ), shadeRequest.getRelocators() );
+ manifestTransformer.processResource( resource, jarFile.getInputStream( entry ),
+ shadeRequest.getRelocators() );
break;
}
}
@@ -343,8 +351,9 @@ public class DefaultShader
String sourceContent = IOUtil.toString( new InputStreamReader( is, "UTF-8" ) );
- for ( Relocator relocator : relocators ) {
- sourceContent = relocator.applyToSourceContent(sourceContent);
+ for ( Relocator relocator : relocators )
+ {
+ sourceContent = relocator.applyToSourceContent( sourceContent );
}
OutputStreamWriter writer = new OutputStreamWriter( jos, "UTF-8" );
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java?rev=1462713&r1=1462712&r2=1462713&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java Sat Mar 30 08:06:45 2013
@@ -103,16 +103,19 @@ public class MinijarFilter
}
catch ( ZipException e )
{
- log.warn( dependency.getFile() + " could not be unpacked/read for minimization; dependency is probably malformed." );
- IOException ioe = new IOException( "Dependency " + dependency.toString() + " in file " + dependency.getFile() +
- " could not be unpacked. File is probably corrupt" );
+ log.warn( dependency.getFile()
+ + " could not be unpacked/read for minimization; dependency is probably malformed." );
+ IOException ioe =
+ new IOException( "Dependency " + dependency.toString() + " in file " + dependency.getFile()
+ + " could not be unpacked. File is probably corrupt" );
ioe.initCause( e );
throw ioe;
}
catch ( ArrayIndexOutOfBoundsException e )
{
//trap ArrayIndexOutOfBoundsExceptions caused by malformed dependency classes (MSHADE-107)
- log.warn( dependency.toString() + " could not be analyzed for minimization; dependency is probably malformed." );
+ log.warn( dependency.toString()
+ + " could not be analyzed for minimization; dependency is probably malformed." );
}
finally
{
@@ -205,9 +208,9 @@ public class MinijarFilter
public void finished()
{
- int classes_total = classesRemoved + classesKept;
+ int classesTotal = classesRemoved + classesKept;
log.info(
- "Minimized " + classes_total + " -> " + classesKept + " (" + (int) ( 100 * classesKept / classes_total )
+ "Minimized " + classesTotal + " -> " + classesKept + " (" + (int) ( 100 * classesKept / classesTotal )
+ "%)" );
}
}
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/RelativizePath.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/RelativizePath.java?rev=1462713&r1=1462712&r2=1462713&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/RelativizePath.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/RelativizePath.java Sat Mar 30 08:06:45 2013
@@ -1,3 +1,5 @@
+package org.apache.maven.plugins.shade.mojo;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,8 +19,6 @@
* under the License.
*/
-package org.apache.maven.plugins.shade.mojo;
-
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
@@ -29,7 +29,8 @@ import java.util.List;
*/
public final class RelativizePath
{
- private RelativizePath() {
+ private RelativizePath()
+ {
//
}
@@ -39,10 +40,11 @@ public final class RelativizePath
* @param relativeTo base to relativize it do. (e.g., a pom into which a relative pathname to the 'thing' is to be installed).
* @return
*/
- static String convertToRelativePath(File thing, File relativeTo) {
+ static String convertToRelativePath( File thing, File relativeTo )
+ {
StringBuilder relativePath = null;
-
- if ( thing.getParentFile().equals( relativeTo.getParentFile() ))
+
+ if ( thing.getParentFile().equals( relativeTo.getParentFile() ) )
{
return thing.getName(); // a very simple relative path.
}
@@ -59,15 +61,18 @@ public final class RelativizePath
//Find common root
for ( index = 0; index < length; index++ )
{
- if ( thingDirectories.get( index ).equals(relativeToDirectories.get( index )))
+ if ( thingDirectories.get( index ).equals( relativeToDirectories.get( index ) ) )
{
lastCommonRoot = index;
- } else {
+ }
+ else
+ {
break;
}
}
- if (lastCommonRoot != -1) { // possible on Windows or other multi-root cases.
- //Build up the relative path
+ if ( lastCommonRoot != -1 )
+ { // possible on Windows or other multi-root cases.
+ // Build up the relative path
relativePath = new StringBuilder();
// add ..'s to get from the base up to the common point
for ( index = lastCommonRoot + 1; index < relativeToDirectories.size(); index++ )
@@ -78,7 +83,7 @@ public final class RelativizePath
// now add down from the common point to the actual 'thing' item.
for ( index = lastCommonRoot + 1; index < thingDirectories.size(); index++ )
{
- relativePath.append( thingDirectories.get( index ) + "/" );
+ relativePath.append( thingDirectories.get( index ) + '/' );
}
relativePath.append( thing.getName() );
return relativePath.toString();
@@ -91,7 +96,7 @@ public final class RelativizePath
List<String> results = new ArrayList<String>();
for ( File p = of.getParentFile() ; p != null ; p = p.getParentFile() )
{
- if ( !"".equals(p.getName()) )
+ if ( !"".equals( p.getName() ) )
{
results.add( p.getName() );
}
@@ -100,7 +105,4 @@ public final class RelativizePath
Collections.reverse( results );
return results;
}
-
-
-
}
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java?rev=1462713&r1=1462712&r2=1462713&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java Sat Mar 30 08:06:45 2013
@@ -23,7 +23,6 @@ import org.apache.maven.artifact.Artifac
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ArtifactCollector;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolver;
@@ -281,9 +280,9 @@ public class ShadeMojo
/**
* Where to put the dependency reduced pom.
- * Note: setting a value for this parameter with a directory other than ${basedir} will change the value of ${basedir}
- * for all executions that come after the shade execution. This is often not what you want. This is considered
- * an open issue with this plugin.
+ * Note: setting a value for this parameter with a directory other than ${basedir} will change the value of
+ * ${basedir} for all executions that come after the shade execution. This is often not what you want.
+ * This is considered an open issue with this plugin.
*
* @since 1.7
*/
@@ -333,7 +332,7 @@ public class ShadeMojo
* actual contents of the java source files.
*
*/
- @Parameter(property = "shadeSourcesContent", defaultValue = "false")
+ @Parameter( property = "shadeSourcesContent", defaultValue = "false" )
private boolean shadeSourcesContent;
/**
@@ -883,8 +882,10 @@ public class ShadeMojo
if ( generateUniqueDependencyReducedPom )
{
- dependencyReducedPomLocation = File.createTempFile( "dependency-reduced-pom-", ".xml", project.getBasedir() );
- project.getProperties().setProperty( "maven.shade.dependency-reduced-pom", dependencyReducedPomLocation.getAbsolutePath() );
+ dependencyReducedPomLocation =
+ File.createTempFile( "dependency-reduced-pom-", ".xml", project.getBasedir() );
+ project.getProperties().setProperty( "maven.shade.dependency-reduced-pom",
+ dependencyReducedPomLocation.getAbsolutePath() );
}
else
{
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/relocation/Relocator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/relocation/Relocator.java?rev=1462713&r1=1462712&r2=1462713&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/relocation/Relocator.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/relocation/Relocator.java Sat Mar 30 08:06:45 2013
@@ -32,5 +32,5 @@ public interface Relocator
String relocateClass( String clazz );
- String applyToSourceContent(String sourceContent);
+ String applyToSourceContent( String sourceContent );
}
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java?rev=1462713&r1=1462712&r2=1462713&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java Sat Mar 30 08:06:45 2013
@@ -170,7 +170,8 @@ public class SimpleRelocator
return false;
}
- // Allow for annoying option of an extra / on the front of a path. See MSHADE-119; comes from getClass().getResource("/a/b/c.properties").
+ // Allow for annoying option of an extra / on the front of a path. See MSHADE-119; comes from
+ // getClass().getResource("/a/b/c.properties").
return path.startsWith( pathPattern ) || path.startsWith ( "/" + pathPattern );
}
@@ -196,15 +197,15 @@ public class SimpleRelocator
return clazz.replaceFirst( pattern, shadedPattern );
}
- public String applyToSourceContent(String sourceContent)
- {
+ public String applyToSourceContent( String sourceContent )
+ {
if ( rawString )
{
- return sourceContent;
+ return sourceContent;
}
else
{
return sourceContent.replaceAll( "\\b" + pattern, shadedPattern );
}
- }
+ }
}
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java?rev=1462713&r1=1462712&r2=1462713&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java Sat Mar 30 08:06:45 2013
@@ -101,7 +101,7 @@ public class ManifestResourceTransformer
if ( manifestEntries != null )
{
- for ( Map.Entry<String,Attributes> entry : manifestEntries.entrySet() )
+ for ( Map.Entry<String, Attributes> entry : manifestEntries.entrySet() )
{
attributes.put( new Attributes.Name( entry.getKey() ), entry.getValue() );
}