Fix quality flaws in API

28 files changed, 32 insertions, 74 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/Phase.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/Phase.java
index b1b1214d491..24a1b58e522 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/Phase.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/Phase.java
@@ -33,7 +33,7 @@ public @interface Phase {
 
   Name name();
 
-  public enum Name {
+  enum Name {
     PRE, DEFAULT, POST
   }
 }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/bootstrap/ProjectDefinition.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/bootstrap/ProjectDefinition.java
index 20874e5553d..afc120524a5 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/bootstrap/ProjectDefinition.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/bootstrap/ProjectDefinition.java
@@ -620,11 +620,8 @@ public class ProjectDefinition {
     }
     ProjectDefinition that = (ProjectDefinition) o;
     String key = getKey();
-    if (key != null ? !key.equals(that.getKey()) : that.getKey() != null) {
-      return false;
-    }
+    return !(key != null ? !key.equals(that.getKey()) : that.getKey() != null);
 
-    return true;
   }
 
   @Override
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/debt/DebtRemediationFunction.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/debt/DebtRemediationFunction.java
index 97fd9e0a591..f70f7c5c033 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/debt/DebtRemediationFunction.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/debt/DebtRemediationFunction.java
@@ -34,7 +34,7 @@ import javax.annotation.Nullable;
  */
 public class DebtRemediationFunction {
 
-  public static enum Type {
+  public enum Type {
     LINEAR, LINEAR_OFFSET, CONSTANT_ISSUE
   }
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/FileSystem.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/FileSystem.java
index bc240e5610b..64b80ea8b3c 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/FileSystem.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/FileSystem.java
@@ -153,7 +153,7 @@ public interface FileSystem extends BatchComponent {
   /**
    * Interface of the underlying file index.
    */
-  public static interface Index {
+  interface Index {
     Iterable<InputFile> inputFiles();
 
     @CheckForNull
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/AbsolutePathPredicate.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/AbsolutePathPredicate.java
index ab18e3c76ee..e947a9da6c3 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/AbsolutePathPredicate.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/AbsolutePathPredicate.java
@@ -51,7 +51,7 @@ class AbsolutePathPredicate extends AbstractFilePredicate {
   public Iterable<InputFile> get(Index index) {
     String relative = PathUtils.sanitize(new PathResolver().relativePath(baseDir.toFile(), new File(path)));
     if (relative == null) {
-      return Collections.<InputFile>emptyList();
+      return Collections.emptyList();
     }
     InputFile f = index.inputFile(relative);
     return f != null ? Arrays.asList(f) : Collections.<InputFile>emptyList();
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/FileMetadata.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/FileMetadata.java
index bb357542239..d6ef257afa8 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/FileMetadata.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/FileMetadata.java
@@ -316,7 +316,7 @@ public class FileMetadata implements BatchComponent {
     }
   }
 
-  public static interface LineHashConsumer {
+  public interface LineHashConsumer {
 
     void consume(int lineIdx, @Nullable byte[] hash);
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/PathPattern.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/PathPattern.java
index 93d865d1711..c1b53b68a40 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/PathPattern.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/PathPattern.java
@@ -66,7 +66,7 @@ public abstract class PathPattern {
     public boolean match(InputFile inputFile, boolean caseSensitiveFileExtension) {
       String path = inputFile.absolutePath();
       if (!caseSensitiveFileExtension) {
-        String extension = super.sanitizeExtension(FilenameUtils.getExtension(inputFile.file().getName()));
+        String extension = sanitizeExtension(FilenameUtils.getExtension(inputFile.file().getName()));
         if (StringUtils.isNotBlank(extension)) {
           path = StringUtils.removeEndIgnoreCase(path, extension);
           path = path + extension;
@@ -98,7 +98,7 @@ public abstract class PathPattern {
     public boolean match(InputFile inputFile, boolean caseSensitiveFileExtension) {
       String path = inputFile.relativePath();
       if (!caseSensitiveFileExtension) {
-        String extension = super.sanitizeExtension(FilenameUtils.getExtension(inputFile.file().getName()));
+        String extension = sanitizeExtension(FilenameUtils.getExtension(inputFile.file().getName()));
         if (StringUtils.isNotBlank(extension)) {
           path = StringUtils.removeEndIgnoreCase(path, extension);
           path = path + extension;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/scm/BlameCommand.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/scm/BlameCommand.java
index afb0d28662b..b6e16d48bc7 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/scm/BlameCommand.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/scm/BlameCommand.java
@@ -44,7 +44,7 @@ public abstract class BlameCommand implements BatchComponent {
   /**
    * Callback for the provider to report results of blame per file.
    */
-  public static interface BlameInput {
+  public interface BlameInput {
 
     /**
      * Filesystem of the current (sub )project.
@@ -61,7 +61,7 @@ public abstract class BlameCommand implements BatchComponent {
   /**
    * Callback for the provider to report results of blame per file.
    */
-  public static interface BlameOutput {
+  public interface BlameOutput {
 
     /**
      * Add result of the blame command for a single file. Number of lines should
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/dependency/internal/DefaultDependency.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/dependency/internal/DefaultDependency.java
index 56161c29646..59b2eb350b5 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/dependency/internal/DefaultDependency.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/dependency/internal/DefaultDependency.java
@@ -72,7 +72,7 @@ public class DefaultDependency extends DefaultStorable implements Dependency, Ne
     Preconditions.checkState(!this.fromKey.equals(this.toKey), "From and To can't be the same inputFile");
     Preconditions.checkNotNull(this.fromKey, "From inputFile can't be null");
     Preconditions.checkNotNull(this.toKey, "To inputFile can't be null");
-    storage.store((Dependency) this);
+    storage.store(this);
   }
 
   @Override
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/duplication/Duplication.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/duplication/Duplication.java
index e449063b7b0..e445d5ce498 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/duplication/Duplication.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/duplication/Duplication.java
@@ -39,7 +39,7 @@ import java.util.List;
 @Beta
 public interface Duplication {
 
-  public static class Block {
+  class Block {
     private final String resourceKey;
     private final int startLine;
     private final int length;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/Issue.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/Issue.java
index e6456ec8803..e235b33abb4 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/Issue.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/issue/Issue.java
@@ -34,12 +34,12 @@ import javax.annotation.CheckForNull;
 @Beta
 public interface Issue {
 
-  public enum Severity {
+  enum Severity {
     INFO,
     MINOR,
     MAJOR,
     CRITICAL,
-    BLOCKER;
+    BLOCKER
   }
 
   /**
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/action/Action.java b/sonar-plugin-api/src/main/java/org/sonar/api/issue/action/Action.java
index 071739d9060..b7d967aa35d 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/issue/action/Action.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/issue/action/Action.java
@@ -87,10 +87,7 @@ public class Action {
       return false;
     }
     Action that = (Action) o;
-    if (!key.equals(that.key)) {
-      return false;
-    }
-    return true;
+    return key.equals(that.key);
   }
 
   @Override
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/internal/DefaultIssue.java b/sonar-plugin-api/src/main/java/org/sonar/api/issue/internal/DefaultIssue.java
index 05d5d0fc5bd..d2827256243 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/issue/internal/DefaultIssue.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/issue/internal/DefaultIssue.java
@@ -559,10 +559,7 @@ public class DefaultIssue implements Issue {
       return false;
     }
     DefaultIssue that = (DefaultIssue) o;
-    if (key != null ? !key.equals(that.key) : that.key != null) {
-      return false;
-    }
-    return true;
+    return !(key != null ? !key.equals(that.key) : that.key != null);
   }
 
   @Override
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 1901863576a..0cd77c10ddf 100644
--- 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
@@ -736,10 +736,7 @@ public class Measure<G extends Serializable> implements Serializable {
     if (characteristic != null ? !characteristic.equals(measure.characteristic) : measure.characteristic != null) {
       return false;
     }
-    if (personId != null ? !personId.equals(measure.personId) : measure.personId != null) {
-      return false;
-    }
-    return true;
+    return !(personId != null ? !personId.equals(measure.personId) : measure.personId != null);
   }
 
   @Override
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/profiles/ProfileExporter.java b/sonar-plugin-api/src/main/java/org/sonar/api/profiles/ProfileExporter.java
index c4ea3e9b568..f8ca5084ae5 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/profiles/ProfileExporter.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/profiles/ProfileExporter.java
@@ -94,10 +94,7 @@ public abstract class ProfileExporter implements BatchExtension, ServerExtension
       return false;
     }
     ProfileExporter that = (ProfileExporter) o;
-    if (key != null ? !key.equals(that.key) : that.key != null) {
-      return false;
-    }
-    return true;
+    return !(key != null ? !key.equals(that.key) : that.key != null);
   }
 
   @Override
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/profiles/ProfileImporter.java b/sonar-plugin-api/src/main/java/org/sonar/api/profiles/ProfileImporter.java
index 0f34fa46709..a468e2a9acc 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/profiles/ProfileImporter.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/profiles/ProfileImporter.java
@@ -81,10 +81,7 @@ public abstract class ProfileImporter implements ServerExtension {
       return false;
     }
     ProfileImporter that = (ProfileImporter) o;
-    if (importerKey != null ? !importerKey.equals(that.importerKey) : that.importerKey != null) {
-      return false;
-    }
-    return true;
+    return !(importerKey != null ? !importerKey.equals(that.importerKey) : that.importerKey != null);
   }
 
   @Override
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/rule/RuleKey.java b/sonar-plugin-api/src/main/java/org/sonar/api/rule/RuleKey.java
index 9d316d5a250..e62752f3b72 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/rule/RuleKey.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/rule/RuleKey.java
@@ -90,10 +90,7 @@ public class RuleKey implements Serializable {
     if (!repository.equals(ruleKey.repository)) {
       return false;
     }
-    if (!rule.equals(ruleKey.rule)) {
-      return false;
-    }
-    return true;
+    return rule.equals(ruleKey.rule);
   }
 
   @Override
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRule.java b/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRule.java
index db4653f8a1a..493267a4b91 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRule.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRule.java
@@ -268,11 +268,8 @@ public class ActiveRule implements Cloneable {
     if (!rule.equals(that.rule)) {
       return false;
     }
-    if (rulesProfile != null ? !rulesProfile.equals(that.rulesProfile) : that.rulesProfile != null) {
-      return false;
-    }
+    return !(rulesProfile != null ? !rulesProfile.equals(that.rulesProfile) : that.rulesProfile != null);
 
-    return true;
   }
 
   @Override
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/FileSystemFilter.java b/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/FileSystemFilter.java
index f80cad292c7..7665b406f1b 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/FileSystemFilter.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/FileSystemFilter.java
@@ -40,7 +40,7 @@ public interface FileSystemFilter extends BatchExtension {
   /**
    * Plugins must not implement this interface. It is provided at runtime.
    */
-  public interface Context {
+  interface Context {
     ModuleFileSystem fileSystem();
 
     FileType type();
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/debt/DebtCharacteristic.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/debt/DebtCharacteristic.java
index 205dca4af46..32b9af374b8 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/server/debt/DebtCharacteristic.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/debt/DebtCharacteristic.java
@@ -30,7 +30,7 @@ public interface DebtCharacteristic {
   /**
    * Only used when a characteristic is disabled (id is -1 in dto) by the user. see {@link org.sonar.server.rule.index.RuleNormalizer}
    */
-  static String NONE = "NONE";
+  String NONE = "NONE";
 
   String key();
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/debt/DebtRemediationFunction.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/debt/DebtRemediationFunction.java
index fdb10ce1a6a..d8f6456e9f2 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/server/debt/DebtRemediationFunction.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/debt/DebtRemediationFunction.java
@@ -42,7 +42,7 @@ import javax.annotation.CheckForNull;
  */
 public interface DebtRemediationFunction {
 
-  static enum Type {
+  enum Type {
     LINEAR, LINEAR_OFFSET, CONSTANT_ISSUE
   }
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskDefinition.java b/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskDefinition.java
index fa8fd07f79b..858c37b725d 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskDefinition.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskDefinition.java
@@ -75,10 +75,7 @@ public class TaskDefinition implements TaskExtension, Comparable<TaskDefinition>
     }
 
     TaskDefinition that = (TaskDefinition) o;
-    if (!key.equals(that.key)) {
-      return false;
-    }
-    return true;
+    return key.equals(that.key);
   }
 
   @Override
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/batch/internal/DefaultRequirement.java b/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/batch/internal/DefaultRequirement.java
index 8d0a49c5a56..26e5c74f180 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/batch/internal/DefaultRequirement.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/batch/internal/DefaultRequirement.java
@@ -248,11 +248,8 @@ public class DefaultRequirement implements Requirement {
     if (!characteristic.equals(that.characteristic)) {
       return false;
     }
-    if (!ruleKey.equals(that.ruleKey)) {
-      return false;
-    }
+    return ruleKey.equals(that.ruleKey);
 
-    return true;
   }
 
   @Override
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/server/internal/DefaultCharacteristic.java b/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/server/internal/DefaultCharacteristic.java
index de351f51a51..bdda2b6a865 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/server/internal/DefaultCharacteristic.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/technicaldebt/server/internal/DefaultCharacteristic.java
@@ -331,11 +331,8 @@ public class DefaultCharacteristic implements Characteristic {
     if (key != null ? !key.equals(that.key) : that.key != null) {
       return false;
     }
-    if (ruleKey != null ? !ruleKey.equals(that.ruleKey) : that.ruleKey != null) {
-      return false;
-    }
+    return !(ruleKey != null ? !ruleKey.equals(that.ruleKey) : that.ruleKey != null);
 
-    return true;
   }
 
   @Override
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/Duration.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/Duration.java
index d542a667eda..d008af88621 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/Duration.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/Duration.java
@@ -176,11 +176,8 @@ public class Duration implements Serializable {
     }
 
     Duration that = (Duration) o;
-    if (durationInMinutes != that.durationInMinutes) {
-      return false;
-    }
+    return durationInMinutes == that.durationInMinutes;
 
-    return true;
   }
 
   @Override
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/WorkUnit.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/WorkUnit.java
index 3f782ff51f0..22df70c5016 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/WorkUnit.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/WorkUnit.java
@@ -88,11 +88,8 @@ public final class WorkUnit implements Serializable {
     if (Double.compare(workUnit.value, value) != 0) {
       return false;
     }
-    if (!unit.equals(workUnit.unit)) {
-      return false;
-    }
+    return unit.equals(workUnit.unit);
 
-    return true;
   }
 
   @Override
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/WorkDuration.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/WorkDuration.java
index 73657269f17..7f4e946686c 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/WorkDuration.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/internal/WorkDuration.java
@@ -37,7 +37,7 @@ public class WorkDuration implements Serializable {
   static final int HOUR_POSITION_IN_LONG = 100;
   static final int MINUTE_POSITION_IN_LONG = 1;
 
-  public static enum UNIT {
+  public enum UNIT {
     DAYS, HOURS, MINUTES
   }
 
@@ -181,11 +181,8 @@ public class WorkDuration implements Serializable {
     }
 
     WorkDuration that = (WorkDuration) o;
-    if (durationInMinutes != that.durationInMinutes) {
-      return false;
-    }
+    return durationInMinutes == that.durationInMinutes;
 
-    return true;
   }
 
   @Override
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/violations/ViolationQuery.java b/sonar-plugin-api/src/main/java/org/sonar/api/violations/ViolationQuery.java
index 224fde2667f..5f40106efc1 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/violations/ViolationQuery.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/violations/ViolationQuery.java
@@ -30,7 +30,7 @@ import org.sonar.api.resources.Resource;
 @Deprecated
 public final class ViolationQuery {
 
-  public static enum SwitchMode {
+  public enum SwitchMode {
     OFF, ON, BOTH
   }