[MPLUGINTESTING-71] Require Java 8

maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java

@@ -21,14 +21,14 @@
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Field;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -162,6 +162,7 @@ protected void setUp()
 
             artifact.setFile( getPluginArtifactFile() );
             pluginDescriptor.setPluginArtifact( artifact );
+            //noinspection ArraysAsListWithZeroOrOneArgument
             pluginDescriptor.setArtifacts( Arrays.asList( artifact ) );
 
             for ( ComponentDescriptor<?> desc : pluginDescriptor.getComponents() )
@@ -237,7 +238,7 @@ else if ( "jar".equalsIgnoreCase( resource.getProtocol() ) )
     protected InputStream getPublicDescriptorStream()
         throws Exception
     {
-        return new FileInputStream( new File( getPluginDescriptorPath() ) );
+        return Files.newInputStream( new File( getPluginDescriptorPath() ).toPath() );
     }
 
     protected String getPluginDescriptorPath()
@@ -258,7 +259,7 @@ protected void setupContainer()
         {
             List<Module> modules = new ArrayList<>();
             addGuiceModules( modules );
-            container = new DefaultPlexusContainer( cc, modules.toArray( new Module[modules.size()] ) );
+            container = new DefaultPlexusContainer( cc, modules.toArray( new Module[0] ) );
         }
         catch ( PlexusContainerException e )
         {
@@ -270,22 +271,19 @@ protected void setupContainer()
     /**
      * @since 3.0.0
      */
+    @SuppressWarnings( "EmptyMethod" )
     protected void addGuiceModules( List<Module> modules )
     {
         // no custom guice modules by default
     }
 
     protected ContainerConfiguration setupContainerConfiguration()
     {
-        ClassWorld classWorld = new ClassWorld( "plexus.core", Thread.currentThread().getContextClassLoader() );
-
-        ContainerConfiguration cc = new DefaultContainerConfiguration()
-          .setClassWorld( classWorld )
+        return new DefaultContainerConfiguration()
+          .setClassWorld( new ClassWorld( "plexus.core", Thread.currentThread().getContextClassLoader() ) )
           .setClassPathScanning( PlexusConstants.SCANNING_INDEX )
           .setAutoWiring( true )
-          .setName( "maven" );      
-
-        return cc;
+          .setName( "maven" );
     }
 
     @Override
@@ -498,6 +496,7 @@ protected MavenSession newMavenSession( MavenProject project )
 
         MavenSession session = new MavenSession( container, MavenRepositorySystemUtils.newSession(), request, result );
         session.setCurrentProject( project );
+        //noinspection ArraysAsListWithZeroOrOneArgument
         session.setProjects( Arrays.asList( project ) );
         return session;
     }

maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/ArtifactStubFactory.java

@@ -316,7 +316,7 @@ public void createUnpackableFile( Artifact artifact, File destFile )
             WarArchiver war = (WarArchiver) archiver;
             // the use of this is counter-intuitive:
             // http://jira.codehaus.org/browse/PLX-286
-            war.setIgnoreWebxml( false );
+            war.setExpectWebXml( false );
         }
         archiver.createArchive();
     }
@@ -549,7 +549,7 @@ public static void setVariableValueToObject( Object object, String variable, Obj
      */
     public static String getFormattedFileName( Artifact artifact, boolean removeVersion )
     {
-        String destFileName = null;
+        String destFileName;
 
         // if there is a file and we aren't stripping the version, just get the
         // name directly
@@ -560,7 +560,7 @@ public static String getFormattedFileName( Artifact artifact, boolean removeVers
         else
         // if offline
         {
-            String versionString = null;
+            String versionString;
             if ( !removeVersion )
             {
                 versionString = "-" + artifact.getVersion();

maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/MojoRule.java

@@ -87,7 +87,8 @@ protected void before() throws Throwable
     /**
      * May be overridden in the implementation to do stuff after the current test was run.
      */
-    protected void after() 
+    @SuppressWarnings( "EmptyMethod" )
+    protected void after()
     {
 
     }

maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/ResolverExpressionEvaluatorStub.java

@@ -75,7 +75,7 @@ public Object evaluate( String expr )
             }
 
             // Was not an expression
-            if ( expression.indexOf( "$$" ) > -1 )
+            if ( expression.contains( "$$" ) )
             {
                 return expression.replaceAll( "\\$\\$", "\\$" );
             }

maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/resources/TestResources.java

@@ -21,6 +21,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Set;
 import java.util.TreeSet;
@@ -116,11 +117,7 @@ public static void assertDirectoryContents( File dir, String... expectedPaths )
         scanner.addDefaultExcludes();
         scanner.scan();
 
-        Set<String> actual = new TreeSet<>();
-        for ( String path : scanner.getIncludedFiles() )
-        {
-            actual.add( path );
-        }
+        Set<String> actual = new TreeSet<>( Arrays.asList( scanner.getIncludedFiles() ) );
         for ( String path : scanner.getIncludedDirectories() )
         {
             if ( path.length() > 0 )
@@ -132,10 +129,7 @@ public static void assertDirectoryContents( File dir, String... expectedPaths )
         Set<String> expected = new TreeSet<>();
         if ( expectedPaths != null )
         {
-            for ( String path : expectedPaths )
-            {
-                expected.add( path );
-            }
+            expected.addAll( Arrays.asList( expectedPaths ) );
         }
 
         // compare textual representation to make diff easier to understand

maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/ArtifactStub.java

@@ -185,21 +185,15 @@ public String getId()
     @Override
     public String getDependencyConflictId()
     {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append( getGroupId() );
-        buffer.append( ":" ).append( getArtifactId() );
-        buffer.append( ":" ).append( getType() );
-        buffer.append( ":" ).append( getClassifier() );
-
-        return buffer.toString();
+        return getGroupId() + ":" + getArtifactId() + ":" + getType() + ":" + getClassifier();
     }
 
     /**
      * By default, do nothing.
      *
      * @see org.apache.maven.artifact.Artifact#addMetadata(org.apache.maven.artifact.metadata.ArtifactMetadata)
      */
+    @SuppressWarnings( "deprecation" )
     @Override
     public void addMetadata( ArtifactMetadata artifactMetadata )
     {
@@ -210,6 +204,7 @@ public void addMetadata( ArtifactMetadata artifactMetadata )
      * @return <code>null</code>.
      * @see org.apache.maven.artifact.Artifact#getMetadataList()
      */
+    @SuppressWarnings( "deprecation" )
     @Override
     public Collection<ArtifactMetadata> getMetadataList()
     {
@@ -549,6 +544,7 @@ public boolean isFromAuthoritativeRepository()
         return true;
     }
 
+    @SuppressWarnings( "EmptyMethod" )
     public void setFromAuthoritativeRepository( boolean fromAuthoritativeRepository )
     {
         // nothing