You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/09/26 13:47:12 UTC
[maven-source-plugin] 05/05: Fix issues reported by IDE
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch sonar
in repository https://gitbox.apache.org/repos/asf/maven-source-plugin.git
commit 1c23f604c164a5db5a30cd52908f1354f90443ac
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Sep 26 15:46:37 2020 +0200
Fix issues reported by IDE
---
.../org/apache/maven/plugins/source/AbstractSourceJarMojo.java | 7 ++++---
.../apache/maven/plugins/source/AbstractSourcePluginTestCase.java | 2 +-
.../java/org/apache/maven/plugins/source/stubs/Project001Stub.java | 4 ++--
.../java/org/apache/maven/plugins/source/stubs/Project003Stub.java | 4 ++--
.../java/org/apache/maven/plugins/source/stubs/Project007Stub.java | 4 ++--
.../java/org/apache/maven/plugins/source/stubs/Project009Stub.java | 4 ++--
.../java/org/apache/maven/plugins/source/stubs/Project010Stub.java | 4 ++--
7 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java b/src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java
index a37f75e..a5433d6 100644
--- a/src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java
@@ -23,6 +23,7 @@ import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import org.apache.maven.archiver.MavenArchiveConfiguration;
@@ -259,7 +260,7 @@ public abstract class AbstractSourceJarMojo
{
if ( !"pom".equals( p.getPackaging() ) )
{
- packageSources( Arrays.asList( p ) );
+ packageSources( Collections.singletonList( p ) );
}
}
@@ -534,7 +535,7 @@ public abstract class AbstractSourceJarMojo
combinedIncludes.addAll( Arrays.asList( DEFAULT_INCLUDES ) );
}
- return combinedIncludes.toArray( new String[combinedIncludes.size()] );
+ return combinedIncludes.toArray( new String[0] );
}
/**
@@ -569,7 +570,7 @@ public abstract class AbstractSourceJarMojo
combinedExcludes.addAll( Arrays.asList( DEFAULT_EXCLUDES ) );
}
- return combinedExcludes.toArray( new String[combinedExcludes.size()] );
+ return combinedExcludes.toArray( new String[0] );
}
/**
diff --git a/src/test/java/org/apache/maven/plugins/source/AbstractSourcePluginTestCase.java b/src/test/java/org/apache/maven/plugins/source/AbstractSourcePluginTestCase.java
index e654cb4..b6db65f 100644
--- a/src/test/java/org/apache/maven/plugins/source/AbstractSourcePluginTestCase.java
+++ b/src/test/java/org/apache/maven/plugins/source/AbstractSourcePluginTestCase.java
@@ -190,7 +190,7 @@ public abstract class AbstractSourcePluginTestCase
{
assertTrue( entries.hasMoreElements() );
- Set<String> expected = new TreeSet<String>( Arrays.asList( expectedFiles ) );
+ Set<String> expected = new TreeSet<>( Arrays.asList( expectedFiles ) );
while ( entries.hasMoreElements() )
{
diff --git a/src/test/java/org/apache/maven/plugins/source/stubs/Project001Stub.java b/src/test/java/org/apache/maven/plugins/source/stubs/Project001Stub.java
index 91c7a37..98070aa 100644
--- a/src/test/java/org/apache/maven/plugins/source/stubs/Project001Stub.java
+++ b/src/test/java/org/apache/maven/plugins/source/stubs/Project001Stub.java
@@ -68,11 +68,11 @@ public class Project001Stub
setBuild( build );
String basedir = getBasedir().getAbsolutePath();
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( basedir + "/target/test-classes/unit/project-001/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
- List<String> testCompileSourceRoots = new ArrayList<String>();
+ List<String> testCompileSourceRoots = new ArrayList<>();
testCompileSourceRoots.add( basedir + "/target/test-classes/unit/project-001/src/test/java" );
setTestCompileSourceRoots( testCompileSourceRoots );
diff --git a/src/test/java/org/apache/maven/plugins/source/stubs/Project003Stub.java b/src/test/java/org/apache/maven/plugins/source/stubs/Project003Stub.java
index 1901b74..6931565 100644
--- a/src/test/java/org/apache/maven/plugins/source/stubs/Project003Stub.java
+++ b/src/test/java/org/apache/maven/plugins/source/stubs/Project003Stub.java
@@ -65,11 +65,11 @@ public class Project003Stub
setBuild( build );
String basedir = getBasedir().getAbsolutePath();
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( basedir + "/target/test-classes/unit/project-003/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
- List<String> testCompileSourceRoots = new ArrayList<String>();
+ List<String> testCompileSourceRoots = new ArrayList<>();
testCompileSourceRoots.add( basedir + "/target/test-classes/unit/project-003/src/test/java" );
setTestCompileSourceRoots( testCompileSourceRoots );
diff --git a/src/test/java/org/apache/maven/plugins/source/stubs/Project007Stub.java b/src/test/java/org/apache/maven/plugins/source/stubs/Project007Stub.java
index 43ed1fd..454dbb7 100644
--- a/src/test/java/org/apache/maven/plugins/source/stubs/Project007Stub.java
+++ b/src/test/java/org/apache/maven/plugins/source/stubs/Project007Stub.java
@@ -64,11 +64,11 @@ public class Project007Stub
setBuild( build );
String basedir = getBasedir().getAbsolutePath();
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( basedir + "/target/test-classes/unit/project-007/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
- List<String> testCompileSourceRoots = new ArrayList<String>();
+ List<String> testCompileSourceRoots = new ArrayList<>();
testCompileSourceRoots.add( basedir + "/target/test-classes/unit/project-007/src/test/java" );
setTestCompileSourceRoots( testCompileSourceRoots );
diff --git a/src/test/java/org/apache/maven/plugins/source/stubs/Project009Stub.java b/src/test/java/org/apache/maven/plugins/source/stubs/Project009Stub.java
index df43792..d543bd0 100644
--- a/src/test/java/org/apache/maven/plugins/source/stubs/Project009Stub.java
+++ b/src/test/java/org/apache/maven/plugins/source/stubs/Project009Stub.java
@@ -66,11 +66,11 @@ public class Project009Stub
setBuild( build );
String basedir = getBasedir().getAbsolutePath();
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( basedir + "/target/test-classes/unit/project-009/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
- List<String> testCompileSourceRoots = new ArrayList<String>();
+ List<String> testCompileSourceRoots = new ArrayList<>();
testCompileSourceRoots.add( basedir + "/target/test-classes/unit/project-009/src/test/java" );
setTestCompileSourceRoots( testCompileSourceRoots );
diff --git a/src/test/java/org/apache/maven/plugins/source/stubs/Project010Stub.java b/src/test/java/org/apache/maven/plugins/source/stubs/Project010Stub.java
index f77bc9c..7f9b39c 100644
--- a/src/test/java/org/apache/maven/plugins/source/stubs/Project010Stub.java
+++ b/src/test/java/org/apache/maven/plugins/source/stubs/Project010Stub.java
@@ -64,11 +64,11 @@ public class Project010Stub
setBuild( build );
String basedir = getBasedir().getAbsolutePath();
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( basedir + "/target/test-classes/unit/project-010/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
- List<String> testCompileSourceRoots = new ArrayList<String>();
+ List<String> testCompileSourceRoots = new ArrayList<>();
testCompileSourceRoots.add( basedir + "/target/test-classes/unit/project-010/src/test/java" );
setTestCompileSourceRoots( testCompileSourceRoots );