fix typos
use java7 methods/classes
diff --git a/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java b/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java
index bcbd02a..a0230b2 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java
@@ -46,7 +46,7 @@
String[] getDescriptorReferences();
/**
- * @return The descriptor source direcotoy.
+ * @return The descriptor source directory.
*/
File getDescriptorSourceDirectory();
@@ -86,7 +86,7 @@
File getOutputDirectory();
/**
- * @return The working direcotory.
+ * @return The working directory.
*/
File getWorkingDirectory();
@@ -151,7 +151,7 @@
MavenSession getMavenSession();
/**
- * @return The archiver configu.
+ * @return The archiver configuration.
*/
String getArchiverConfig();
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizer.java b/src/main/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizer.java
index 3522981..c886e4b 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizer.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizer.java
@@ -38,6 +38,7 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.List;
@@ -84,7 +85,8 @@
Reader manifestFileReader = null;
try
{
- manifestFileReader = new InputStreamReader( new FileInputStream( manifestFile ), "UTF-8" );
+ manifestFileReader = new InputStreamReader( new FileInputStream( manifestFile ),
+ StandardCharsets.UTF_8 );
manifest = new Manifest( manifestFileReader );
manifestFileReader.close();
manifestFileReader = null;
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
index 2f6c805..5f63035 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
@@ -117,10 +117,7 @@
if ( extraSelectors != null )
{
- for ( final FileSelector selector : extraSelectors )
- {
- selectors.add( selector );
- }
+ selectors.addAll( extraSelectors );
}
if ( ( extraFinalizers != null ) && finalizer != null )
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparator.java b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparator.java
index c67153a..f796ae4 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparator.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparator.java
@@ -44,6 +44,6 @@
{
return +1;
}
- return new Integer( ( (PhaseOrder) o1 ).order() ).compareTo( ( (PhaseOrder) o2 ).order() );
+ return Integer.compare( ( (PhaseOrder) o1 ).order(), ( (PhaseOrder) o2 ).order() );
}
}
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java
index 3f18035..f0330bc 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java
@@ -190,10 +190,10 @@
private boolean unpackTransformsContent( DependencySet dependencySet )
{
- return isUnpackWithOptions( dependencySet ) && isConentModifyingOption( dependencySet.getUnpackOptions() );
+ return isUnpackWithOptions( dependencySet ) && isContentModifyingOption( dependencySet.getUnpackOptions() );
}
- private boolean isConentModifyingOption( UnpackOptions opts )
+ private boolean isContentModifyingOption( UnpackOptions opts )
{
return ( opts.isFiltered() || opts.getLineEnding() != null );
}
diff --git a/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java b/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java
index 75031ba..ba1345b 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java
@@ -203,8 +203,7 @@
catch ( final XmlPullParserException e )
{
final IOException error =
- new IOException( "Error finalizing component-set for archive. Reason: " + e.getMessage() );
- error.initCause( e );
+ new IOException( "Error finalizing component-set for archive. Reason: " + e.getMessage(), e );
throw error;
}
diff --git a/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java b/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java
index 0c6c9a3..a344c1a 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java
@@ -39,6 +39,7 @@
import java.io.Reader;
import java.io.StringWriter;
import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -110,7 +111,7 @@
f.deleteOnExit();
writer = AssemblyFileUtils.isPropertyFile( f )
- ? new OutputStreamWriter( new FileOutputStream( f ), "ISO-8859-1" )
+ ? new OutputStreamWriter( new FileOutputStream( f ), StandardCharsets.ISO_8859_1 )
: new OutputStreamWriter( new FileOutputStream( f ) ); // Still platform encoding
writer.write( commentChars + " Aggregated on " + new Date() + " from: " );
@@ -196,7 +197,7 @@
writer = new StringWriter();
reader = AssemblyFileUtils.isPropertyFile( fileInfo.getName() )
- ? new InputStreamReader( fileInfo.getContents(), "ISO-8859-1" )
+ ? new InputStreamReader( fileInfo.getContents(), StandardCharsets.ISO_8859_1 )
: new InputStreamReader( fileInfo.getContents() ); // platform encoding
IOUtil.copy( reader, writer );
diff --git a/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java b/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java
index 4120b8b..6b50534 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java
@@ -85,15 +85,13 @@
}
catch ( MavenFilteringException e )
{
- IOException ioe = new IOException( "Error filtering file '" + source + "': " + e.getMessage() );
- ioe.initCause( e ); // plain old Java 5...
+ IOException ioe = new IOException( "Error filtering file '" + source + "': " + e.getMessage(), e );
throw ioe;
}
}
private static boolean isForbiddenFiletypes( PlexusIoResource plexusIoResource )
- throws IOException
{
String fileName = plexusIoResource.getName().toLowerCase();
return ( fileName.endsWith( ".zip" ) || fileName.endsWith( ".jar" ) );
diff --git a/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java b/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
index d74da75..0034e04 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
@@ -63,7 +63,7 @@
extends AbstractMojo
implements AssemblerConfigurationSource
{
- protected FixedStringSearchInterpolator commanndLinePropertiesInterpolator;
+ protected FixedStringSearchInterpolator commandLinePropertiesInterpolator;
protected FixedStringSearchInterpolator envInterpolator;
@@ -888,11 +888,11 @@
@Nonnull
public FixedStringSearchInterpolator getCommandLinePropsInterpolator()
{
- if ( commanndLinePropertiesInterpolator == null )
+ if ( commandLinePropertiesInterpolator == null )
{
- this.commanndLinePropertiesInterpolator = createCommandLinePropertiesInterpolator();
+ this.commandLinePropertiesInterpolator = createCommandLinePropertiesInterpolator();
}
- return commanndLinePropertiesInterpolator;
+ return commandLinePropertiesInterpolator;
}
@Override
