Fix 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 a28d70324106613b752362e4ae3cb3a3f96e0514..f4bd42b57f5702de40338b138c68f2dd605044ab 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
@@ -21,7 +21,7 @@ package org.sonar.process;
 
 public class Lifecycle {
 
-  public static enum State {
+  public enum State {
     INIT, STARTING, STARTED, STOPPING, STOPPED
   }
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/activity/Activity.java b/server/sonar-server/src/main/java/org/sonar/server/activity/Activity.java
index ff9a5a2d1452c0ffd54db44c1810ae4611e8eabb..b7a3ad0d96e958224208332ffbba81311fcab66e 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/activity/Activity.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/activity/Activity.java
@@ -27,7 +27,7 @@ import java.util.Map;
 
 public class Activity {
 
-  public static enum Type {
+  public enum Type {
     QPROFILE, SERVER, ANALYSIS_REPORT
   }
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/InternalPermissionService.java b/server/sonar-server/src/main/java/org/sonar/server/permission/InternalPermissionService.java
index f28de356546a49761116ad38458353f8334ef6aa..98511305b2c4820ec133cdf2656742bed5f91da3 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/InternalPermissionService.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/permission/InternalPermissionService.java
@@ -47,7 +47,7 @@ import java.util.Map;
  */
 public class InternalPermissionService implements ServerComponent {
 
-  private static enum Operation {
+  private enum Operation {
     ADD, REMOVE
   }
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRuleChange.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRuleChange.java
index ae29ee90da52cdcbd8d4ac62eaa6eae6b1d9cc55..8ad045dc6fbdf2e3a7284851052685bbad35e79d 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRuleChange.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRuleChange.java
@@ -32,7 +32,7 @@ import java.util.Map;
 
 public class ActiveRuleChange {
 
-  public static enum Type {
+  public enum Type {
     ACTIVATED, DEACTIVATED, UPDATED
   }
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java
index 7fa9841aad6c63cb520d58d50c63ccd676339cc5..48a9813f9401135bae0dd7d43a48ac9f996eebec 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java
@@ -68,8 +68,6 @@ public class SearchAction extends SearchRequestHandler<RuleQuery, Rule> implemen
   public static final String PARAM_ACTIVE_SEVERITIES = "active_severities";
   public static final String PARAM_IS_TEMPLATE = "is_template";
   public static final String PARAM_TEMPLATE_KEY = "template_key";
-  public static final String PARAM_FACETS = "facets";
-
   public static final String SEARCH_ACTION = "search";
 
   private static final Collection<String> DEFAULT_FACETS = ImmutableSet.of(PARAM_LANGUAGES, PARAM_REPOSITORIES, "tags");

diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/IndexField.java b/server/sonar-server/src/main/java/org/sonar/server/search/IndexField.java
index ef171748b3a1bbd163e178f578767e9ecbac9a76..6c378e17e76f4e761ce2a98d1a089a69d6e17f21 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/search/IndexField.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/search/IndexField.java
@@ -27,7 +27,7 @@ import java.util.Collections;
 
 public class IndexField {
 
-  public static enum Type {
+  public enum Type {
     STRING, TEXT, DATE, BOOLEAN, INTEGER, LONG, DOUBLE, OBJECT, UUID_PATH
   }
 

diff --git a/server/sonar-ws-client/src/main/java/org/sonar/wsclient/services/Server.java b/server/sonar-ws-client/src/main/java/org/sonar/wsclient/services/Server.java
index ac3304fc69deec9e6db741a5013c1000deea3207..3748ab1e0d3581c8712aaf723dcf925ec48bb261 100644 (file)
--- a/server/sonar-ws-client/src/main/java/org/sonar/wsclient/services/Server.java
+++ b/server/sonar-ws-client/src/main/java/org/sonar/wsclient/services/Server.java
@@ -27,7 +27,7 @@ import javax.annotation.Nullable;
  */
 public class Server extends Model {
 
-  public static enum Status {
+  public enum Status {
     SETUP,
     UP,
     DOWN,

diff --git a/sonar-application/src/main/java/org/sonar/application/JdbcSettings.java b/sonar-application/src/main/java/org/sonar/application/JdbcSettings.java
index ea867c74b6a946831176add0308061c418052837..d9f35910a2c92f1909c88e45878ca957b57a640c 100644 (file)
--- a/sonar-application/src/main/java/org/sonar/application/JdbcSettings.java
+++ b/sonar-application/src/main/java/org/sonar/application/JdbcSettings.java
@@ -34,7 +34,7 @@ import java.util.regex.Pattern;
 
 public class JdbcSettings {
 
-  static enum Provider {
+  enum Provider {
     H2("lib/jdbc/h2"), JTDS("lib/jdbc/jtds"), MYSQL("lib/jdbc/mysql"), ORACLE("extensions/jdbc-driver/oracle"),
     POSTGRESQL("lib/jdbc/postgresql");
 

diff --git a/sonar-core/src/main/java/org/sonar/core/graph/graphson/ElementPropertyConfig.java b/sonar-core/src/main/java/org/sonar/core/graph/graphson/ElementPropertyConfig.java
index 9f6fc8f097a37d7cc105afe67ef934924a374b9d..7dfc3ea00491c9a9340f081ca0b2afc5defb78e0 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/graph/graphson/ElementPropertyConfig.java
+++ b/sonar-core/src/main/java/org/sonar/core/graph/graphson/ElementPropertyConfig.java
@@ -28,7 +28,7 @@ import java.util.Set;
  */
 class ElementPropertyConfig {
 
-  static enum ElementPropertiesRule {
+  enum ElementPropertiesRule {
     INCLUDE, EXCLUDE
   }
 

diff --git a/sonar-duplications/src/main/java/org/sonar/duplications/detector/original/BlocksGroup.java b/sonar-duplications/src/main/java/org/sonar/duplications/detector/original/BlocksGroup.java
index 6cdd4c0cbcfad69c30b89ed8cee60fa337de186d..063d98891acb585be4336f0cca6c94b9b4c553b5 100644 (file)
--- a/sonar-duplications/src/main/java/org/sonar/duplications/detector/original/BlocksGroup.java
+++ b/sonar-duplications/src/main/java/org/sonar/duplications/detector/original/BlocksGroup.java
@@ -148,9 +148,7 @@ final class BlocksGroup {
         j++;
         continue;
       }
-      if (c == 0) {
-        c = block1.getIndexInFile() - indexCorrection - block2.getIndexInFile();
-      }
+      c = block1.getIndexInFile() - indexCorrection - block2.getIndexInFile();
       if (c < 0) {
         // list1[i] < list2[j]
         break;

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/database/model/MeasureModel.java b/sonar-plugin-api/src/main/java/org/sonar/api/database/model/MeasureModel.java
index 7725d50ce493b44497602168cee1b901cd329d4d..8346966c5e46af10c834716a5c4a12880c7d0ccb 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/database/model/MeasureModel.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/database/model/MeasureModel.java
@@ -211,6 +211,7 @@ public class MeasureModel implements Cloneable {
    * @return null
    */
   @CheckForNull
+  @Deprecated
   public Integer getTendency() {
     return null;
   }
@@ -219,6 +220,7 @@ public class MeasureModel implements Cloneable {
    * Concept of measure trend is dropped. This method does nothing.
    * @deprecated since 5.2. See https://jira.codehaus.org/browse/SONAR-6392
    */
+  @Deprecated
   public MeasureModel setTendency(Integer tendency) {
     return this;
   }

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 260efe3be5537c276e2942d72601d86f25baa851..0d041a258908c3c4cea2f177d798d26610fb6981 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
@@ -452,6 +452,7 @@ public class Measure<G extends Serializable> implements Serializable {
    * @deprecated since 5.2. See https://jira.codehaus.org/browse/SONAR-6392
    * @return the measure object instance
    */
+  @Deprecated
   public Measure setTendency(@Nullable Integer tendency) {
     return this;
   }