Author: olamy
Date: Sat Nov 26 11:03:39 2016
New Revision: 1771460
URL: http://svn.apache.org/viewvc?rev=1771460&view=rev
Log:
formatting
Signed-off-by: olivier lamy <ol...@apache.org>
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformerTest.java
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java?rev=1771460&r1=1771459&r2=1771460&view=diff
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java
Sat Nov 26 11:03:39 2016
@@ -35,13 +35,18 @@ import java.util.jar.JarOutputStream;
/**
* @author <a href="mailto:jul...@julienviet.com";>Julien Viet</a>
*/
-public class GroovyResourceTransformer implements ResourceTransformer
+public class GroovyResourceTransformer
+ implements ResourceTransformer
{
static final String EXT_MODULE_NAME =
"META-INF/services/org.codehaus.groovy.runtime.ExtensionModule";
+
private List<String> extensionClassesList = new ArrayList<String>();
+
private List<String> staticExtensionClassesList = new ArrayList<String>();
+
String extModuleName = "no-module-name";
+
String extModuleVersion = "1.0";
@Override
@@ -51,27 +56,28 @@ public class GroovyResourceTransformer i
}
@Override
- public void processResource( String resource, InputStream is,
List<Relocator> relocators ) throws IOException
+ public void processResource( String resource, InputStream is,
List<Relocator> relocators )
+ throws IOException
{
- Properties out = new Properties();
- try
- {
- out.load( is );
- }
- finally
- {
- is.close();
- }
- String extensionClasses = out.getProperty( "extensionClasses" , ""
).trim();
- if ( extensionClasses.length() > 0 )
- {
- append( extensionClasses, extensionClassesList );
- }
- String staticExtensionClasses = out.getProperty(
"staticExtensionClasses", "" ).trim();
- if ( staticExtensionClasses.length() > 0 )
- {
- append( staticExtensionClasses, staticExtensionClassesList );
- }
+ Properties out = new Properties();
+ try
+ {
+ out.load( is );
+ }
+ finally
+ {
+ is.close();
+ }
+ String extensionClasses = out.getProperty( "extensionClasses", ""
).trim();
+ if ( extensionClasses.length() > 0 )
+ {
+ append( extensionClasses, extensionClassesList );
+ }
+ String staticExtensionClasses = out.getProperty(
"staticExtensionClasses", "" ).trim();
+ if ( staticExtensionClasses.length() > 0 )
+ {
+ append( staticExtensionClasses, staticExtensionClassesList );
+ }
}
private void append( String entry, List<String> list )
@@ -89,7 +95,8 @@ public class GroovyResourceTransformer i
}
@Override
- public void modifyOutputStream( JarOutputStream os ) throws IOException
+ public void modifyOutputStream( JarOutputStream os )
+ throws IOException
{
if ( hasTransformedResource() )
{
Modified:
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java?rev=1771460&r1=1771459&r2=1771460&view=diff
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java
Sat Nov 26 11:03:39 2016
@@ -28,7 +28,7 @@ import java.util.Arrays;
* Test for {@link SimpleRelocator}.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class SimpleRelocatorTest
extends TestCase
Modified:
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java?rev=1771460&r1=1771459&r2=1771460&view=diff
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java
Sat Nov 26 11:03:39 2016
@@ -34,7 +34,7 @@ import java.util.Collections;
* Test for {@link ComponentsXmlResourceTransformer}.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public class ComponentsXmlResourceTransformerTest
extends TestCase
Modified:
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java?rev=1771460&r1=1771459&r2=1771460&view=diff
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java
Sat Nov 26 11:03:39 2016
@@ -34,16 +34,16 @@ import java.util.jar.JarOutputStream;
import java.util.zip.ZipEntry;
/**
- * Test for {@link XmlAppendingTransformer}.
- *
+ * Test for {@link GroovyResourceTransformer}.
+ *
* @author Julien Viet
- * @version $Id$
*/
public class GroovyResourceTransformerTest
extends TestCase
{
- private static InputStream stream( Properties props ) throws Exception
+ private static InputStream stream( Properties props )
+ throws Exception
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
props.store( baos, null );
@@ -51,7 +51,9 @@ public class GroovyResourceTransformerTe
}
- private static InputStream module( String name, String version, String
extensionClasses, String staticExtensionClasses ) throws Exception
+ private static InputStream module( String name, String version, String
extensionClasses,
+ String staticExtensionClasses )
+ throws Exception
{
Properties desc = new Properties();
desc.setProperty( "moduleName", name );
@@ -67,7 +69,8 @@ public class GroovyResourceTransformerTe
return stream( desc );
}
- private static Properties transform( GroovyResourceTransformer transformer
) throws Exception
+ private static Properties transform( GroovyResourceTransformer transformer
)
+ throws Exception
{
File tempJar = File.createTempFile( "shade.", ".jar" );
tempJar.deleteOnExit();
@@ -86,7 +89,8 @@ public class GroovyResourceTransformerTe
return desc;
}
- public void testFilter() throws Exception
+ public void testFilter()
+ throws Exception
{
GroovyResourceTransformer transformer = new
GroovyResourceTransformer();
assertTrue( transformer.canTransformResource(
GroovyResourceTransformer.EXT_MODULE_NAME ) );
@@ -94,20 +98,23 @@ public class GroovyResourceTransformerTe
assertFalse( transformer.canTransformResource( JarFile.MANIFEST_NAME )
);
}
- public void testEmpty() throws Exception
+ public void testEmpty()
+ throws Exception
{
GroovyResourceTransformer transformer = new
GroovyResourceTransformer();
assertFalse( transformer.hasTransformedResource() );
assertNull( transform( transformer ) );
}
- public void testSpecifyModuleName() throws Exception
+ public void testSpecifyModuleName()
+ throws Exception
{
GroovyResourceTransformer transformer = new
GroovyResourceTransformer();
transformer.extModuleName = "the-module-name";
transformer.extModuleVersion = "2.0";
transformer.processResource( GroovyResourceTransformer.EXT_MODULE_NAME,
- module("mod1", "1.0", "some.ext", "some.staticExt"),
Collections.<Relocator>emptyList() );
+ module( "mod1", "1.0", "some.ext",
"some.staticExt" ),
+ Collections.<Relocator>emptyList() );
Properties desc = transform( transformer );
assertEquals( "the-module-name", desc.getProperty( "moduleName" ) );
assertEquals( "2.0", desc.getProperty( "moduleVersion" ) );
@@ -115,17 +122,20 @@ public class GroovyResourceTransformerTe
assertEquals( "some.staticExt", desc.getProperty(
"staticExtensionClasses" ) );
}
- public void testConcatenation() throws Exception
+ public void testConcatenation()
+ throws Exception
{
GroovyResourceTransformer transformer = new
GroovyResourceTransformer();
transformer.processResource( GroovyResourceTransformer.EXT_MODULE_NAME,
- module( "mod1", "1.0", "some.ext1", null ),
Collections.<Relocator>emptyList() );
- transformer.processResource(GroovyResourceTransformer.EXT_MODULE_NAME,
- module( "mod2", "1.0", null, "some.staticExt1" ),
Collections.<Relocator>emptyList());
- transformer.processResource(GroovyResourceTransformer.EXT_MODULE_NAME,
- module( "mod3", "1.0", "", "" ),
Collections.<Relocator>emptyList());
- transformer.processResource(GroovyResourceTransformer.EXT_MODULE_NAME,
- module( "mod4", "1.0", "some.ext2", "some.staticExt2" ),
Collections.<Relocator>emptyList());
+ module( "mod1", "1.0", "some.ext1", null
), Collections.<Relocator>emptyList() );
+ transformer.processResource( GroovyResourceTransformer.EXT_MODULE_NAME,
+ module( "mod2", "1.0", null,
"some.staticExt1" ),
+ Collections.<Relocator>emptyList() );
+ transformer.processResource(
GroovyResourceTransformer.EXT_MODULE_NAME, module( "mod3", "1.0", "", "" ),
+ Collections.<Relocator>emptyList() );
+ transformer.processResource( GroovyResourceTransformer.EXT_MODULE_NAME,
+ module( "mod4", "1.0", "some.ext2",
"some.staticExt2" ),
+ Collections.<Relocator>emptyList() );
Properties desc = transform( transformer );
assertEquals( "no-module-name", desc.getProperty( "moduleName" ) );
assertEquals( "1.0", desc.getProperty( "moduleVersion" ) );
Modified:
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformerTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformerTest.java?rev=1771460&r1=1771459&r2=1771460&view=diff
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformerTest.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformerTest.java
Sat Nov 26 11:03:39 2016
@@ -27,7 +27,7 @@ import junit.framework.TestCase;
* Test for {@link XmlAppendingTransformer}.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class XmlAppendingTransformerTest
extends TestCase
