Skip to content

MASSEMBLY-945 - speed improvements #38

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

Merged
olamy merged 1 commit into from
Dec 11, 2020
Merged

MASSEMBLY-945 - speed improvements #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public AssemblyProxyArchiver( final String rootPrefix, final Archiver delegate,

if ( !selectors.isEmpty() )
{
this.selectors = selectors.toArray( new FileSelector[selectors.size()] );
this.selectors = selectors.toArray( new FileSelector[0] );
}
}

Expand Down Expand Up @@ -763,9 +763,9 @@ else if ( assemblyWorkPath.startsWith( fsPath ) )

dfs.setCaseSensitive( fs.isCaseSensitive() );
dfs.setDirectory( fs.getDirectory() );
dfs.setExcludes( newEx.toArray( new String[newEx.size()] ) );
dfs.setExcludes( newEx.toArray( new String[0] ) );
dfs.setFileSelectors( fs.getFileSelectors() );
dfs.setIncludes( newIn.toArray( new String[newIn.size()] ) );
dfs.setIncludes( newIn.toArray( new String[0] ) );
dfs.setIncludingEmptyDirectories( fs.isIncludingEmptyDirectories() );
dfs.setPrefix( fs.getPrefix() );
dfs.setStreamTransformer( fs.getStreamTransformer() );
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ void updateModuleSetResolutionRequirements( ModuleSet set, DependencySet depende
if ( binaries.isIncludeDependencies() )
{
updateDependencySetResolutionRequirements( dependencySet, requirements,
projects.toArray( new MavenProject[projects.size()] ) );
projects.toArray( new MavenProject[0] ) );
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public static String[] toStringArray( final List<String> list )

if ( ( list != null ) && !list.isEmpty() )
{
result = list.toArray( new String[list.size()] );
result = list.toArray( new String[0] );
}

return result;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@ public void testReadAssemblies_ShouldGetAssemblyDescriptorFromFileArray()
final List<String> files = writeAssembliesToFile( assemblies, basedir );

final List<Assembly> results =
performReadAssemblies( basedir, files.toArray( new String[files.size()] ), null, null );
performReadAssemblies( basedir, files.toArray( new String[0] ), null, null );

assertNotNull( results );
assertEquals( 2, results.size() );
Expand Down