From e4a2e65f6e214bc0bb7248fd634e0160580e9ee0 Mon Sep 17 00:00:00 2001 From: Martin Stockhammer Date: Tue, 13 Sep 2016 18:33:19 +0200 Subject: [PATCH 1/2] Removing trailing slash in remote repository check See https://issues.apache.org/jira/browse/MRM-1909 --- .../rest/services/DefaultRemoteRepositoriesService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java index 9c0bdd925b..5a7948719e 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java @@ -201,7 +201,8 @@ public Boolean checkRemoteConnectivity( String repositoryId ) wagon.connect( new Repository( remoteRepository.getId(), remoteRepository.getUrl() ), proxyInfo ); // we only check connectivity as remote repo can be empty - wagon.getFileList( "/" ); + // MRM-1909: Wagon implementation appends a slash already + wagon.getFileList( "" ); return Boolean.TRUE; } From 5bb5f76520d5d0873cde6cb6171a44ea402f4f4b Mon Sep 17 00:00:00 2001 From: Martin Stockhammer Date: Wed, 14 Sep 2016 10:22:21 +0200 Subject: [PATCH 2/2] Adding unit test for remote repository check --- .../services/RemoteRepositoriesServiceTest.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RemoteRepositoriesServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RemoteRepositoriesServiceTest.java index db857719f1..3d284e4526 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RemoteRepositoriesServiceTest.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RemoteRepositoriesServiceTest.java @@ -146,6 +146,21 @@ public void addAndUpdateAndDeleteRemoteRepository() } + @Test + public void checkRemoteConnectivity() + throws Exception { + RemoteRepositoriesService service = getRemoteRepositoriesService(); + + WebClient.client(service).header("Authorization", authorizationHeader); + + int initialSize = service.getRemoteRepositories().size(); + + service.addRemoteRepository(getRemoteRepository()); + + assertTrue(service.checkRemoteConnectivity("id-new")); + + } + RemoteRepository getRemoteRepository() { return new RemoteRepository( "id-new", "new one", "http://foo.com", "default", "foo", "foopassword", 120,