Merge remote-tracking branch 'ecki/topic-sonar-deadstore' into merge-topic-sonar-deadstore

5 files changed, 6 insertions, 14 deletions

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 d5b862b82..8e2dd8341 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 )
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 348f5d065..e0660c269 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 )
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 6e6c90565..e4d6676d6 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() )
         {
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 6acf622e1..adb1a875e 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;
     }
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 892a461ba..7a974db3c 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";
 //