archiva git commit: And another one for moving to java.nio

2017-09-02 Thread martin_s 
Repository: archiva
Updated Branches:
  refs/heads/master 478115559 -> 90250dc30


And another one for moving 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/90250dc3
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/90250dc3
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/90250dc3

Branch: refs/heads/master
Commit: 90250dc30481c976628d6a44bfe37c6b98e2d254
Parents: 4781155
Author: Martin Stockhammer 
Authored: Sat Sep 2 19:17:01 2017 +0200
Committer: Martin Stockhammer 
Committed: Sat Sep 2 19:17:01 2017 +0200

--
 .../DefaultArchivaConfiguration.java|  18 +-
 .../ArchivaConfigurationMRM789Test.java |  30 +--
 .../configuration/ArchivaConfigurationTest.java | 204 ++-
 .../MavenProxyPropertyLoaderTest.java   |   7 +-
 4 files changed, 134 insertions(+), 125 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/archiva/blob/90250dc3/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
--
diff --git 
a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
 
b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
index f8aea6e..a9aa171 100644
--- 
a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
+++ 
b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
@@ -51,8 +51,10 @@ import org.springframework.stereotype.Service;
 import javax.annotation.PostConstruct;
 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.Arrays;
 import java.util.Collection;
@@ -95,6 +97,8 @@ public class DefaultArchivaConfiguration
 {
 private Logger log = LoggerFactory.getLogger( 
DefaultArchivaConfiguration.class );
 
+private static String FILE_ENCODING = "UTF-8";
+
 /**
  * Plexus registry to read the configuration from.
  */
@@ -684,21 +688,21 @@ public class DefaultArchivaConfiguration
  */
 private boolean writeFile( String filetype, String path, String contents )
 {
-File file = new File( path );
+Path file = Paths.get( path );
 
 try
 {
 // Check parent directory (if it is declared)
-if ( file.getParentFile() != null )
+if ( file.getParent() != null )
 {
 // Check that directory exists
-if ( !file.getParentFile().isDirectory() )
+if ( !Files.isDirectory( file.getParent() ) )
 {
 // Directory to file must exist for file to be created
 return false;
 }
 }
-FileUtils.writeStringToFile( file, contents, "UTF-8" );
+FileUtils.writeStringToFile( file.toFile(), contents, 
FILE_ENCODING);
 return true;
 }
 catch ( IOException e )
@@ -950,9 +954,9 @@ public class DefaultArchivaConfiguration
 for ( ManagedRepositoryConfiguration repo : 
(List) config.getManagedRepositories() )
 {
 String repoPath = repo.getLocation();
-File repoLocation = new File( repoPath );
+Path repoLocation = Paths.get( repoPath );
 
-if ( repoLocation.exists() && repoLocation.isDirectory() && 
!repoPath.endsWith(
+if ( Files.exists(repoLocation) && Files.isDirectory(repoLocation) 
&& !repoPath.endsWith(
 "data/repositories/" + repo.getId() ) )
 {
 repo.setLocation( repoPath + "/data/repositories/" + 
repo.getId() );

http://git-wip-us.apache.org/repos/asf/archiva/blob/90250dc3/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationMRM789Test.java
--
diff --git 
a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationMRM789Test.java
 
b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationMRM789Test.java
index 2a2b6da..7811bdf 100644
---

archiva git commit: avoid npe

2017-09-02 Thread olamy 
Repository: archiva
Updated Branches:
  refs/heads/master a015600d4 -> 6abccf351


avoid npe

Signed-off-by: olivier lamy 


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

Branch: refs/heads/master
Commit: 6abccf351093647c55212e5412188683ed2c9832
Parents: a015600
Author: olivier lamy 
Authored: Sat Sep 2 18:56:07 2017 +1000
Committer: olivier lamy 
Committed: Sat Sep 2 18:56:07 2017 +1000

--
 .../archiva-rest/archiva-rest-api/src/enunciate/archiva.fmt| 6 +++---
 .../archiva-web/archiva-web-common/src/enunciate/archiva.fmt   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/archiva/blob/6abccf35/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/enunciate/archiva.fmt
--
diff --git 
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/enunciate/archiva.fmt
 
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/enunciate/archiva.fmt
index 2137bfb..9d8a114 100644
--- 
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/enunciate/archiva.fmt
+++ 
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/enunciate/archiva.fmt
@@ -431,7 +431,7 @@ limitations under the License.
   
   [#list resourceGroup.resources?sort_by("path") as resource]
 [#list resource.methods as method]
-${apiRelativePath}${resourceGroup.contextPath}${resource.path}
+${apiRelativePath}${resourceGroup.contextPath!""}${resource.path}
 [/#list]
   [/#list]
   
@@ -452,7 +452,7 @@ limitations under the License.
 [#list resource.methods as method]
 
   
-${method.label} ${resource.path} 
+${method.label} ${resource.path} 
   [#if resourceGroup.deprecated?? || method.deprecated??]
 
 This method has been deprecated. [#if 
method.deprecated??] ${method.deprecated!""}[#else] 
${resource.deprecated!""}[/#if]
@@ -934,4 +934,4 @@ limitations under the License.
   [#else]
 ${metaValue}
   [/#if]
-[/#macro]
\ No newline at end of file
+[/#macro]

http://git-wip-us.apache.org/repos/asf/archiva/blob/6abccf35/archiva-modules/archiva-web/archiva-web-common/src/enunciate/archiva.fmt
--
diff --git 
a/archiva-modules/archiva-web/archiva-web-common/src/enunciate/archiva.fmt 
b/archiva-modules/archiva-web/archiva-web-common/src/enunciate/archiva.fmt
index 2137bfb..e1f2d84 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/enunciate/archiva.fmt
+++ b/archiva-modules/archiva-web/archiva-web-common/src/enunciate/archiva.fmt
@@ -431,7 +431,7 @@ limitations under the License.
   
   [#list resourceGroup.resources?sort_by("path") as resource]
 [#list resource.methods as method]
-${apiRelativePath}${resourceGroup.contextPath}${resource.path}
+${apiRelativePath}${resourceGroup.contextPath!""}${resource.path}
 [/#list]
   [/#list]
   
@@ -452,7 +452,7 @@ limitations under the License.
 [#list resource.methods as method]
 
   
-${method.label} ${resource.path} 
+${method.label} ${resource.path} 
   [#if resourceGroup.deprecated?? || method.deprecated??]
 
 This method has been deprecated. [#if 
method.deprecated??] ${method.deprecated!""}[#else] 
${resource.deprecated!""}[/#if]

archiva git commit: First part in moving to java.nio

2017-09-02 Thread martin_s 
Repository: archiva
Updated Branches:
  refs/heads/master 6abccf351 -> ad9fee439


First part in moving 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/ad9fee43
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/ad9fee43
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/ad9fee43

Branch: refs/heads/master
Commit: ad9fee4399fef8fb45fa018f16ba8164b4481ae5
Parents: 6abccf3
Author: Martin Stockhammer 
Authored: Sat Sep 2 13:14:33 2017 +0200
Committer: Martin Stockhammer 
Committed: Sat Sep 2 13:18:15 2017 +0200

--
 .../apache/archiva/common/utils/FileUtils.java  |  58 +
 .../repository/AbstractRepositoryPurge.java |   2 +-
 .../core/repository/DaysOldRepositoryPurge.java |   9 +-
 .../proxy/DefaultRepositoryProxyConnectors.java |   2 +-
 .../repository/ManagedRepositoryContent.java|   6 +-
 .../repository/metadata/MetadataTools.java  | 125 ++-
 .../metadata/RepositoryMetadataWriter.java  |  10 +-
 .../rest/services/DefaultBrowseService.java |  43 ---
 .../services/DefaultRepositoriesService.java|   4 +-
 .../rest/services/utils/ArtifactBuilder.java|   9 +-
 .../services/ArtifactContentEntriesTests.java   |  14 ++-
 .../services/utils/ArtifactBuilderTest.java |  13 +-
 .../web/api/DefaultFileUploadService.java   |   4 +-
 .../webdav/ArchivaDavResourceFactory.java   |   2 +-
 .../storage/maven2/Maven2RepositoryStorage.java |   7 +-
 .../maven2/ManagedDefaultRepositoryContent.java |  29 +++--
 .../merge/Maven2RepositoryMerger.java   |   4 +-
 17 files changed, 208 insertions(+), 133 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/archiva/blob/ad9fee43/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
new file mode 100644
index 000..45a68ec
--- /dev/null
+++ 
b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/FileUtils.java
@@ -0,0 +1,58 @@
+package org.apache.archiva.common.utils;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Comparator;
+
+/**
+ *
+ * Utility class for file manipulation
+ *
+ * @author Martin Stockhammer 
+ */
+public class FileUtils
+{
+public static void deleteQuietly(Path dir) {
+try
+{
+Files.walk(dir)
+.sorted( Comparator.reverseOrder())
+.forEach( file ->  {
+try
+{
+Files.delete( file );
+}
+catch ( IOException e )
+{
+// Ignore this
+}
+
+});
+}
+catch ( IOException e )
+{
+// Ignore this
+}
+
+
+}
+}

http://git-wip-us.apache.org/repos/asf/archiva/blob/ad9fee43/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java
--
diff --git 
a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java
 
b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java
index 9b1615f..44b7daa 100644
---

[1/2] archiva git commit: Next part for moving to java.nio

2017-09-02 Thread martin_s 
Repository: archiva
Updated Branches:
  refs/heads/master ad9fee439 -> 478115559


http://git-wip-us.apache.org/repos/asf/archiva/blob/47811555/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ErrorHandlingTest.java
--
diff --git 
a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ErrorHandlingTest.java
 
b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ErrorHandlingTest.java
index 69c5c3a..614a5fb 100644
--- 
a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ErrorHandlingTest.java
+++ 
b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ErrorHandlingTest.java
@@ -33,7 +33,12 @@ import 
org.apache.maven.wagon.authorization.AuthorizationException;
 import org.easymock.EasyMock;
 import org.junit.Test;
 
+
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 
 import static org.junit.Assert.*;
 
@@ -64,7 +69,7 @@ public class ErrorHandlingTest
 throws Exception
 {
 String path = PATH_IN_BOTH_REMOTES_NOT_LOCAL;
-File expectedFile = setupRepositoriesWithLocalFileNotPresent( path );
+Path expectedFile = setupRepositoriesWithLocalFileNotPresent( path );
 
 createMockedProxyConnector( ID_MOCKED_PROXIED1, NAME_MOCKED_PROXIED1, 
PropagateErrorsDownloadPolicy.STOP );
 saveConnector( ID_DEFAULT_MANAGED, ID_PROXIED2, false );
@@ -79,7 +84,7 @@ public class ErrorHandlingTest
 throws Exception
 {
 String path = PATH_IN_BOTH_REMOTES_NOT_LOCAL;
-File expectedFile = setupRepositoriesWithLocalFileNotPresent( path );
+Path expectedFile = setupRepositoriesWithLocalFileNotPresent( path );
 
 createMockedProxyConnector( ID_MOCKED_PROXIED1, NAME_MOCKED_PROXIED1, 
PropagateErrorsDownloadPolicy.STOP );
 createMockedProxyConnector( ID_MOCKED_PROXIED2, NAME_MOCKED_PROXIED2, 
PropagateErrorsDownloadPolicy.STOP );
@@ -96,7 +101,7 @@ public class ErrorHandlingTest
 throws Exception
 {
 String path = PATH_IN_BOTH_REMOTES_NOT_LOCAL;
-File expectedFile = setupRepositoriesWithLocalFileNotPresent( path );
+Path expectedFile = setupRepositoriesWithLocalFileNotPresent( path );
 
 saveConnector( ID_DEFAULT_MANAGED, ID_PROXIED1, false );
 
@@ -110,7 +115,7 @@ public class ErrorHandlingTest
 throws Exception
 {
 String path = PATH_IN_BOTH_REMOTES_NOT_LOCAL;
-File expectedFile = setupRepositoriesWithLocalFileNotPresent( path );
+Path expectedFile = setupRepositoriesWithLocalFileNotPresent( path );
 
 createMockedProxyConnector( ID_MOCKED_PROXIED1, NAME_MOCKED_PROXIED1, 
PropagateErrorsDownloadPolicy.STOP );
 
@@ -126,7 +131,7 @@ public class ErrorHandlingTest
 throws Exception
 {
 String path = PATH_IN_BOTH_REMOTES_NOT_LOCAL;
-File expectedFile = setupRepositoriesWithLocalFileNotPresent( path );
+Path expectedFile = setupRepositoriesWithLocalFileNotPresent( path );
 
 createMockedProxyConnector( ID_MOCKED_PROXIED1, NAME_MOCKED_PROXIED1, 
PropagateErrorsDownloadPolicy.STOP );
 
@@ -142,7 +147,7 @@ public class ErrorHandlingTest
 throws Exception
 {
 String path = PATH_IN_BOTH_REMOTES_NOT_LOCAL;
-File expectedFile = setupRepositoriesWithLocalFileNotPresent( path );
+Path expectedFile = setupRepositoriesWithLocalFileNotPresent( path );
 
 saveConnector( ID_DEFAULT_MANAGED, ID_PROXIED1, false  );
 
@@ -156,7 +161,7 @@ public class ErrorHandlingTest
 throws Exception
 {
 String path = PATH_IN_BOTH_REMOTES_NOT_LOCAL;
-File expectedFile = setupRepositoriesWithLocalFileNotPresent( path );
+Path expectedFile = setupRepositoriesWithLocalFileNotPresent( path );
 
 createMockedProxyConnector( ID_MOCKED_PROXIED1, NAME_MOCKED_PROXIED1, 
PropagateErrorsDownloadPolicy.QUEUE );
 
@@ -174,7 +179,7 @@ public class ErrorHandlingTest
 throws Exception
 {
 String path = PATH_IN_BOTH_REMOTES_NOT_LOCAL;
-File expectedFile = setupRepositoriesWithLocalFileNotPresent( path );
+Path expectedFile = setupRepositoriesWithLocalFileNotPresent( path );
 
 createMockedProxyConnector( ID_MOCKED_PROXIED1, NAME_MOCKED_PROXIED1, 
PropagateErrorsDownloadPolicy.QUEUE );
 
@@ -192,7 +197,7 @@ public class ErrorHandlingTest
 throws Exception
 {
 String path = PATH_IN_BOTH_REMOTES_NOT_LOCAL;
-File expectedFile = setupRepositoriesWithLocalFileNotPresent( path );
+Path expectedFile = setupRepositoriesWithLocalFileNotPresent( path );
 
 createMockedProxyConnector( ID_MOCKED_PROXIED1, NAME_MOCKED_PROXIED1, 
PropagateErrorsDownloadPolicy.QUEUE );
 
@@ -210,7 +215,7 @@ public

[1/3] archiva git commit: Moved checksum module to java.nio

2017-09-02 Thread martin_s 
Repository: archiva
Updated Branches:
  refs/heads/master 90250dc30 -> cd1f4a9e7


Moved checksum 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/faceef26
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/faceef26
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/faceef26

Branch: refs/heads/master
Commit: faceef262c3521c1f27bfc49c7ab74c1b41a57ec
Parents: 90250dc
Author: Martin Stockhammer 
Authored: Sat Sep 2 20:37:52 2017 +0200
Committer: Martin Stockhammer 
Committed: Sat Sep 2 20:37:52 2017 +0200

--
 .../org/apache/archiva/checksum/ChecksumAlgorithm.java   |  9 +
 .../apache/archiva/checksum/ChecksumAlgorithmTest.java   | 11 ++-
 2 files changed, 11 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/archiva/blob/faceef26/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksumAlgorithm.java
--
diff --git 
a/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksumAlgorithm.java
 
b/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksumAlgorithm.java
index 71f051f..8d20239 100644
--- 
a/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksumAlgorithm.java
+++ 
b/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksumAlgorithm.java
@@ -19,10 +19,11 @@ package org.apache.archiva.checksum;
  * under the License.
  */
 
-import java.io.File;
 
 import org.apache.commons.io.FilenameUtils;
 
+import java.nio.file.Path;
+
 /**
  * Enumeration of available ChecksumAlgorithm techniques.
  *
@@ -32,9 +33,9 @@ public enum ChecksumAlgorithm {
 SHA1("SHA-1", "sha1", "SHA1"),
 MD5("MD5", "md5", "MD5");
 
-public static ChecksumAlgorithm getByExtension( File file )
+public static ChecksumAlgorithm getByExtension( Path file )
 {
-String ext = FilenameUtils.getExtension( file.getName() 
).toLowerCase();
+String ext = FilenameUtils.getExtension( file.getFileName().toString() 
).toLowerCase();
 if ( ChecksumAlgorithm.SHA1.getExt().equals( ext ) )
 {
 return ChecksumAlgorithm.SHA1;
@@ -44,7 +45,7 @@ public enum ChecksumAlgorithm {
 return ChecksumAlgorithm.MD5;
 }
 
-throw new IllegalArgumentException( "Filename " + file.getName() + " 
has no associated extension." );
+throw new IllegalArgumentException( "Filename " + file.getFileName() + 
" has no associated extension." );
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/archiva/blob/faceef26/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksumAlgorithmTest.java
--
diff --git 
a/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksumAlgorithmTest.java
 
b/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksumAlgorithmTest.java
index bfaa06b..39719cc 100644
--- 
a/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksumAlgorithmTest.java
+++ 
b/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksumAlgorithmTest.java
@@ -20,6 +20,7 @@ package org.apache.archiva.checksum;
  */
 
 import java.io.File;
+import java.nio.file.Paths;
 
 import junit.framework.TestCase;
 import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner;
@@ -38,15 +39,15 @@ public class ChecksumAlgorithmTest
 @Test
 public void testGetHashByExtensionSha1()
 {
-assertEquals( ChecksumAlgorithm.SHA1, 
ChecksumAlgorithm.getByExtension( new File( "something.jar.sha1" ) ) );
-assertEquals( ChecksumAlgorithm.SHA1, 
ChecksumAlgorithm.getByExtension( new File( "OTHER.JAR.SHA1" ) ) );
+assertEquals( ChecksumAlgorithm.SHA1, 
ChecksumAlgorithm.getByExtension( Paths.get( "something.jar.sha1" ) ) );
+assertEquals( ChecksumAlgorithm.SHA1, 
ChecksumAlgorithm.getByExtension( Paths.get( "OTHER.JAR.SHA1" ) ) );
 }
 
 @Test
 public void testGetHashByExtensionMd5()
 {
-assertEquals( ChecksumAlgorithm.MD5, ChecksumAlgorithm.getByExtension( 
new File( "something.jar.md5" ) ) );
-assertEquals( ChecksumAlgorithm.MD5, ChecksumAlgorithm.getByExtension( 
new File( "OTHER.JAR.MD5" ) ) );
+assertEquals( ChecksumAlgorithm.MD5, ChecksumAlgorithm.getByExtension( 
Paths.get( "something.jar.md5" ) ) );
+assertEquals( ChecksumAlgorithm.MD5,

[2/3] archiva git commit: Switching the checksum module to java.nio

2017-09-02 Thread martin_s 
http://git-wip-us.apache.org/repos/asf/archiva/blob/cd1f4a9e/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java
--
diff --git 
a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java
 
b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java
index 7a81e13..54ff2e9 100644
--- 
a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java
+++ 
b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java
@@ -20,7 +20,7 @@ package org.apache.archiva.repository.content.maven2;
  */
 
 import org.apache.archiva.admin.model.beans.ManagedRepository;
-import org.apache.archiva.common.utils.FileUtil;
+import org.apache.archiva.common.utils.FileUtils;
 import org.apache.archiva.configuration.ArchivaConfiguration;
 import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.repository.ManagedRepositoryContent;
@@ -368,7 +368,7 @@ public class RepositoryRequestTest
 private ManagedRepositoryContent createManagedRepo( String layout )
 throws Exception
 {
-File repoRoot = new File( FileUtil.getBasedir() + "/target/test-repo" 
);
+File repoRoot = new File( FileUtils.getBasedir() + "/target/test-repo" 
);
 return createManagedRepositoryContent( "test-internal", "Internal Test 
Repo", repoRoot, layout );
 }
 

http://git-wip-us.apache.org/repos/asf/archiva/blob/cd1f4a9e/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
--
diff --git 
a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
 
b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
index 4983004..5fcb717 100644
--- 
a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
+++ 
b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
@@ -149,7 +149,7 @@ public class DuplicateArtifactsConsumer
 //  alternatively this could come straight from the storage resolver, 
which could populate the artifact metadata
 //  in the later parse call with the desired checksum and use that
 String checksumSha1;
-ChecksummedFile checksummedFile = new ChecksummedFile( artifactFile );
+ChecksummedFile checksummedFile = new ChecksummedFile( 
artifactFile.toPath() );
 try
 {
 checksumSha1 = checksummedFile.calculateChecksum( 
ChecksumAlgorithm.SHA1 );

[3/3] archiva git commit: Switching the checksum module to java.nio

2017-09-02 Thread martin_s 
Switching the checksum 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/cd1f4a9e
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/cd1f4a9e
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/cd1f4a9e

Branch: refs/heads/master
Commit: cd1f4a9e79c91e11f1183045b6aeb8b93017d319
Parents: faceef2
Author: Martin Stockhammer 
Authored: Sat Sep 2 22:05:16 2017 +0200
Committer: Martin Stockhammer 
Committed: Sat Sep 2 22:05:16 2017 +0200

--
 .../archiva/checksum/ChecksummedFile.java   | 54 +++--
 .../checksum/AbstractChecksumTestCase.java  | 31 +---
 .../archiva/checksum/ChecksumAlgorithmTest.java |  5 +-
 .../apache/archiva/checksum/ChecksumTest.java   |  9 ++-
 .../archiva/checksum/ChecksummedFileTest.java   | 84 +++-
 .../apache/archiva/common/utils/FileUtil.java   | 36 -
 .../apache/archiva/common/utils/FileUtils.java  | 47 +++
 .../ArchivaConfigurationMRM789Test.java | 12 +--
 .../configuration/ArchivaConfigurationTest.java |  3 +-
 .../core/ArtifactMissingChecksumsConsumer.java  |  4 +-
 .../ArtifactMissingChecksumsConsumerTest.java   |  2 +-
 .../artifact/LegacyToDefaultConverterTest.java  |  5 +-
 .../search/AbstractMavenRepositorySearch.java   | 27 +++
 .../search/MavenRepositorySearchTest.java   | 39 +
 .../apache/archiva/policies/ChecksumPolicy.java |  4 +-
 .../archiva/policies/ChecksumPolicyTest.java|  3 +-
 .../proxy/DefaultRepositoryProxyConnectors.java |  3 -
 .../remote/DefaultRemoteRepositoryAdmin.java|  2 -
 .../repository/metadata/MetadataTools.java  |  6 +-
 .../archiva/transaction/CopyFileEventTest.java  |  7 +-
 .../transaction/CreateFileEventTest.java|  7 +-
 .../indexing/DownloadRemoteIndexTaskTest.java   |  4 +-
 .../services/DefaultRepositoriesService.java|  4 +-
 .../rest/services/AbstractArchivaRestTest.java  |  4 +-
 .../rest/services/RepositoriesServiceTest.java  |  3 +-
 .../web/api/DefaultFileUploadService.java   |  2 +-
 .../storage/maven2/Maven2RepositoryStorage.java |  2 +-
 ...oryMetadataResolverMRM1411RepoGroupTest.java | 13 ++-
 ...n2RepositoryMetadataResolverMRM1411Test.java | 13 ++-
 .../Maven2RepositoryMetadataResolverTest.java   | 14 ++--
 .../content/maven2/RepositoryRequestTest.java   |  4 +-
 .../consumers/DuplicateArtifactsConsumer.java   |  2 +-
 32 files changed, 232 insertions(+), 223 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/archiva/blob/cd1f4a9e/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java
--
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 39a11c5..6459a1c 100644
--- 
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
@@ -19,15 +19,16 @@ package org.apache.archiva.checksum;
  * under the License.
  */
 
-import org.apache.commons.io.FileUtils;
+import org.apache.archiva.common.utils.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.Charset;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 import java.util.ArrayList;
 import java.util.List;
@@ -49,18 +50,21 @@ import java.util.regex.Pattern;
  */
 public class ChecksummedFile
 {
+
+private static Charset FILE_ENCODING = Charset.forName( "UTF-8" );
+
 private final Logger log = LoggerFactory.getLogger( ChecksummedFile.class 
);
 
 private static final Pattern METADATA_PATTERN = Pattern.compile( 
"maven-metadata-\\S*.xml" );
 
-private final File referenceFile;
+private final Path referenceFile;
 
 /**
  * Construct a ChecksummedFile object.
  *
  * @param referenceFile
  */
-public ChecksummedFile( final File referenceFile )
+public ChecksummedFile( final Path referenceFile )
 {
 this.referenceFile = referenceFile;
 }
@@ -76,7 +80,7 @@ public class ChecksummedFile
 throws IOException
 {
 
-try (InputStream fis = Files.newInputStream( referenceFile.toPath() ))
+try (InputStream fis = Files.newInputStream( referenceFile ))
 {
 Checksum checksum = new Checksum( checksumAlgorithm );