using more java.nio.file

diff --git a/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java b/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java
index e899562b04e9bd433415ea19236f16bfaf856b7a..25e99477381daf8cacb77d3ec588cb23b5ca014a 100644 (file)
--- a/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java
+++ b/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java
@@ -43,6 +43,8 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -259,7 +261,7 @@ public class ArchivaCli
 
         Properties p = new Properties();
 
-        try (FileInputStream fis = new FileInputStream( properties ))
+        try (InputStream fis = Files.newInputStream( Paths.get(properties)))
         {
             p.load( fis );
         }

diff --git a/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java b/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java
index 9e9378e3bf40eb6841e7ababb06cf106ab759373..89181b5fd512759128b5c902e4d6312ce900670d 100644 (file)
--- a/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java
+++ b/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java
@@ -27,6 +27,8 @@ import org.slf4j.LoggerFactory;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -75,7 +77,7 @@ public class ChecksummedFile
         throws IOException
     {
 
-        try (FileInputStream fis = new FileInputStream( referenceFile ))
+        try (InputStream fis = Files.newInputStream( referenceFile.toPath() ) )
         {
             Checksum checksum = new Checksum( checksumAlgorithm );
             checksum.update( fis );
@@ -139,7 +141,7 @@ public class ChecksummedFile
     public boolean isValidChecksums( ChecksumAlgorithm algorithms[] )
     {
 
-        try (FileInputStream fis = new FileInputStream( referenceFile ))
+        try (InputStream fis = Files.newInputStream( referenceFile.toPath() ))
         {
             List<Checksum> checksums = new ArrayList<>( algorithms.length );
             // Create checksum object for each algorithm.
@@ -228,7 +230,7 @@ public class ChecksummedFile
         }
 
 
-        try (FileInputStream fis = new FileInputStream( referenceFile ))
+        try (InputStream fis = Files.newInputStream( referenceFile.toPath() ))
         {
             // Parse file once, for all checksums.
             Checksum.update( checksums, fis );

diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/MavenProxyPropertyLoaderTest.java b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/MavenProxyPropertyLoaderTest.java
index 88884f838bec3c19f9e3570fc2904f0e5cd0af38..0b6ffc2a8cdd555747b1dfe35ba0a7bf0cd1214a 100644 (file)
--- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/MavenProxyPropertyLoaderTest.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/MavenProxyPropertyLoaderTest.java
@@ -22,6 +22,7 @@ package org.apache.archiva.configuration;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.util.Map;
 import java.util.Properties;
 import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner;
@@ -48,7 +49,7 @@ public class MavenProxyPropertyLoaderTest
         proxy.setHost( "original-host" );
         configuration.addNetworkProxy( proxy ); // overwritten
 
-        loader.load( new FileInputStream( confFile ), configuration );
+        loader.load( Files.newInputStream(confFile.toPath()), configuration );
 
         Map<String, ManagedRepositoryConfiguration> repositoryIdMap = configuration.getManagedRepositoriesAsMap();
         assertEquals( "Count repositories", 1, repositoryIdMap.size() );

diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
index 330df16a610bc3d4ff395ea6f034a9c276ccf09f..4ae8d222cc156cd16d5e56fd55626a1504b5c963 100644 (file)
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
@@ -56,6 +56,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.file.Files;
 import java.util.List;
 import java.util.Map;
 
@@ -135,7 +136,8 @@ public class DownloadRemoteIndexTask
 
             final StreamWagon wagon = (StreamWagon) wagonFactory.getWagon(
                 new WagonFactoryRequest( wagonProtocol, this.remoteRepository.getExtraHeaders() ).networkProxy(
-                    this.networkProxy ) );
+                    this.networkProxy )
+            );
             // FIXME olamy having 2 config values
             wagon.setReadTimeout( remoteRepository.getRemoteDownloadTimeout() * 1000 );
             wagon.setTimeout( remoteRepository.getTimeout() * 1000 );
@@ -345,13 +347,10 @@ public class DownloadRemoteIndexTask
             {
                 log.info( "index update retrieve file, name:{}", name );
                 File file = new File( tempIndexDirectory, name );
-                if ( file.exists() )
-                {
-                    file.delete();
-                }
+                Files.deleteIfExists( file.toPath() );
                 file.deleteOnExit();
                 wagon.get( addParameters( name, this.remoteRepository ), file );
-                return new FileInputStream( file );
+                return Files.newInputStream( file.toPath() );
             }
             catch ( AuthorizationException e )
             {

diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
index 56f2dc696358c5a74f936788c67c5b6f20209ca3..1f07c52ac8efddda26f39cc8ac41b9ad58aa84d6 100644 (file)
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
@@ -47,10 +47,12 @@ import javax.inject.Inject;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.Set;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
@@ -58,8 +60,8 @@ import java.util.zip.ZipInputStream;
 /**
  * ArchivaIndexingTaskExecutorTest
  */
-@RunWith (ArchivaSpringJUnit4ClassRunner.class)
-@ContextConfiguration (locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" })
+@RunWith( ArchivaSpringJUnit4ClassRunner.class )
+@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
 public class ArchivaIndexingTaskExecutorTest
     extends TestCase
 {
@@ -156,7 +158,8 @@ public class ArchivaIndexingTaskExecutorTest
                                                                   new File( repositoryConfig.getLocation() ),
                                                                   new File( repositoryConfig.getLocation(),
                                                                             ".indexer" ), null, null,
-                                                                  mavenIndexerUtils.getAllIndexCreators() );
+                                                                  mavenIndexerUtils.getAllIndexCreators()
+            );
             context.setSearchable( true );
         }
 
@@ -257,8 +260,8 @@ public class ArchivaIndexingTaskExecutorTest
         q.add( indexer.constructQuery( MAVEN.GROUP_ID, new SourcedSearchExpression( "org.apache.archiva" ) ),
                Occur.SHOULD );
         q.add( indexer.constructQuery( MAVEN.ARTIFACT_ID,
-                                       new SourcedSearchExpression( "archiva-index-methods-jar-test" ) ),
-               Occur.SHOULD );
+                                       new SourcedSearchExpression( "archiva-index-methods-jar-test" ) ), Occur.SHOULD
+        );
 
         assertTrue( new File( repositoryConfig.getLocation(), ".indexer" ).exists() );
         assertFalse( new File( repositoryConfig.getLocation(), ".index" ).exists() );
@@ -345,28 +348,30 @@ public class ArchivaIndexingTaskExecutorTest
     {
         final int buff = 2048;
 
-        new File( destDir ).mkdirs();
-
-        BufferedOutputStream out = null;
-        FileInputStream fin = new FileInputStream( new File( indexDir, "nexus-maven-repository-index.zip" ) );
-        ZipInputStream in = new ZipInputStream( new BufferedInputStream( fin ) );
-        ZipEntry entry;
+        Files.createDirectories( Paths.get( destDir ) );
 
-        while ( ( entry = in.getNextEntry() ) != null )
+        try (InputStream fin = Files.newInputStream( Paths.get( indexDir, "nexus-maven-repository-index.zip" ) ))
         {
-            int count;
-            byte data[] = new byte[buff];
-            FileOutputStream fout = new FileOutputStream( new File( destDir, entry.getName() ) );
-            out = new BufferedOutputStream( fout, buff );
+            ZipInputStream in = new ZipInputStream( new BufferedInputStream( fin ) );
+            ZipEntry entry;
 
-            while ( ( count = in.read( data, 0, buff ) ) != -1 )
+            while ( ( entry = in.getNextEntry() ) != null )
             {
-                out.write( data, 0, count );
+                int count;
+                byte data[] = new byte[buff];
+                try (OutputStream fout = Files.newOutputStream( Paths.get( destDir, entry.getName() ) ))
+                {
+                    try (BufferedOutputStream out = new BufferedOutputStream( fout, buff ))
+                    {
+
+                        while ( ( count = in.read( data, 0, buff ) ) != -1 )
+                        {
+                            out.write( data, 0, count );
+                        }
+                    }
+                }
             }
-            out.flush();
-            out.close();
-        }
 
-        in.close();
+        }
     }
 }