Fix some quality flaws

diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/DefaultIndex.java b/sonar-batch/src/main/java/org/sonar/batch/index/DefaultIndex.java
index 8ef04f07abc44266345f324eb6aa50bd83c8c6c8..9624513e288a71e0d23d4eeb968e5cb9e458fd36 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/index/DefaultIndex.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/index/DefaultIndex.java
@@ -561,16 +561,6 @@ public class DefaultIndex extends SonarIndex {
     return bucket;
   }
 
-  private Bucket checkIndexed(@Nullable Resource resource) {
-    Bucket bucket = getBucket(resource);
-    if (bucket == null) {
-      if (Scopes.isDirectory(resource) || Scopes.isFile(resource)) {
-        bucket = doIndex(resource);
-      }
-    }
-    return bucket;
-  }
-
   @Override
   public boolean isExcluded(@Nullable Resource reference) {
     return false;
@@ -586,9 +576,6 @@ public class DefaultIndex extends SonarIndex {
    * 1) key = new key and deprecatedKey = old key : this is the standard use case in a perfect world
    * 2) key = null and deprecatedKey = oldKey : this is for plugins that are using deprecated constructors of
    * {@link File} and {@link Directory}
-   *
-   * @param reference
-   * @return
    */
   private Bucket getBucket(@Nullable Resource reference) {
     if (reference == null) {

diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java b/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java
index e320369efdfe315e4d2b8285e92ff5e749ebe617..b899b08df8d4935ab58a907431584060516a7f8b 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java
@@ -419,7 +419,6 @@ public class RegisterRules implements Startable {
       if (ruleDto.getParentId() != null) {
         RuleDto parent = buffer.rulesById.get(ruleDto.getParentId());
         if (parent != null && !Rule.STATUS_REMOVED.equals(parent.getStatus())) {
-          // TODO merge params and tags ?
           ruleDto.setLanguage(parent.getLanguage());
           ruleDto.setStatus(parent.getStatus());
           ruleDto.setDefaultSubCharacteristicId(parent.getDefaultSubCharacteristicId());
@@ -433,8 +432,7 @@ public class RegisterRules implements Startable {
         }
       }
       if (toBeRemoved && !Rule.STATUS_REMOVED.equals(ruleDto.getStatus())) {
-        // TODO log repository key
-        LOG.info("Disable rule " + ruleDto.getRuleKey());
+        LOG.info(String.format("Disable rule %s:%s", ruleDto.getRepositoryKey(), ruleDto.getRuleKey()));
         ruleDto.setStatus(Rule.STATUS_REMOVED);
         ruleDto.setUpdatedAt(buffer.now());
         for (RuleRuleTagDto removed : buffer.tagsByRuleId.removeAll(ruleDto.getId())) {