Remove some classes of org.sonar.check that are deprecated since 2.3

diff --git a/sonar-check-api/src/main/java/org/sonar/check/AnnotationIntrospector.java b/sonar-check-api/src/main/java/org/sonar/check/AnnotationIntrospector.java
deleted file mode 100644 (file)
index 6a45f8e..0000000
--- a/sonar-check-api/src/main/java/org/sonar/check/AnnotationIntrospector.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Sonar, open source software quality management tool.
- * Copyright (C) 2008-2012 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * Sonar is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * Sonar is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Sonar; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
- */
-package org.sonar.check;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @since 2.1 (experimental)
- * @deprecated since 2.3
- */
-@Deprecated
-public final class AnnotationIntrospector {
-
-  private AnnotationIntrospector() {
-    // only static methods
-  }
-
-  public static String getCheckKey(Class annotatedClass) {
-    Check checkAnnotation = getCheckAnnotation(annotatedClass);
-    if (checkAnnotation == null) {
-      return null;
-    }
-
-    String key = checkAnnotation.key();
-    if (key == null || "".equals(key.trim())) {
-      key = annotatedClass.getCanonicalName();
-    }
-    return key;
-  }
-
-  public static Check getCheckAnnotation(Class annotatedClass) {
-    return (Check) annotatedClass.getAnnotation(Check.class);
-  }
-
-  public static List<Field> getPropertyFields(Class annotatedClass) {
-    List<Field> fields = new ArrayList<Field>();
-    for (Field field : annotatedClass.getDeclaredFields()) {
-      org.sonar.check.CheckProperty propertyAnnotation = field.getAnnotation(org.sonar.check.CheckProperty.class);
-      if (propertyAnnotation != null) {
-        fields.add(field);
-      }
-    }
-    return fields;
-  }
-
-  public static String getPropertyFieldKey(Field field) {
-    String key = null;
-    org.sonar.check.CheckProperty propertyAnnotation = field.getAnnotation(org.sonar.check.CheckProperty.class);
-    if (propertyAnnotation != null) {
-      key = propertyAnnotation.key();
-      if (key == null || "".equals(key)) {
-        key = field.getName();
-      }
-    }
-    return key;
-  }
-}

diff --git a/sonar-check-api/src/main/java/org/sonar/check/BelongsToProfiles.java b/sonar-check-api/src/main/java/org/sonar/check/BelongsToProfiles.java
deleted file mode 100644 (file)
index 05826ae..0000000
--- a/sonar-check-api/src/main/java/org/sonar/check/BelongsToProfiles.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Sonar, open source software quality management tool.
- * Copyright (C) 2008-2012 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * Sonar is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * Sonar is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Sonar; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
- */
-package org.sonar.check;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * @since 2.1 (experimental)
- * @deprecated since 2.3. Not supported anymore
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-@Deprecated
-public @interface BelongsToProfiles {
-
-  BelongsToProfile[] value() default {};
-  
-}

diff --git a/sonar-check-api/src/test/java/org/sonar/check/AnnotationIntrospectorTest.java b/sonar-check-api/src/test/java/org/sonar/check/AnnotationIntrospectorTest.java
index a10a0c8a1a98bd667101ad9c563cc85282917c05..3bf47118a8d4907d9d41d80df3544e266af61b6f 100644 (file)
--- a/sonar-check-api/src/test/java/org/sonar/check/AnnotationIntrospectorTest.java
+++ b/sonar-check-api/src/test/java/org/sonar/check/AnnotationIntrospectorTest.java
@@ -27,43 +27,6 @@ import java.util.List;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.*;
 
-public class AnnotationIntrospectorTest {
-
-  @Test
-  public void defaultCheckKeyIsClassname() {
-    assertThat(AnnotationIntrospector.getCheckKey(SimplestCheck.class), is(SimplestCheck.class.getCanonicalName()));
-  }
-
-  @Test
-  public void checkKeyCanBeOverriden() {
-    assertThat(AnnotationIntrospector.getCheckKey(CheckWithOverridenKey.class), is("overridenKey"));
-  }
-
-  @Test
-  public void noProperties() {
-    assertThat(AnnotationIntrospector.getPropertyFields(SimplestCheck.class).size(), is(0));
-  }
-
-  @Test
-  public void getProperties() {
-    List<Field> fields = AnnotationIntrospector.getPropertyFields(CheckWithProperties.class);
-    assertThat(fields.size(), is(2));
-
-    assertThat(fields.get(0).getName(), is("active"));
-    assertThat(AnnotationIntrospector.getPropertyFieldKey(fields.get(0)), is("active"));
-
-    assertThat(fields.get(1).getName(), is("max"));
-    assertThat(AnnotationIntrospector.getPropertyFieldKey(fields.get(1)), is("Maximum"));
-  }
-
-
-  @Test
-  public void getCheckAnnotation() {
-    assertNotNull(AnnotationIntrospector.getCheckAnnotation(SimplestCheck.class));
-    assertNull(AnnotationIntrospector.getCheckAnnotation(String.class));
-  }
-}
-
 
 @Check(isoCategory = IsoCategory.Portability, priority = Priority.CRITICAL)
 class SimplestCheck {