fix some quality flaws

diff --git a/server/sonar-process/src/main/java/org/sonar/process/Lifecycle.java b/server/sonar-process/src/main/java/org/sonar/process/Lifecycle.java
index a6649bd0860f3326ea5eb761eec5392947dd067b..b6dd380211bc031390cb0bd06c76c9cb38a27812 100644 (file)
--- a/server/sonar-process/src/main/java/org/sonar/process/Lifecycle.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/Lifecycle.java
@@ -46,6 +46,8 @@ public class Lifecycle {
 
   private static final Map<State, Set<State>> TRANSITIONS = buildTransitions();
 
+  private State state = INIT;
+
   private static Map<State, Set<State>> buildTransitions() {
     Map<State, Set<State>> res = new EnumMap<>(State.class);
     res.put(INIT, toSet(STARTING));
@@ -68,8 +70,6 @@ public class Lifecycle {
     return EnumSet.copyOf(Arrays.asList(states));
   }
 
-  private State state = INIT;
-
   public State getState() {
     return state;
   }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/CeQueueModule.java b/server/sonar-server/src/main/java/org/sonar/server/computation/CeQueueModule.java
index 6a6303007456320b1814e3e4d56da6002b768d76..c2a4506ec8bea01dcdea5b2a2471551578b7e946 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/CeQueueModule.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/CeQueueModule.java
@@ -26,7 +26,6 @@ import org.sonar.server.computation.monitoring.CeTasksMBeanImpl;
 import org.sonar.server.computation.queue.CeQueueCleaner;
 import org.sonar.server.computation.queue.CeQueueInitializer;
 import org.sonar.server.computation.queue.InternalCeQueueImpl;
-import org.sonar.server.computation.task.projectanalysis.queue.CleanReportQueueListener;
 
 public class CeQueueModule extends Module {
   @Override

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/developer/PersistDevelopersDelegate.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/developer/PersistDevelopersDelegate.java
index de6270051b273c956186c085711350030aa1b3c3..38ee1c5ccc0f5ae4b78497921b3c433b5989d46a 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/developer/PersistDevelopersDelegate.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/developer/PersistDevelopersDelegate.java
@@ -19,11 +19,16 @@
  */
 package org.sonar.server.computation.task.projectanalysis.api.developer;
 
+import org.sonar.server.computation.task.step.ComputationStep;
+
 /**
  * This interface is used to delegate the persistence of developers to the Developer Cockpit plugin
  */
 public interface PersistDevelopersDelegate {
 
+  /**
+   * The delegate's implementation of {@link ComputationStep#execute()}.
+   */
   void execute();
 
 }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImpl.java
index 4dd540526543741ca7ab44b27e95e88ab751c370..ba4cdf3ac067a0e8194124db89edf960f7f40ac2 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImpl.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImpl.java
@@ -190,7 +190,8 @@ public class MeasureComputerContextImpl implements MeasureComputerContext {
         ? new ComponentImpl.FileAttributesImpl(component.getFileAttributes().getLanguageKey(), component.getFileAttributes().isUnitTest()) : null);
   }
 
-  private class ComponentToMeasure implements Function<org.sonar.server.computation.task.projectanalysis.component.Component, Optional<org.sonar.server.computation.task.projectanalysis.measure.Measure>> {
+  private class ComponentToMeasure implements Function<org.sonar.server.computation.task.projectanalysis.component.Component,
+      Optional<org.sonar.server.computation.task.projectanalysis.measure.Measure>> {
 
     private final Metric metric;
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorsCrawler.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorsCrawler.java
index 667ba78579038638b99a291f555f3a264174342c..e94f107eeee62177f48f68e0bdcc64ae3fdf6d71 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorsCrawler.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/VisitorsCrawler.java
@@ -155,9 +155,12 @@ public class VisitorsCrawler implements ComponentCrawler {
 
   private static class MatchVisitorMaxDepth implements Predicate<VisitorWrapper> {
     private static final Map<Component.Type, MatchVisitorMaxDepth> INSTANCES = buildInstances();
-
     private final Component.Type type;
 
+    private MatchVisitorMaxDepth(Component.Type type) {
+      this.type = requireNonNull(type);
+    }
+
     private static Map<Component.Type, MatchVisitorMaxDepth> buildInstances() {
       ImmutableMap.Builder<Component.Type, MatchVisitorMaxDepth> builder = ImmutableMap.builder();
       for (Component.Type type : Component.Type.values()) {
@@ -166,10 +169,6 @@ public class VisitorsCrawler implements ComponentCrawler {
       return builder.build();
     }
 
-    private MatchVisitorMaxDepth(Component.Type type) {
-      this.type = requireNonNull(type);
-    }
-
     public static MatchVisitorMaxDepth forComponent(Component component) {
       return INSTANCES.get(component.getType());
     }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricImpl.java
index 31ca5166ee71c4c22ab66fb64ba44508b19a946e..bf8ecbe7ad11d7a93f316ed81180ba796929ad85 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricImpl.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/metric/MetricImpl.java
@@ -19,13 +19,14 @@
  */
 package org.sonar.server.computation.task.projectanalysis.metric;
 
-import com.google.common.base.MoreObjects;
 import java.util.Objects;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 import org.sonar.server.computation.task.projectanalysis.measure.Measure;
 
+import static com.google.common.base.MoreObjects.firstNonNull;
+import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
@@ -53,7 +54,7 @@ public final class MetricImpl implements Metric {
     this.name = checkNotNull(name);
     this.type = checkNotNull(type);
     if (type.getValueType() == Measure.ValueType.DOUBLE) {
-      this.decimalScale = MoreObjects.firstNonNull(decimalScale, org.sonar.api.measures.Metric.DEFAULT_DECIMAL_SCALE);
+      this.decimalScale = firstNonNull(decimalScale, org.sonar.api.measures.Metric.DEFAULT_DECIMAL_SCALE);
     } else {
       this.decimalScale = decimalScale;
     }
@@ -117,7 +118,7 @@ public final class MetricImpl implements Metric {
 
   @Override
   public String toString() {
-    return com.google.common.base.MoreObjects.toStringHelper(this)
+    return toStringHelper(this)
       .add("id", id)
       .add("key", key)
       .add("name", name)

diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java
index ae1af235c1c279f3911f95dab57efb8c13020132..341bdc998373e724c93958cb59dea007ff313a5a 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java
@@ -170,7 +170,7 @@ public class ServerPluginRepository implements PluginRepository, Startable {
     String pluginKey = info.getKey();
     if (blacklistedPluginKeys.contains(pluginKey)) {
       LOG.warn("Plugin {} [{}] is blacklisted and is being uninstalled.", info.getName(), pluginKey);
-      org.sonar.core.util.FileUtils.deleteQuietly(info.getNonNullJarFile());
+      deleteQuietly(info.getNonNullJarFile());
       return;
     }
     if (FORBIDDEN_COMPATIBLE_PLUGINS.contains(pluginKey)) {

diff --git a/sonar-db/src/main/java/org/sonar/db/version/v60/CleanUsurperRootComponents.java b/sonar-db/src/main/java/org/sonar/db/version/v60/CleanUsurperRootComponents.java
index b300d047f21272ebddda7abcd5970759be5ba9c3..14a6cc538774bbf8e1c7db2ebe7b226aa7be06b3 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/version/v60/CleanUsurperRootComponents.java
+++ b/sonar-db/src/main/java/org/sonar/db/version/v60/CleanUsurperRootComponents.java
@@ -119,7 +119,7 @@ public class CleanUsurperRootComponents extends BaseDataChange {
     });
   }
 
-  private void cleanSnapshotWithIncorrectRoot(Context context) throws SQLException {
+  private static void cleanSnapshotWithIncorrectRoot(Context context) throws SQLException {
     MassUpdate massUpdate = context.prepareMassUpdate();
     massUpdate.select("select" +
       " sn.id" +

diff --git a/sonar-db/src/main/java/org/sonar/db/version/v60/PopulateComponentUuidAndAnalysisUuidOfDuplicationsIndex.java b/sonar-db/src/main/java/org/sonar/db/version/v60/PopulateComponentUuidAndAnalysisUuidOfDuplicationsIndex.java
index dc26fdd1d26576dd0f4e08f337affa6e87afcc38..00b20e211dcf230501c77abced6851dfdddcf633 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/version/v60/PopulateComponentUuidAndAnalysisUuidOfDuplicationsIndex.java
+++ b/sonar-db/src/main/java/org/sonar/db/version/v60/PopulateComponentUuidAndAnalysisUuidOfDuplicationsIndex.java
@@ -58,7 +58,7 @@ public class PopulateComponentUuidAndAnalysisUuidOfDuplicationsIndex extends Bas
     return true;
   }
   
-  public void populateAnalysisUuid(Context context) throws SQLException {
+  public static void populateAnalysisUuid(Context context) throws SQLException {
     MassUpdate massUpdate = context.prepareMassUpdate();
     massUpdate.select("select distinct di.project_snapshot_id, s.uuid from duplications_index di" +
         " inner join snapshots s on s.id=di.project_snapshot_id" +

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/ce/posttask/Project.java b/sonar-plugin-api/src/main/java/org/sonar/api/ce/posttask/Project.java
index 47065821809436a103e63ce3c0a1036330920c09..16ae114d1a2b9cd257b9869cdd4a43c8eb14216c 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/ce/posttask/Project.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/ce/posttask/Project.java
@@ -23,9 +23,18 @@ package org.sonar.api.ce.posttask;
  * @since 5.5
  */
 public interface Project {
+  /**
+   * The UUID of the project.
+   */
   String getUuid();
 
+  /**
+   * The key of the project.
+   */
   String getKey();
 
+  /**
+   * The name of the project.
+   */
   String getName();
 }