Fix quality flaws

server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedFileSourcesBinaryData.java

@@ -36,8 +36,8 @@
 import org.sonar.server.db.migrations.SqlStatement;
 import org.sonar.server.source.db.FileSourceDb;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
 import java.sql.SQLException;
 import java.util.Iterator;
 
@@ -154,9 +154,9 @@ private byte[] toBinary(Long fileSourceId, @Nullable String data) {
   }
 
   private static Iterable<Integer> splitIntegers(String s) {
-    return Iterables.transform(Splitter.on(',').split(s), new Function<String, Integer>() {
+    return Iterables.transform(Splitter.on(',').omitEmptyStrings().trimResults().split(s), new Function<String, Integer>() {
       @Override
-      public Integer apply(String input) {
+      public Integer apply(@Nonnull String input) {
         return Integer.parseInt(input);
       }
     });

server/sonar-server/src/test/java/org/sonar/server/component/DefaultRubyComponentServiceTest.java

@@ -57,7 +57,7 @@ public void before() {
 
   @Test
   public void find_by_key() {
-    Component<?> component = mock(Component.class);
+    Component component = mock(Component.class);
     when(resourceDao.findByKey("struts")).thenReturn(component);
 
     assertThat(service.findByKey("struts")).isEqualTo(component);

sonar-core/src/main/java/org/sonar/core/plugins/PluginClassloaders.java

@@ -240,7 +240,7 @@ private boolean isResource(File file) {
   }
 
   public void clean() {
-    for (ClassRealm realm : (Collection<ClassRealm>) world.getRealms()) {
+    for (ClassRealm realm : world.getRealms()) {
       try {
         world.disposeRealm(realm.getId());
       } catch (Exception e) {

sonar-core/src/main/java/org/sonar/core/rule/CacheRuleFinder.java

@@ -90,7 +90,7 @@ private void hibernateHack(Rule rule) {
     Hibernate.initialize(rule.getParams());
   }
 
-  protected final Rule doFindById(int ruleId) {
+  private Rule doFindById(int ruleId) {
     DatabaseSession session = sessionFactory.getSession();
     return session.getSingleResult(
       session.createQuery("FROM " + Rule.class.getSimpleName() + " r WHERE r.id=:id and r.status<>:status")

sonar-core/src/test/java/org/sonar/core/resource/ResourceDaoTest.java

@@ -345,7 +345,7 @@ public void should_find_component_by_key() {
     setupData("fixture");
 
     assertThat(dao.findByKey("org.struts:struts")).isNotNull();
-    Component<?> component = dao.findByKey("org.struts:struts-core:src/org/struts/RequestContext.java");
+    Component component = dao.findByKey("org.struts:struts-core:src/org/struts/RequestContext.java");
     assertThat(component).isNotNull();
     assertThat(component.path()).isEqualTo("src/org/struts/RequestContext.java");
     assertThat(dao.findByKey("unknown")).isNull();

sonar-deprecated/src/main/java/org/sonar/api/checks/AnnotationCheckFactory.java

@@ -67,7 +67,7 @@ private void groupByKey(Collection checks) {
   }
 
   @Override
-  protected Object createCheck(ActiveRule activeRule) {
+  public Object createCheck(ActiveRule activeRule) {
     Object object = checksByKey.get(activeRule.getConfigKey());
     if (object != null) {
       return instantiate(activeRule, object);

sonar-duplications/src/main/java/net/sourceforge/pmd/cpd/Tokens.java

@@ -34,22 +34,22 @@
  */
 public class Tokens {
 
-  private List<TokenEntry> tokens = new ArrayList<TokenEntry>();
+  private List<TokenEntry> entries = new ArrayList<>();
 
   public void add(TokenEntry tokenEntry) {
-    this.tokens.add(tokenEntry);
+    this.entries.add(tokenEntry);
   }
 
   public Iterator<TokenEntry> iterator() {
-    return tokens.iterator();
+    return entries.iterator();
   }
 
   public int size() {
-    return tokens.size();
+    return entries.size();
   }
 
   public List<TokenEntry> getTokens() {
-    return tokens;
+    return entries;
   }
 
 }

sonar-plugin-api/src/main/java/org/sonar/api/batch/ProjectClasspath.java

@@ -80,7 +80,7 @@ protected List<File> createElements() {
     try {
       List<File> files = Lists.newArrayList();
       if (pom.getCompileClasspathElements() != null) {
-        for (String classPathString : (List<String>) pom.getCompileClasspathElements()) {
+        for (String classPathString : pom.getCompileClasspathElements()) {
           files.add(new File(classPathString));
         }
       }

sonar-plugin-api/src/main/java/org/sonar/api/component/Component.java

@@ -21,7 +21,7 @@
 
 import javax.annotation.CheckForNull;
 
-public interface Component<C extends Component> {
+public interface Component {
   String key();
 
   /**

sonar-plugin-api/src/main/java/org/sonar/api/component/Module.java

@@ -19,7 +19,7 @@
  */
 package org.sonar.api.component;
 
-public interface Module extends Component<Module> {
+public interface Module extends Component {
   String getDescription();
 
   String getBranch();

sonar-plugin-api/src/main/java/org/sonar/api/component/Perspective.java

@@ -19,6 +19,6 @@
  */
 package org.sonar.api.component;
 
-public interface Perspective<C extends Component<C>> {
+public interface Perspective<C extends Component> {
   C component();
 }

sonar-plugin-api/src/main/java/org/sonar/api/component/SourceFile.java

@@ -19,5 +19,5 @@
  */
 package org.sonar.api.component;
 
-public interface SourceFile extends Component<SourceFile> {
+public interface SourceFile extends Component {
 }

sonar-plugin-api/src/main/java/org/sonar/api/profiles/RulesProfile.java

@@ -133,7 +133,7 @@ public RulesProfile setVersion(int version) {
   }
 
   /**
-   * @deprecated profile versioning is dropped in 4.4. Always returns -1.
+   * @deprecated profile versioning is dropped in 4.4. Always returns null.
    */
   @CheckForNull
   @Deprecated