Repository: archiva Updated Branches: refs/heads/master 85c6959e3 -> ee8491135
Remove Sonar Dead Store Issues. Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/495a7bf9 Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/495a7bf9 Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/495a7bf9 Branch: refs/heads/master Commit: 495a7bf95fa56ec7b73fca2f2e94cc7fc61f68c2 Parents: 5d5b073 Author: Bernd Eckenfels <[email protected]> Authored: Tue Oct 13 00:54:04 2015 +0200 Committer: Bernd Eckenfels <[email protected]> Committed: Tue Oct 13 00:54:04 2015 +0200 ---------------------------------------------------------------------- .../archiva/repository/scanner/RepositoryScanStatistics.java | 6 ++---- .../archiva/rest/services/DefaultRepositoriesService.java | 3 ++- .../org/apache/archiva/web/api/DefaultFileUploadService.java | 2 +- .../dependency/tree/maven2/Maven3DependencyTreeBuilder.java | 6 +----- .../archiva/stagerepository/merge/Maven2RepositoryMerger.java | 3 --- 5 files changed, 6 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/495a7bf9/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanStatistics.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanStatistics.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanStatistics.java index d5b862b..8e2dd83 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanStatistics.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanStatistics.java @@ -97,14 +97,12 @@ public class RepositoryScanStatistics public void increaseFileCount() { - long count = getTotalFileCount(); - this.totalFileCount = ++count; + this.totalFileCount += 1; } public void increaseNewFileCount() { - long count = getNewFileCount(); - this.newFileCount = ++count; + this.newFileCount += 1; } public void setKnownConsumers( List<String> consumers ) http://git-wip-us.apache.org/repos/asf/archiva/blob/495a7bf9/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java index 348f5d0..e0660c2 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java @@ -423,7 +423,7 @@ public class DefaultRepositoriesService String timestamp = null; File versionMetadataFile = new File( targetPath, MetadataTools.MAVEN_METADATA ); - ArchivaRepositoryMetadata versionMetadata = getMetadata( versionMetadataFile ); + /* unused */ getMetadata( versionMetadataFile ); if ( !targetPath.exists() ) { @@ -482,6 +482,7 @@ public class DefaultRepositoriesService "Artifact \'" + artifactTransferRequest.getGroupId() + ":" + artifactTransferRequest.getArtifactId() + ":" + artifactTransferRequest.getVersion() + "\' was successfully deployed to repository \'" + artifactTransferRequest.getTargetRepositoryId() + "\'"; + log.debug("copyArtifact {}", msg); } catch ( RepositoryException e ) http://git-wip-us.apache.org/repos/asf/archiva/blob/495a7bf9/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java index 6e6c905..e4d6676 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java @@ -189,7 +189,7 @@ public class DefaultFileUploadService // try with full name as ui only know the file name if ( !removed ) { - removed = getSessionFileMetadatas().remove( new FileMetadata( file.getPath() ) ); + /* unused */ getSessionFileMetadatas().remove( new FileMetadata( file.getPath() ) ); } if ( file.exists() ) { http://git-wip-us.apache.org/repos/asf/archiva/blob/495a7bf9/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java index 6acf622..adb1a87 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java @@ -280,12 +280,8 @@ public class Maven3DependencyTreeBuilder DependencySelector depFilter = new AndDependencySelector( new ExclusionDependencySelector() ); session.setDependencySelector( depFilter ); - LocalRepository localRepo = new LocalRepository( localRepoDir ); session.setLocalRepositoryManager( - new SimpleLocalRepositoryManager( localRepoDir ) );// system.newLocalRepositoryManager( localRepo ) ); - - //session.setTransferListener( ); - //session.setRepositoryListener( n ); + new SimpleLocalRepositoryManager( localRepoDir ) ); return session; } http://git-wip-us.apache.org/repos/asf/archiva/blob/495a7bf9/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java index 892a461..7a974db 100644 --- a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java +++ b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java @@ -194,9 +194,6 @@ public class Maven2RepositoryMerger copyFile( sourceArtifactFile, targetArtifactFile ); // pom file copying - String fileName = artifactMetadata.getProject() + "-" + artifactMetadata.getVersion() + ".pom"; - - // pom file copying // TODO need to use path translator to get the pom file path // String fileName = artifactMetadata.getProject() + "-" + artifactMetadata.getVersion() + ".pom"; //
