diff options
Diffstat (limited to 'archiva-modules/archiva-web/archiva-rest')
5 files changed, 12 insertions, 12 deletions
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java index 7fdbf4e92..7055fdea3 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java @@ -281,8 +281,8 @@ public class DefaultBrowseService catch ( MetadataResolutionException e ) { log.warn( - "Skipping invalid metadata while compiling shared model for " + groupId + ":" + artifactId - + " in repo " + repoId + ": " + e.getMessage() ); + "Skipping invalid metadata while compiling shared model for {}:{} in repo {}: {}", + groupId, artifactId, repoId, e.getMessage() ); } } } diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java index 3c20cdd6b..c43f85047 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java @@ -165,7 +165,7 @@ public class DefaultManagedRepositoriesService } catch ( MetadataRepositoryException e ) { - log.warn( "Error retrieving repository statistics: " + e.getMessage(), e ); + log.warn( "Error retrieving repository statistics: {}", e.getMessage(), e ); } if ( stats != null ) { diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultReportRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultReportRepositoriesService.java index 0c4fd1edb..bb5deac15 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultReportRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultReportRepositoriesService.java @@ -82,7 +82,7 @@ public class DefaultReportRepositoriesService } catch ( MetadataRepositoryException e ) { - log.warn( "Unable to retrieve stats, assuming is empty: " + e.getMessage(), e ); + log.warn( "Unable to retrieve stats, assuming is empty: {}", e.getMessage(), e ); } } @@ -109,7 +109,7 @@ public class DefaultReportRepositoriesService } catch ( MetadataRepositoryException e ) { - log.warn( "Unable to retrieve stats, assuming is empty: " + e.getMessage(), e ); + log.warn( "Unable to retrieve stats, assuming is empty: {}", e.getMessage(), e ); } if ( stats == null || stats.isEmpty() ) { diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ManagedRepositoriesServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ManagedRepositoriesServiceTest.java index 181514a1d..38e12302b 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ManagedRepositoriesServiceTest.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ManagedRepositoriesServiceTest.java @@ -160,7 +160,7 @@ public class ManagedRepositoriesServiceTest assertNotNull( archivaRepositoryStatistics ); - log.info( "archivaRepositoryStatistics:" + archivaRepositoryStatistics.toString() ); + log.info( "archivaRepositoryStatistics: {}", archivaRepositoryStatistics.toString() ); assertEquals( 92, archivaRepositoryStatistics.getNewFileCount() ); assertEquals( 92, archivaRepositoryStatistics.getTotalFileCount() ); diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java index d44461ed4..b08966685 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java @@ -130,7 +130,7 @@ public class SearchServiceTest for ( Artifact artifact : artifacts ) { - log.info( "url:" + artifact.getUrl() ); + log.info( "url: {}", artifact.getUrl() ); String version = artifact.getVersion(); assertTrue( artifact.getUrl().contains( version ) ); @@ -231,7 +231,7 @@ public class SearchServiceTest for ( Artifact artifact : artifacts ) { - log.info( "url:" + artifact.getUrl() ); + log.info( "url: {}", artifact.getUrl() ); String version = artifact.getVersion(); assertEquals( "http://localhost:" + port + "/repository/test-repo/org/apache/karaf/features/org.apache.karaf.features.core/" @@ -269,7 +269,7 @@ public class SearchServiceTest assertTrue( " not 1 results for Bundle ExportPackage org.apache.karaf.features.command.completers but " + artifacts.size() + ":" + artifacts, artifacts.size() == 1 ); - log.info( "artifact url " + artifacts.get( 0 ).getUrl() ); + log.info( "artifact url {}", artifacts.get( 0 ).getUrl() ); deleteTestRepo( testRepoId ); } @@ -333,7 +333,7 @@ public class SearchServiceTest assertTrue( " not 0 results for Bundle ExportPackage org.apache.karaf.features.command.completers but " + artifacts.size() + ":" + artifacts, artifacts.size() == 1 ); - log.info( "artifact url " + artifacts.get( 0 ).getUrl() ); + log.info( "artifact url {}", artifacts.get( 0 ).getUrl() ); deleteTestRepo( testRepoId ); } @@ -354,7 +354,7 @@ public class SearchServiceTest SearchService searchService = getSearchService( authorizationHeader ); Collection<String> groupIds = searchService.getAllGroupIds( Arrays.asList( testRepoId ) ).getGroupIds(); - log.info( "groupIds " + groupIds ); + log.info( "groupIds {}", groupIds ); assertFalse( groupIds.isEmpty() ); assertTrue( groupIds.contains( "commons-cli" ) ); assertTrue( groupIds.contains( "org.apache.felix" ) ); @@ -384,7 +384,7 @@ public class SearchServiceTest new SearchRequest( "org.foo", "studio-all-update-site", null, null, null, Arrays.asList( "test-repo" ) ); List<Artifact> artifacts = searchService.searchArtifacts( searchRequest ); - log.info( "artifacts:" + artifacts ); + log.info( "artifacts: {}", artifacts ); assertEquals( 1, artifacts.size() ); deleteTestRepo( testRepoId ); } |