SONAR-3055 API: remove the attribute "classes" of the annotations @DependsUpon and @DependedUpon

5 files changed, 3 insertions, 26 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/BatchExtensionDictionnary.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/BatchExtensionDictionnary.java
index e7b62cf8dde..fb37437ff93 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/BatchExtensionDictionnary.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/BatchExtensionDictionnary.java
@@ -179,10 +179,9 @@ public class BatchExtensionDictionnary {
     if (annotation != null) {
       if (annotation.annotationType().isAssignableFrom(DependsUpon.class)) {
         results.addAll(Arrays.asList(((DependsUpon) annotation).value()));
-        results.addAll(Arrays.asList(((DependsUpon) annotation).classes()));
+
       } else if (annotation.annotationType().isAssignableFrom(DependedUpon.class)) {
         results.addAll(Arrays.asList(((DependedUpon) annotation).value()));
-        results.addAll(Arrays.asList(((DependedUpon) annotation).classes()));
       }
     }
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/DependedUpon.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/DependedUpon.java
index f02d8e213ce..2de2e692f0e 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/DependedUpon.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/DependedUpon.java
@@ -37,9 +37,4 @@ public @interface DependedUpon {
    */
   String[] value() default {};
 
-  /**
-   * Used only on classes. Must be keep empty on methods.
-   */
-  Class[] classes() default {};
-
 }
\ No newline at end of file
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/DependsUpon.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/DependsUpon.java
index f6e4a3c00e0..0a277a4464a 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/DependsUpon.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/DependsUpon.java
@@ -35,10 +35,4 @@ public @interface DependsUpon {
    * Used only on classes. Must be keep empty on methods.
    */
   String[] value() default {};
-
-  /**
-   * Used only on classes. Must be keep empty on methods.
-   */
-  Class[] classes() default {};
-
 }
\ No newline at end of file
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/checks/NoSonarFilter.java b/sonar-plugin-api/src/main/java/org/sonar/api/checks/NoSonarFilter.java
index df4f8f0840c..02287e7b3a3 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/checks/NoSonarFilter.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/checks/NoSonarFilter.java
@@ -19,11 +19,11 @@
  */
 package org.sonar.api.checks;
 
+import com.google.common.collect.Maps;
 import org.sonar.api.resources.Resource;
 import org.sonar.api.rules.Violation;
 import org.sonar.api.rules.ViolationFilter;
 
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
@@ -32,7 +32,7 @@ import java.util.Set;
  */
 public class NoSonarFilter implements ViolationFilter {
 
-  private final Map<Resource, Set<Integer>> noSonarLinesByResource = new HashMap<Resource, Set<Integer>>();
+  private final Map<Resource, Set<Integer>> noSonarLinesByResource = Maps.newHashMap();
 
   public void addResource(Resource resource, Set<Integer> noSonarLines) {
     if (resource != null && noSonarLines != null) {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/dag/CyclicDependenciesException.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/dag/CyclicDependenciesException.java
index c8967512a1c..5370f05773c 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/dag/CyclicDependenciesException.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/dag/CyclicDependenciesException.java
@@ -25,19 +25,8 @@ import org.sonar.api.utils.SonarException;
  * @since 1.10
  */
 public class CyclicDependenciesException extends SonarException {
-  public CyclicDependenciesException() {
-  }
-
   public CyclicDependenciesException(String s) {
     super(s);
   }
-
-  public CyclicDependenciesException(String s, Throwable throwable) {
-    super(s, throwable);
-  }
-
-  public CyclicDependenciesException(Throwable throwable) {
-    super(throwable);
-  }
 }