You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2017/09/03 09:01:40 UTC

[2/2] archiva git commit: Moving converter module to java.nio

Moving converter module to java.nio


Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/b5eddeb6
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/b5eddeb6
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/b5eddeb6

Branch: refs/heads/master
Commit: b5eddeb67b31ab0529351a02cce5a38d126a21fe
Parents: cd1f4a9
Author: Martin Stockhammer <ma...@apache.org>
Authored: Sun Sep 3 11:01:15 2017 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Sun Sep 3 11:01:15 2017 +0200

----------------------------------------------------------------------
 .../java/org/apache/archiva/cli/ArchivaCli.java |   5 +-
 .../apache/archiva/common/utils/FileUtils.java  |  40 +-
 .../archiva/common/utils/FileUtilsTest.java     |  51 +-
 .../artifact/LegacyToDefaultConverter.java      |  84 ++--
 .../DefaultLegacyRepositoryConverter.java       |   8 +-
 .../legacy/LegacyRepositoryConverter.java       |   4 +-
 .../converter/RepositoryConverterTest.java      |  51 +-
 .../artifact/LegacyToDefaultConverterTest.java  | 479 +++++++++----------
 8 files changed, 385 insertions(+), 337 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/archiva/blob/b5eddeb6/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java
----------------------------------------------------------------------
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 880c5f1..f853db8 100644
--- a/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java
+++ b/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java
@@ -41,6 +41,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -263,9 +264,9 @@ public class ArchivaCli
             p.load( fis );
         }
 
-        File oldRepositoryPath = new File( p.getProperty( SOURCE_REPO_PATH ) );
+        Path oldRepositoryPath = Paths.get( p.getProperty( SOURCE_REPO_PATH ) );
 
-        File newRepositoryPath = new File( p.getProperty( TARGET_REPO_PATH ) );
+        Path newRepositoryPath = Paths.get( p.getProperty( TARGET_REPO_PATH ) );
 
         LOGGER.info( "Converting {} to {}", oldRepositoryPath, newRepositoryPath );
 

http://git-wip-us.apache.org/repos/asf/archiva/blob/b5eddeb6/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/FileUtils.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/FileUtils.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/FileUtils.java
index 71dcb8d..46c459b 100644
--- a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/FileUtils.java
+++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/FileUtils.java
@@ -22,6 +22,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -71,23 +72,34 @@ public class FileUtils
 
     public static void deleteDirectory( Path dir ) throws IOException
     {
+        if (!Files.exists(dir)) {
+            return;
+        }
         if (!Files.isDirectory( dir )) {
-            throw new IOException("Given path is not a directory ");
+            throw new IOException("Given path is not a directory "+dir);
         }
-        boolean result = Files.walk(dir)
-            .sorted( Comparator.reverseOrder())
-            .map( file ->  {
-                try
-                {
-                    Files.delete( file );
-                    return Optional.of(Boolean.TRUE);
-                }
-                catch ( IOException e )
+        boolean result = true;
+        try
+        {
+            result = Files.walk( dir )
+                .sorted( Comparator.reverseOrder( ) )
+                .map( file ->
                 {
-                    return Optional.empty();
-                }
+                    try
+                    {
+                        Files.delete( file );
+                        return Optional.of( Boolean.TRUE );
+                    }
+                    catch ( UncheckedIOException | IOException e )
+                    {
+                        log.warn( "File could not be deleted {}", file );
+                        return Optional.empty( );
+                    }
 
-            }).allMatch( Optional::isPresent );
+                } ).allMatch( Optional::isPresent );
+        } catch (UncheckedIOException e) {
+            throw new IOException("File deletion failed ", e);
+        }
         if (!result) {
             throw new IOException("Error during recursive delete of "+dir.toAbsolutePath());
         }
@@ -119,7 +131,7 @@ public class FileUtils
     }
 
     /**
-     * Return the base directory 
+     * Return the base directory
      * @return
      */
     public static String getBasedir()

http://git-wip-us.apache.org/repos/asf/archiva/blob/b5eddeb6/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/FileUtilsTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/FileUtilsTest.java b/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/FileUtilsTest.java
index d165cbd..c589e7c 100644
--- a/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/FileUtilsTest.java
+++ b/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/FileUtilsTest.java
@@ -19,12 +19,20 @@ package org.apache.archiva.common.utils;
  * under the License.
  */
 
+import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.Test;
 
 import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.nio.file.attribute.PosixFilePermission;
+import java.util.HashSet;
+import java.util.Set;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -102,12 +110,51 @@ public class FileUtilsTest
 
     }
 
-    @Test(expected = java.io.IOException.class)
-    public void testDeleteException() throws IOException
+    @Test
+    public void testDeleteNonExist() throws IOException
     {
         Path tf = Paths.get("aaserijdmcjdjhdejeidmdjdlasrjerjnbmckdkdk");
         assertFalse(Files.exists(tf));
         FileUtils.deleteDirectory( tf );
     }
 
+    @Test(expected = IOException.class)
+    public void testDeleteWithException() throws IOException
+    {
+        Assume.assumeTrue( FileSystems.getDefault().supportedFileAttributeViews().contains("posix") );
+        Path tmpDir = Files.createTempDirectory( "FileUtilsTest" );
+        Path tmpDir2 = tmpDir.resolve("testdir1");
+        Files.createDirectories( tmpDir2 );
+        Path tmpFile = tmpDir2.resolve("testfile1.txt");
+        OutputStream stream = null;
+        try
+        {
+            stream = Files.newOutputStream( tmpFile, StandardOpenOption.APPEND, StandardOpenOption.CREATE );
+            stream.write( 1 );
+            stream.close( );
+            assertTrue( Files.exists( tmpFile ) );
+            stream = Files.newOutputStream( tmpFile, StandardOpenOption.APPEND, StandardOpenOption.CREATE );
+            stream.write( 1 );
+            Set<PosixFilePermission> perms = new HashSet<>( );
+            Files.setPosixFilePermissions( tmpFile, perms );
+            Files.setPosixFilePermissions( tmpDir2, perms );
+            FileUtils.deleteDirectory( tmpDir );
+            assertFalse( Files.exists( tmpDir ) );
+            assertFalse( Files.exists( tmpFile ) );
+        } finally {
+            if (stream!=null) {
+                stream.close();
+            }
+            Set<PosixFilePermission> perms = new HashSet<>( );
+            perms.add(PosixFilePermission.OWNER_READ);
+            perms.add(PosixFilePermission.OWNER_WRITE);
+            perms.add(PosixFilePermission.OWNER_EXECUTE);
+            Files.setPosixFilePermissions( tmpDir2, perms );
+            Files.setPosixFilePermissions( tmpFile, perms );
+            Files.deleteIfExists( tmpFile );
+            Files.deleteIfExists( tmpDir2 );
+            Files.deleteIfExists( tmpDir );
+        }
+    }
+
 }

http://git-wip-us.apache.org/repos/asf/archiva/blob/b5eddeb6/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
index ba8bf27..9e0c49c 100644
--- a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
+++ b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
@@ -50,13 +50,14 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
-import java.io.File;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -178,12 +179,12 @@ public class LegacyToDefaultConverter
                                                               artifact.getVersion() );
         pom.setBaseVersion( artifact.getBaseVersion() );
         ArtifactRepository repository = artifact.getRepository();
-        File file = new File( repository.getBasedir(), repository.pathOf( pom ) );
+        Path file = Paths.get( repository.getBasedir(), repository.pathOf( pom ) );
 
         boolean result = true;
-        if ( file.exists() )
+        if ( Files.exists(file) )
         {
-            File targetFile = new File( targetRepository.getBasedir(), targetRepository.pathOf( pom ) );
+            Path targetFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( pom ) );
 
             String contents = null;
             boolean checksumsValid = false;
@@ -195,7 +196,7 @@ public class LegacyToDefaultConverter
                 }
 
                 // Even if the checksums for the POM are invalid we should still convert the POM
-                contents = FileUtils.readFileToString( file, Charset.defaultCharset() );
+                contents = org.apache.archiva.common.utils.FileUtils.readFileToString( file, Charset.defaultCharset() );
             }
             catch ( IOException e )
             {
@@ -206,23 +207,15 @@ public class LegacyToDefaultConverter
             if ( checksumsValid && contents.indexOf( "modelVersion" ) >= 0 ) //$NON-NLS-1$
             {
                 // v4 POM
-                try
+                boolean matching = false;
+                if ( !force && Files.exists( targetFile ) )
                 {
-                    boolean matching = false;
-                    if ( !force && targetFile.exists() )
-                    {
-                        String targetContents = FileUtils.readFileToString( targetFile, Charset.defaultCharset() );
-                        matching = targetContents.equals( contents );
-                    }
-                    if ( force || !matching )
-                    {
-                        transaction.createFile( contents, targetFile, digesters );
-                    }
+                    String targetContents = org.apache.archiva.common.utils.FileUtils.readFileToString( targetFile, Charset.defaultCharset( ) );
+                    matching = targetContents.equals( contents );
                 }
-                catch ( IOException e )
+                if ( force || !matching )
                 {
-                    throw new ArtifactConversionException(
-                        Messages.getString( "unable.to.write.target.pom", e.getMessage() ), e ); //$NON-NLS-1$
+                    transaction.createFile( contents, targetFile.toFile( ), digesters );
                 }
             }
             else
@@ -243,7 +236,7 @@ public class LegacyToDefaultConverter
                                 artifactFactory.createProjectArtifact( artifact.getGroupId(), artifact.getArtifactId(),
                                                                        artifact.getVersion() );
                             targetFile =
-                                new File( targetRepository.getBasedir(), targetRepository.pathOf( relocatedPom ) );
+                                Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( relocatedPom ) );
                         }
 
                         Model v4Model = translator.translate( v3Model );
@@ -254,7 +247,7 @@ public class LegacyToDefaultConverter
                         MavenXpp3Writer xpp3Writer = new MavenXpp3Writer();
                         xpp3Writer.write( writer, v4Model );
 
-                        transaction.createFile( writer.toString(), targetFile, digesters );
+                        transaction.createFile( writer.toString(), targetFile.toFile(), digesters );
 
                         List<String> warnings = translator.getWarnings();
 
@@ -290,13 +283,13 @@ public class LegacyToDefaultConverter
         return result;
     }
 
-    private boolean testChecksums( Artifact artifact, File file )
+    private boolean testChecksums( Artifact artifact, Path file )
         throws IOException
     {
         boolean result = true;
         for ( Digester digester : digesters )
         {
-            result &= verifyChecksum( file, file.getName() + "." + getDigesterFileExtension( digester ), digester,
+            result &= verifyChecksum( file, file.getFileName() + "." + getDigesterFileExtension( digester ), digester,
                                       //$NON-NLS-1$
                                       artifact,
                                       "failure.incorrect." + getDigesterFileExtension( digester ) ); //$NON-NLS-1$
@@ -304,18 +297,18 @@ public class LegacyToDefaultConverter
         return result;
     }
 
-    private boolean verifyChecksum( File file, String fileName, Digester digester, Artifact artifact, String key )
+    private boolean verifyChecksum( Path file, String fileName, Digester digester, Artifact artifact, String key )
         throws IOException
     {
         boolean result = true;
 
-        File checksumFile = new File( file.getParentFile(), fileName );
-        if ( checksumFile.exists() )
+        Path checksumFile = file.resolveSibling( fileName );
+        if ( Files.exists(checksumFile) )
         {
-            String checksum = FileUtils.readFileToString( checksumFile, Charset.defaultCharset() );
+            String checksum = org.apache.archiva.common.utils.FileUtils.readFileToString( checksumFile, Charset.defaultCharset() );
             try
             {
-                digester.verify( file, checksum );
+                digester.verify( file.toFile(), checksum );
             }
             catch ( DigesterException e )
             {
@@ -338,22 +331,22 @@ public class LegacyToDefaultConverter
     private boolean copyArtifact( Artifact artifact, ArtifactRepository targetRepository, FileTransaction transaction )
         throws ArtifactConversionException
     {
-        File sourceFile = artifact.getFile();
+        Path sourceFile = artifact.getFile().toPath();
 
-        if ( sourceFile.getAbsolutePath().indexOf( "/plugins/" ) > -1 ) //$NON-NLS-1$
+        if ( sourceFile.toAbsolutePath().toString().indexOf( "/plugins/" ) > -1 ) //$NON-NLS-1$
         {
             artifact.setArtifactHandler( artifactHandlerManager.getArtifactHandler( "maven-plugin" ) ); //$NON-NLS-1$
         }
 
-        File targetFile = new File( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
+        Path targetFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
 
         boolean result = true;
         try
         {
             boolean matching = false;
-            if ( !force && targetFile.exists() )
+            if ( !force && Files.exists(targetFile) )
             {
-                matching = FileUtils.contentEquals( sourceFile, targetFile );
+                matching = FileUtils.contentEquals( sourceFile.toFile(), targetFile.toFile() );
                 if ( !matching )
                 {
                     addWarning( artifact, Messages.getString( "failure.target.already.exists" ) ); //$NON-NLS-1$
@@ -366,7 +359,7 @@ public class LegacyToDefaultConverter
                 {
                     if ( testChecksums( artifact, sourceFile ) )
                     {
-                        transaction.copyFile( sourceFile, targetFile, digesters );
+                        transaction.copyFile( sourceFile.toFile(), targetFile.toFile(), digesters );
                     }
                     else
                     {
@@ -390,12 +383,12 @@ public class LegacyToDefaultConverter
         return metadata;
     }
 
-    private Metadata readMetadata( File file )
+    private Metadata readMetadata( Path file )
         throws ArtifactConversionException
     {
         MetadataXpp3Reader reader = new MetadataXpp3Reader();
 
-        try (Reader fileReader = Files.newBufferedReader( file.toPath(), Charset.defaultCharset() ))
+        try (Reader fileReader = Files.newBufferedReader( file, Charset.defaultCharset() ))
         {
             return reader.read( fileReader );
         }
@@ -414,17 +407,16 @@ public class LegacyToDefaultConverter
         boolean result = true;
 
         RepositoryMetadata repositoryMetadata = new ArtifactRepositoryMetadata( artifact );
-        File file =
-            new File( repository.getBasedir(), repository.pathOfRemoteRepositoryMetadata( repositoryMetadata ) );
-        if ( file.exists() )
+        Path file = Paths.get( repository.getBasedir(), repository.pathOfRemoteRepositoryMetadata( repositoryMetadata ) );
+        if ( Files.exists(file) )
         {
             Metadata metadata = readMetadata( file );
             result = validateMetadata( metadata, repositoryMetadata, artifact );
         }
 
         repositoryMetadata = new SnapshotArtifactRepositoryMetadata( artifact );
-        file = new File( repository.getBasedir(), repository.pathOfRemoteRepositoryMetadata( repositoryMetadata ) );
-        if ( file.exists() )
+        file = Paths.get( repository.getBasedir(), repository.pathOfRemoteRepositoryMetadata( repositoryMetadata ) );
+        if ( Files.exists(file) )
         {
             Metadata metadata = readMetadata( file );
             result = result && validateMetadata( metadata, repositoryMetadata, artifact );
@@ -539,13 +531,13 @@ public class LegacyToDefaultConverter
                                  Metadata newMetadata, FileTransaction transaction )
         throws ArtifactConversionException
     {
-        File file = new File( targetRepository.getBasedir(),
+        Path file = Paths.get( targetRepository.getBasedir(),
                               targetRepository.pathOfRemoteRepositoryMetadata( artifactMetadata ) );
 
         Metadata metadata;
         boolean changed;
 
-        if ( file.exists() )
+        if ( Files.exists(file) )
         {
             metadata = readMetadata( file );
             changed = metadata.merge( newMetadata );
@@ -565,7 +557,7 @@ public class LegacyToDefaultConverter
 
                 mappingWriter.write( writer, metadata );
 
-                transaction.createFile( writer.toString(), file, digesters );
+                transaction.createFile( writer.toString(), file.toFile(), digesters );
             }
             catch ( IOException e )
             {
@@ -647,13 +639,13 @@ public class LegacyToDefaultConverter
         pom.setDistributionManagement( dMngt );
 
         Artifact artifact = artifactFactory.createBuildArtifact( groupId, artifactId, version, "pom" ); //$NON-NLS-1$
-        File pomFile = new File( repository.getBasedir(), repository.pathOf( artifact ) );
+        Path pomFile = Paths.get( repository.getBasedir(), repository.pathOf( artifact ) );
 
         StringWriter strWriter = new StringWriter();
         MavenXpp3Writer pomWriter = new MavenXpp3Writer();
         pomWriter.write( strWriter, pom );
 
-        transaction.createFile( strWriter.toString(), pomFile, digesters );
+        transaction.createFile( strWriter.toString(), pomFile.toFile(), digesters );
     }
 
     private void addWarning( Artifact artifact, String message )

http://git-wip-us.apache.org/repos/asf/archiva/blob/b5eddeb6/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
index 61d393e..a0e8497 100644
--- a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
+++ b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
@@ -35,7 +35,7 @@ import org.springframework.stereotype.Service;
 
 import javax.inject.Inject;
 import javax.inject.Named;
-import java.io.File;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -82,18 +82,18 @@ public class DefaultLegacyRepositoryConverter
     }
 
     @Override
-    public void convertLegacyRepository( File legacyRepositoryDirectory, File repositoryDirectory,
+    public void convertLegacyRepository( Path legacyRepositoryDirectory, Path repositoryDirectory,
                                          List<String> fileExclusionPatterns )
         throws RepositoryConversionException
     {
         try
         {
-            String defaultRepositoryUrl = PathUtil.toUrl( repositoryDirectory );
+            String defaultRepositoryUrl = PathUtil.toUrl( repositoryDirectory.toFile() );
 
             ManagedRepository legacyRepository = new ManagedRepository();
             legacyRepository.setId( "legacy" );
             legacyRepository.setName( "Legacy Repository" );
-            legacyRepository.setLocation( legacyRepositoryDirectory.getAbsolutePath() );
+            legacyRepository.setLocation( legacyRepositoryDirectory.toAbsolutePath().toString() );
             legacyRepository.setLayout( "legacy" );
 
             ArtifactRepository repository =

http://git-wip-us.apache.org/repos/asf/archiva/blob/b5eddeb6/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyRepositoryConverter.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyRepositoryConverter.java b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyRepositoryConverter.java
index 8cbb8e6..bfa4b9c 100644
--- a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyRepositoryConverter.java
+++ b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyRepositoryConverter.java
@@ -21,7 +21,7 @@ package org.apache.archiva.converter.legacy;
 
 import org.apache.archiva.converter.RepositoryConversionException;
 
-import java.io.File;
+import java.nio.file.Path;
 import java.util.List;
 
 /**
@@ -39,7 +39,7 @@ public interface LegacyRepositoryConverter
      * @param fileExclusionPatterns          the list of patterns to exclude from the conversion.
      * @throws RepositoryConversionException
      */
-    void convertLegacyRepository( File legacyRepositoryDirectory, File destinationRepositoryDirectory,
+    void convertLegacyRepository( Path legacyRepositoryDirectory, Path destinationRepositoryDirectory,
                                   List<String> fileExclusionPatterns )
         throws RepositoryConversionException;
 }

http://git-wip-us.apache.org/repos/asf/archiva/blob/b5eddeb6/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java b/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java
index 58ed741..8abe89d 100644
--- a/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java
+++ b/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java
@@ -34,8 +34,10 @@ import org.springframework.test.context.ContextConfiguration;
 
 import javax.inject.Inject;
 import javax.inject.Named;
-import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
@@ -77,20 +79,20 @@ public class RepositoryConverterTest
         ArtifactRepositoryLayout layout = plexusSisuBridge.lookup( ArtifactRepositoryLayout.class, "legacy" );
             //(ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "legacy" );
 
-        File sourceBase = new File( "src/test/source-repository" );
-        sourceRepository = factory.createArtifactRepository( "source", sourceBase.toURL().toString(), layout, null,
+        Path sourceBase = Paths.get( "src/test/source-repository" );
+        sourceRepository = factory.createArtifactRepository( "source", sourceBase.toUri().toURL().toString(), layout, null,
                                                              null );
 
         layout = plexusSisuBridge.lookup( ArtifactRepositoryLayout.class, "default" );
             //(ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" );
 
-        File targetBase = new File( "target/test-target-repository" );
-        copyDirectoryStructure( new File( "src/test/target-repository" ), targetBase );
+        Path targetBase = Paths.get( "target/test-target-repository" );
+        copyDirectoryStructure( Paths.get( "src/test/target-repository" ), targetBase );
 
         targetRepository = new ManagedRepositoryConfiguration();
         targetRepository.setId( "target" );
         targetRepository.setName( "Target Repo" );
-        targetRepository.setLocation( targetBase.getAbsolutePath() );
+        targetRepository.setLocation( targetBase.toAbsolutePath().toString() );
         targetRepository.setLayout( "default" );
 
         //repositoryConverter = (LegacyRepositoryConverter) lookup( LegacyRepositoryConverter.ROLE, "default" );
@@ -103,49 +105,48 @@ public class RepositoryConverterTest
         super.tearDown();
     }
 
-    private void copyDirectoryStructure( File sourceDirectory, File destinationDirectory )
+    private void copyDirectoryStructure( Path sourceDirectory, Path destinationDirectory )
         throws IOException
     {
-        if ( !sourceDirectory.exists() )
+        if ( !Files.exists(sourceDirectory) )
         {
-            throw new IOException( "Source directory doesn't exists (" + sourceDirectory.getAbsolutePath() + ")." );
+            throw new IOException( "Source directory doesn't exists (" + sourceDirectory.toAbsolutePath() + ")." );
         }
 
-        File[] files = sourceDirectory.listFiles();
+        Path[] files = Files.list(sourceDirectory).toArray(Path[]::new);
 
-        String sourcePath = sourceDirectory.getAbsolutePath();
+        String sourcePath = sourceDirectory.toAbsolutePath().toString();
 
         for ( int i = 0; i < files.length; i++ )
         {
-            File file = files[i];
+            Path file = files[i];
 
-            String dest = file.getAbsolutePath();
+            String dest = file.toAbsolutePath().toString();
 
             dest = dest.substring( sourcePath.length() + 1 );
 
-            File destination = new File( destinationDirectory, dest );
+            Path destination = destinationDirectory.resolve( dest );
 
-            if ( file.isFile() )
+            if ( Files.isRegularFile(file) )
             {
-                destination = destination.getParentFile();
+                destination = destination.getParent();
 
-                FileUtils.copyFileToDirectory( file, destination );
+                FileUtils.copyFileToDirectory( file.toFile(), destination.toFile() );
             }
-            else if ( file.isDirectory() )
+            else if ( Files.isDirectory(file) )
             {
-                if ( !".svn".equals( file.getName() ) )
+                if ( !".svn".equals( file.getFileName().toString() ) )
                 {
-                    if ( !destination.exists() && !destination.mkdirs() )
+                    if ( !Files.exists(destination))
                     {
-                        throw new IOException( "Could not create destination directory '"
-                            + destination.getAbsolutePath() + "'." );
+                        Files.createDirectories( destination );
                     }
                     copyDirectoryStructure( file, destination );
                 }
             }
             else
             {
-                throw new IOException( "Unknown file type: " + file.getAbsolutePath() );
+                throw new IOException( "Unknown file type: " + file.toAbsolutePath() );
             }
         }
     }
@@ -154,8 +155,8 @@ public class RepositoryConverterTest
     public void testLegacyConversion()
         throws IOException, RepositoryConversionException
     {
-        File legacyRepoDir = new File( sourceRepository.getBasedir() );
-        File destRepoDir = new File( targetRepository.getLocation() );
+        Path legacyRepoDir = Paths.get( sourceRepository.getBasedir() );
+        Path destRepoDir = Paths.get( targetRepository.getLocation() );
         List<String> excludes = new ArrayList<>();
         repositoryConverter.convertLegacyRepository( legacyRepoDir, destRepoDir, excludes );
     }