Fix quality flaws

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/TendencyAnalyser.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/TendencyAnalyser.java
index 92c964f7b61b20bde53155eb055aaa52496ab75d..0a62a0244bafcee9eed070d75816e0f4f80033d9 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/TendencyAnalyser.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/TendencyAnalyser.java
@@ -105,7 +105,8 @@ public class TendencyAnalyser {
     private double sumXPower2;
     private double sumYPower2;
     private double sumXY;
-    private double yIntercept; // not used today
+    // not used today
+    private double yIntercept;
     private Double slope;
     private Double correlationRate;
 

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/TendencyDecorator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/TendencyDecorator.java
index 6868cba1a95b1899e727ca4e51223e724f09e509..39003a8e6888845cbdccbea621e7afa529282ce0 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/TendencyDecorator.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/TendencyDecorator.java
@@ -24,13 +24,7 @@ import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateUtils;
-import org.sonar.api.batch.Decorator;
-import org.sonar.api.batch.DecoratorBarriers;
-import org.sonar.api.batch.DecoratorContext;
-import org.sonar.api.batch.DependedUpon;
-import org.sonar.api.batch.DependsUpon;
-import org.sonar.api.batch.TimeMachine;
-import org.sonar.api.batch.TimeMachineQuery;
+import org.sonar.api.batch.*;
 import org.sonar.api.measures.Measure;
 import org.sonar.api.measures.Metric;
 import org.sonar.api.measures.MetricFinder;
@@ -81,7 +75,8 @@ public class TendencyDecorator implements Decorator {
   protected TimeMachineQuery initQuery(Project project) {
     int days = configuration.getTendencyPeriodInDays();
 
-    query = new TimeMachineQuery(null) // resource is set after
+    // resource is set after
+    query = new TimeMachineQuery(null)
         .setFrom(DateUtils.addDays(project.getAnalysisDate(), -days))
         .setToCurrentAnalysis(true)
         .setMetrics(metrics);

diff --git a/sonar-batch/src/main/java/org/sonar/batch/ProjectConfigurator.java b/sonar-batch/src/main/java/org/sonar/batch/ProjectConfigurator.java
index b7c83521e5875482f1eb053f47590f00a3d1719b..027191be7dff0b5ac3e3d046bc08b16716b507ca 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/ProjectConfigurator.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/ProjectConfigurator.java
@@ -71,7 +71,8 @@ public class ProjectConfigurator implements BatchComponent {
     checkCurrentAnalysisIsTheLatestOne(project.getKey(), analysisDate);
 
     project
-      .setConfiguration(new PropertiesConfiguration()) // will be populated by ProjectSettings
+      // will be populated by ProjectSettings
+      .setConfiguration(new PropertiesConfiguration())
       .setAnalysisDate(analysisDate)
       .setAnalysisVersion(loadAnalysisVersion())
       .setAnalysisType(loadAnalysisType());

diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/DefaultResourcePersister.java b/sonar-batch/src/main/java/org/sonar/batch/index/DefaultResourcePersister.java
index 15b0933f77c354d193164a538297054b12b6cf56..636122f849a2924cd8aa5422aef97c82e8e6f02c 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/index/DefaultResourcePersister.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/index/DefaultResourcePersister.java
@@ -25,12 +25,7 @@ import org.apache.commons.lang.StringUtils;
 import org.sonar.api.database.DatabaseSession;
 import org.sonar.api.database.model.ResourceModel;
 import org.sonar.api.database.model.Snapshot;
-import org.sonar.api.resources.Library;
-import org.sonar.api.resources.Project;
-import org.sonar.api.resources.Qualifiers;
-import org.sonar.api.resources.Resource;
-import org.sonar.api.resources.ResourceUtils;
-import org.sonar.api.resources.Scopes;
+import org.sonar.api.resources.*;
 import org.sonar.api.security.ResourcePermissions;
 import org.sonar.api.utils.SonarException;
 
@@ -79,7 +74,8 @@ public final class DefaultResourcePersister implements ResourcePersister {
     project.setEffectiveKey(project.getKey());
 
     ResourceModel model = findOrCreateModel(project);
-    model.setLanguageKey(project.getLanguageKey());// ugly, only for projects
+    // ugly, only for projects
+    model.setLanguageKey(project.getLanguageKey());
 
     // For views
     if (project instanceof ResourceCopy) {
@@ -162,7 +158,8 @@ public final class DefaultResourcePersister implements ResourcePersister {
   private Snapshot persistLibrary(Project project, Library library) {
     ResourceModel model = findOrCreateModel(library);
     model = session.save(model);
-    library.setId(model.getId()); // TODO to be removed
+    // TODO to be removed
+    library.setId(model.getId());
     library.setEffectiveKey(library.getKey());
 
     Snapshot snapshot = findLibrarySnapshot(model.getId(), library.getVersion());

diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/MeasurePersister.java b/sonar-batch/src/main/java/org/sonar/batch/index/MeasurePersister.java
index aadca4bbd7620ec5d64de1a6fdd24ca13431d411..50493b4c410c9a6d192e0a9569ec17cb6dfe0c85 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/index/MeasurePersister.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/index/MeasurePersister.java
@@ -130,7 +130,8 @@ public final class MeasurePersister {
 
   private MeasureModel model(Measure measure) {
     MeasureModel model = new MeasureModel();
-    model.setMetricId(measure.getMetric().getId()); // we assume that the index has updated the metric
+    // we assume that the index has updated the metric
+    model.setMetricId(measure.getMetric().getId());
     model.setDescription(measure.getDescription());
     model.setData(measure.getData());
     model.setAlertStatus(measure.getAlertStatus());

diff --git a/sonar-batch/src/main/java/org/sonar/batch/phases/UpdateStatusJob.java b/sonar-batch/src/main/java/org/sonar/batch/phases/UpdateStatusJob.java
index 02056e53899c1787641b8c9672ecb825cc7dc6bf..f25f92de517259f3a98be613800a46c9656d5545 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/phases/UpdateStatusJob.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/phases/UpdateStatusJob.java
@@ -33,13 +33,15 @@ import org.sonar.batch.bootstrap.ServerClient;
 import org.sonar.batch.index.ResourcePersister;
 
 import javax.persistence.Query;
+
 import java.util.List;
 
 public class UpdateStatusJob implements BatchComponent {
 
   private DatabaseSession session;
   private ServerClient server;
-  private Snapshot snapshot; // TODO remove this component
+  // TODO remove this component
+  private Snapshot snapshot;
   private ResourcePersister resourcePersister;
   private Settings settings;
   private Project project;

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/CountDistributionBuilder.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/CountDistributionBuilder.java
index bdca4449e656314ed59e3ab8ba59a36ac432b1ea..ad58da21ca72d9bea8611800eeea391c728eb356 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/CountDistributionBuilder.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/CountDistributionBuilder.java
@@ -64,7 +64,8 @@ public class CountDistributionBuilder implements MeasureBuilder {
 
     } else {
       if (this.countBag.add(value, count)) {
-        this.countBag.add(value, 1);//hack
+        //hack
+        this.countBag.add(value, 1);
       }
     }
     return this;
@@ -151,7 +152,8 @@ public class CountDistributionBuilder implements MeasureBuilder {
    */
   public Measure build(boolean allowEmptyData) {
     if (!isEmpty() || allowEmptyData) {
-      return new Measure(metric, KeyValueFormat.format(countBag, -1)); //-1 is a hack to include zero values
+      //-1 is a hack to include zero values
+      return new Measure(metric, KeyValueFormat.format(countBag, -1));
     }
     return null;
   }

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Measure.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Measure.java
index f8b135458ca9d57ec344a7a60904bf172c7e4ba6..c08ad37986755ab05891a4277e2bead612193dc3 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Measure.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Measure.java
@@ -43,7 +43,8 @@ public class Measure {
    */
   public static final int DEFAULT_PRECISION = 1;
 
-  private Long id; // for internal use
+  // for internal use
+  private Long id;
   protected String metricKey;
   protected Metric metric;
   protected Double value;

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/platform/ComponentContainer.java b/sonar-plugin-api/src/main/java/org/sonar/api/platform/ComponentContainer.java
index 860f297b0322330e705b77572d1e665843adfa68..4301fdcca16d6fcff7bd4aa07af750d4af62b511 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/platform/ComponentContainer.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/platform/ComponentContainer.java
@@ -40,7 +40,8 @@ import java.util.List;
  */
 public class ComponentContainer implements BatchComponent, ServerComponent {
 
-  ComponentContainer parent, child; // no need for multiple children
+  // no need for multiple children
+  ComponentContainer parent, child;
   MutablePicoContainer pico;
   PropertyDefinitions propertyDefinitions;
 

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/KeyValueFormat.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/KeyValueFormat.java
index 2a5a0c63640894a49cf78ad256d7ecefd406100d..a6c2a1c0c1b0e441e5b68f69d43bad5c5d493425 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/KeyValueFormat.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/KeyValueFormat.java
@@ -288,7 +288,8 @@ public final class KeyValueFormat {
    * @since 2.7
    */
   public static <K> Multiset<K> parseMultiset(String data, Converter<K> keyConverter) {
-    Multiset<K> multiset = LinkedHashMultiset.create();// to keep the same order
+    // to keep the same order
+    Multiset<K> multiset = LinkedHashMultiset.create();
     if (data != null) {
       String[] pairs = StringUtils.split(data, PAIR_SEPARATOR);
       for (String pair : pairs) {

diff --git a/sonar-server/src/main/java/org/sonar/server/charts/deprecated/BarChart.java b/sonar-server/src/main/java/org/sonar/server/charts/deprecated/BarChart.java
index bb26e1186d6c2ceab8e82f2bcbab8e3c2b413923..0fde182ad97b2c503ea8ed2fd5c9026bde564049 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/charts/deprecated/BarChart.java
+++ b/sonar-server/src/main/java/org/sonar/server/charts/deprecated/BarChart.java
@@ -67,7 +67,8 @@ public class BarChart extends BaseChartWeb implements DeprecatedChart {
   protected void configureCategoryPlot() {
     CategoryPlot plot = jfreechart.getCategoryPlot();
     plot.setNoDataMessage(DEFAULT_MESSAGE_NODATA);
-    plot.setInsets(RectangleInsets.ZERO_INSETS); // To remove inner space around chart
+    // To remove inner space around chart
+    plot.setInsets(RectangleInsets.ZERO_INSETS);
     plot.setDataset(dataset);
     plot.setDomainAxis(categoryAxis);
     plot.setRenderer(renderer);

diff --git a/sonar-server/src/main/java/org/sonar/server/charts/deprecated/CustomBarChart.java b/sonar-server/src/main/java/org/sonar/server/charts/deprecated/CustomBarChart.java
index 54e7ad29515301ac8a11e311a636255a7cf6af17..647ee03e3234d9c1c40287efdd279ba01d5b320a 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/charts/deprecated/CustomBarChart.java
+++ b/sonar-server/src/main/java/org/sonar/server/charts/deprecated/CustomBarChart.java
@@ -70,7 +70,8 @@ public class CustomBarChart extends BarChart {
   protected void configureCategoryPlot() {
     CategoryPlot plot = jfreechart.getCategoryPlot();
     plot.setNoDataMessage(DEFAULT_MESSAGE_NODATA);
-    plot.setInsets(RectangleInsets.ZERO_INSETS); // To remove inner space around chart
+    // To remove inner space around chart
+    plot.setInsets(RectangleInsets.ZERO_INSETS);
     plot.setDataset(dataset);
     plot.setDomainAxis(categoryAxis);
     plot.setRenderer(renderer);

diff --git a/sonar-server/src/main/java/org/sonar/server/configuration/MetricsBackup.java b/sonar-server/src/main/java/org/sonar/server/configuration/MetricsBackup.java
index 45e8e11e81b5f663a362d3b90028690910063924..922915cbcb9e09e67052784dc20909884058677d 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/configuration/MetricsBackup.java
+++ b/sonar-server/src/main/java/org/sonar/server/configuration/MetricsBackup.java
@@ -83,7 +83,8 @@ public class MetricsBackup implements Backupable {
 
       public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
         Metric unmarshalled = (Metric) builtIn.unmarshal(reader, context);
-        unmarshalled.setId(null); // See http://jira.codehaus.org/browse/SONAR-1819
+        // See http://jira.codehaus.org/browse/SONAR-1819
+        unmarshalled.setId(null);
         unmarshalled.setUserManaged(true);
         unmarshalled.setEnabled(true);
         return unmarshalled;

diff --git a/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesManager.java b/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesManager.java
index e16bd2e6d67fa913075841310378e017b8c841bd..2d3977ae4e7831eb0d8f5094a36a4e64d739f4fe 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesManager.java
+++ b/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesManager.java
@@ -323,7 +323,8 @@ public class ProfilesManager extends BaseDao {
       } else {
         oldActiveRule.setInheritance(ActiveRule.OVERRIDES);
         getSession().saveWithoutFlush(oldActiveRule);
-        return; // no need to change in children
+        // no need to change in children
+        return;
       }
     }
     ActiveRule newActiveRule = (ActiveRule) parentActiveRule.clone();
@@ -352,7 +353,8 @@ public class ProfilesManager extends BaseDao {
       } else {
         activeRule.setInheritance(null);
         getSession().saveWithoutFlush(activeRule);
-        return; // no need to change in children
+        // no need to change in children
+        return;
       }
 
       for (RulesProfile child : getChildren(profile)) {

diff --git a/sonar-server/src/main/java/org/sonar/server/platform/Platform.java b/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
index 554de95b5216c4474d78bbf6af6173b386359c1c..6b3b74d0f4dd82d5a07d55861dd05fe59bd2ea63 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
+++ b/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
@@ -101,9 +101,12 @@ import javax.servlet.ServletContext;
 public final class Platform {
 
   private static final Platform INSTANCE = new Platform();
-  private ComponentContainer rootContainer;// level 1 : only database connectors
-  private ComponentContainer coreContainer;// level 2 : level 1 + core components
-  private ComponentContainer servicesContainer;// level 3 : level 2 + plugin extensions + core components that depend on plugin extensions
+  // level 1 : only database connectors
+  private ComponentContainer rootContainer;
+  // level 2 : level 1 + core components
+  private ComponentContainer coreContainer;
+  // level 3 : level 2 + plugin extensions + core components that depend on plugin extensions
+  private ComponentContainer servicesContainer;
   private boolean connected = false;
   private boolean started = false;
 
@@ -221,7 +224,8 @@ public final class Platform {
     servicesContainer.addSingleton(UpdateCenterMatrixFactory.class);
     servicesContainer.addSingleton(PluginDownloader.class);
     servicesContainer.addSingleton(ServerIdGenerator.class);
-    servicesContainer.addSingleton(DefaultModelFinder.class); // depends on plugins
+    // depends on plugins
+    servicesContainer.addSingleton(DefaultModelFinder.class);
     servicesContainer.addSingleton(DefaultModelManager.class);
     servicesContainer.addSingleton(ChartFactory.class);
     servicesContainer.addSingleton(Languages.class);

diff --git a/sonar-server/src/main/java/org/sonar/server/platform/SonarHome.java b/sonar-server/src/main/java/org/sonar/server/platform/SonarHome.java
index 4d1b9de91bb5743ee92e02a27ebf9b2f4fac0e34..a830ccc758fac70d99a4f562d8f66c238b888b73 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/platform/SonarHome.java
+++ b/sonar-server/src/main/java/org/sonar/server/platform/SonarHome.java
@@ -83,7 +83,8 @@ final class SonarHome {
   private static Properties openWarProperties() {
     try {
       InputStream input = SonarHome.class.getResourceAsStream("/sonar-war.properties");
-      return ConfigurationUtils.readInputStream(input); // it closes the stream
+      // it closes the stream
+      return ConfigurationUtils.readInputStream(input);
     } catch (IOException e) {
       throw new IllegalStateException("Fail to load the file sonar-war.properties", e);
     }

diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/ClassLoaderUtils.java b/sonar-server/src/main/java/org/sonar/server/plugins/ClassLoaderUtils.java
index c85ae22fce65f42cb51d6afeea6442ba035aa5e4..66ef0e0a5e3c37692660f61eced00d1533ea14da 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/plugins/ClassLoaderUtils.java
+++ b/sonar-server/src/main/java/org/sonar/server/plugins/ClassLoaderUtils.java
@@ -27,6 +27,7 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nullable;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
@@ -112,7 +113,8 @@ public final class ClassLoaderUtils {
         if (StringUtils.substringAfterLast(rootPath, "/").indexOf('.') >= 0) {
           rootDirectory = StringUtils.substringBeforeLast(rootPath, "/");
         }
-        jarPath = root.getPath().substring(5, root.getPath().indexOf("!")); //strip out only the JAR file
+        //strip out only the JAR file
+        jarPath = root.getPath().substring(5, root.getPath().indexOf("!"));
         jar = new JarFile(URLDecoder.decode(jarPath, CharEncoding.UTF_8));
         Enumeration<JarEntry> entries = jar.entries();
         while (entries.hasMoreElements()) {

diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java b/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java
index f07a092d3f9c917f8ee5de036eb2cfc09668c43c..3ab9f56d37c95d606a57a6bc237077c7f4c92d91 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java
+++ b/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java
@@ -48,7 +48,8 @@ import java.util.Date;
         defaultValue = "true",
         name = "Enable Update Center",
         project = false,
-        global = false, // hidden from UI
+      // hidden from UI
+        global = false,
         category = "Update Center",
         type = PropertyType.BOOLEAN),
     @Property(
@@ -56,7 +57,8 @@ import java.util.Date;
         defaultValue = "http://update.sonarsource.org/update-center.properties",
         name = "Update Center URL",
         project = false,
-        global = false, // hidden from UI
+      // hidden from UI
+        global = false,
         category = "Update Center")
 })
 public class UpdateCenterClient implements ServerComponent {

diff --git a/sonar-squid/src/main/java/org/sonar/squid/text/LiteralValueHandler.java b/sonar-squid/src/main/java/org/sonar/squid/text/LiteralValueHandler.java
index 86d50b6642164caf8e52a5700db2b2eac7452125..44da56e117b2ed582d10c028deccf261614fc440 100644 (file)
--- a/sonar-squid/src/main/java/org/sonar/squid/text/LiteralValueHandler.java
+++ b/sonar-squid/src/main/java/org/sonar/squid/text/LiteralValueHandler.java
@@ -55,6 +55,7 @@ public class LiteralValueHandler extends LineContextHandler {
 
   @Override
   boolean matchWithEndOfLine(Line line, StringBuilder pendingLine) {
-    return true; //see http://jira.codehaus.org/browse/SONAR-1555
+    //see http://jira.codehaus.org/browse/SONAR-1555
+    return true;
   }
 }

diff --git a/sonar-squid/src/main/java/org/sonar/squid/text/StringArrayReader.java b/sonar-squid/src/main/java/org/sonar/squid/text/StringArrayReader.java
index 0fb92a49738a8ef1355455fc835cd82a8b69fdb7..c430fbaccfcd82c5ca1e029445e9f74244ad63e8 100644 (file)
--- a/sonar-squid/src/main/java/org/sonar/squid/text/StringArrayReader.java
+++ b/sonar-squid/src/main/java/org/sonar/squid/text/StringArrayReader.java
@@ -60,7 +60,8 @@ public class StringArrayReader extends Reader {
             content.append("\r\n");
             break;
           default:
-            throw new IllegalStateException(); // should never happen
+            // should never happen
+            throw new IllegalStateException();
         }
       }
     }