Improve quality

diff --git a/sonar-batch/src/main/java/org/sonar/batch/cache/DefaultProjectCacheStatus.java b/sonar-batch/src/main/java/org/sonar/batch/cache/DefaultProjectCacheStatus.java
index 3ecf425d11a6c13a1294fb3213aa2d9184879ddb..401a1455ac0afbbafdbc53511e18d5cf0da67c82 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/cache/DefaultProjectCacheStatus.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/cache/DefaultProjectCacheStatus.java
@@ -26,7 +26,6 @@ import org.sonar.home.cache.PersistentCache;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.nio.file.Files;
@@ -46,11 +45,9 @@ public class DefaultProjectCacheStatus implements ProjectCacheStatus {
     Date now = new Date();
 
     try {
-      FileOutputStream fos = new FileOutputStream(getStatusFilePath().toFile());
-      try (ObjectOutputStream objOutput = new ObjectOutputStream(fos)) {
+      try (ObjectOutputStream objOutput = new ObjectOutputStream(new FileOutputStream(getStatusFilePath().toFile()))) {
         objOutput.writeObject(now);
       }
-
     } catch (IOException e) {
       throw new IllegalStateException("Failed to write cache sync status", e);
     }
@@ -69,8 +66,7 @@ public class DefaultProjectCacheStatus implements ProjectCacheStatus {
       if (!Files.isRegularFile(p)) {
         return null;
       }
-      InputStream is = new FileInputStream(p.toFile());
-      try (ObjectInputStream objInput = new ObjectInputStream(is)) {
+      try (ObjectInputStream objInput = new ObjectInputStream(new FileInputStream(p.toFile()))) {
         return (Date) objInput.readObject();
       }
     } catch (IOException | ClassNotFoundException e) {

diff --git a/sonar-batch/src/main/java/org/sonar/batch/cache/GlobalPersistentCacheProvider.java b/sonar-batch/src/main/java/org/sonar/batch/cache/GlobalPersistentCacheProvider.java
index 26d8a21595712cb48c267d1c8008f0eeb580fdbb..391d5248062b5b522c9c45fff252663d3c662d4c 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/cache/GlobalPersistentCacheProvider.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/cache/GlobalPersistentCacheProvider.java
@@ -49,7 +49,7 @@ public class GlobalPersistentCacheProvider extends ProviderAdapter {
     return cache;
   }
 
-  private String getServerUrl(GlobalProperties props) {
+  private static String getServerUrl(GlobalProperties props) {
     return StringUtils.removeEnd(StringUtils.defaultIfBlank(props.property("sonar.host.url"), "http://localhost:9000"), "/");
   }
 }

diff --git a/sonar-batch/src/main/java/org/sonar/batch/cache/ProjectCacheSynchronizer.java b/sonar-batch/src/main/java/org/sonar/batch/cache/ProjectCacheSynchronizer.java
index 4445eaae6069773fbd7758a3dcc304efc9cba98f..4ba15ab16a610f7d9aa370e3ceadc43cc1a69965 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/cache/ProjectCacheSynchronizer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/cache/ProjectCacheSynchronizer.java
@@ -89,10 +89,9 @@ public class ProjectCacheSynchronizer {
 
   private void loadData(String projectKey) {
     Profiler profiler = Profiler.create(Loggers.get(ProjectCacheSynchronizer.class));
-    ProjectRepositories projectRepo = null;
 
     profiler.startInfo("Load project settings");
-    projectRepo = projectRepositoriesLoader.load(projectKey, true, null);
+    ProjectRepositories projectRepo = projectRepositoriesLoader.load(projectKey, true, null);
 
     if (!projectRepo.exists()) {
       LOG.debug("Project doesn't exist in the server");

diff --git a/sonar-batch/src/main/java/org/sonar/batch/cache/ProjectPersistentCacheProvider.java b/sonar-batch/src/main/java/org/sonar/batch/cache/ProjectPersistentCacheProvider.java
index 49684faff18866d0e5af0527b4add99bd8003ace..601ca335f7c0e539044d39219670f6946f2ac48f 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/cache/ProjectPersistentCacheProvider.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/cache/ProjectPersistentCacheProvider.java
@@ -61,7 +61,7 @@ public class ProjectPersistentCacheProvider extends ProviderAdapter {
     return cache;
   }
 
-  private String getServerUrl(GlobalProperties props) {
+  private static String getServerUrl(GlobalProperties props) {
     return StringUtils.removeEnd(StringUtils.defaultIfBlank(props.property("sonar.host.url"), "http://localhost:9000"), "/");
   }
 }

diff --git a/sonar-batch/src/main/java/org/sonar/batch/cache/WSLoader.java b/sonar-batch/src/main/java/org/sonar/batch/cache/WSLoader.java
index 6535e2c6445df5fdca7b1429340971b9186aff25..a430a3ce93e9d28f1932ef5329c377b8f5ef89d5 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/cache/WSLoader.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/cache/WSLoader.java
@@ -149,7 +149,7 @@ public class WSLoader {
 
   @Nonnull
   private <T> WSLoaderResult<T> loadFromCache(String id, DataLoader<T> loader) throws NotAvailableException {
-    T result = null;
+    T result;
 
     try {
       result = loader.load(id);

diff --git a/sonar-home/src/main/java/org/sonar/home/cache/PersistentCacheBuilder.java b/sonar-home/src/main/java/org/sonar/home/cache/PersistentCacheBuilder.java
index 7be8fae66e8ed204c4ba5b3576a1d98094d1b014..51a05b7bf9cc5add6ab887d16d11c1bad441b9be 100644 (file)
--- a/sonar-home/src/main/java/org/sonar/home/cache/PersistentCacheBuilder.java
+++ b/sonar-home/src/main/java/org/sonar/home/cache/PersistentCacheBuilder.java
@@ -99,7 +99,7 @@ public class PersistentCacheBuilder {
     return Paths.get(home, ".sonar");
   }
 
-  private String sanitizeFilename(String name) {
+  private static String sanitizeFilename(String name) {
     try {
       return URLEncoder.encode(name, StandardCharsets.UTF_8.name());
     } catch (UnsupportedEncodingException e) {