SONAR-2130 deprecate the component SquidSearch

diff --git a/plugins/sonar-squid-java-plugin/pom.xml b/plugins/sonar-squid-java-plugin/pom.xml
index 70cb1d91ee276096125a0d9e313a7404b170eebc..7b6c0fe2d898ded0dd81d3873b83b5c89adc680e 100644 (file)
--- a/plugins/sonar-squid-java-plugin/pom.xml
+++ b/plugins/sonar-squid-java-plugin/pom.xml
@@ -14,6 +14,11 @@
   <description>Squid analyzer for Java.</description>
 
   <dependencies>
+    <dependency>
+      <groupId>org.codehaus.sonar</groupId>
+      <artifactId>sonar-deprecated</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.codehaus.sonar</groupId>
       <artifactId>sonar-java-api</artifactId>

diff --git a/sonar-deprecated/src/main/java/org/sonar/api/batch/SquidSearch.java b/sonar-deprecated/src/main/java/org/sonar/api/batch/SquidSearch.java
new file mode 100644 (file)
index 0000000..1290279
--- /dev/null
+++ b/sonar-deprecated/src/main/java/org/sonar/api/batch/SquidSearch.java
@@ -0,0 +1,52 @@
+/*
+ * Sonar, open source software quality management tool.
+ * Copyright (C) 2009 SonarSource SA
+ * 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.api.batch;
+
+import java.util.Collection;
+
+import org.sonar.api.BatchExtension;
+import org.sonar.squid.api.Query;
+import org.sonar.squid.api.SourceCode;
+
+/**
+ * The extension point to access the Squid data tree
+ *
+ * @since 1.11
+ * @deprecated since 2.6. Data on classes/methods are now injected into sonar index. There's no need to use
+ * this component anymore.
+ */
+@Deprecated
+public interface SquidSearch extends BatchExtension {
+  /**
+   * Returns a list of SourceCode objects base a set of queries given
+   *
+   * @param query the set of query
+   * @return SourceCode objects
+   */
+  Collection<SourceCode> search(Query... query);
+
+  /**
+   * Returns a SourceObject given its key
+   *
+   * @param key the key
+   * @return SourceCode object
+   */
+  SourceCode search(String key);
+}

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/SquidSearch.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/SquidSearch.java
deleted file mode 100644 (file)
index 5d85c3a..0000000
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/SquidSearch.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Sonar, open source software quality management tool.
- * Copyright (C) 2009 SonarSource SA
- * 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.api.batch;
-
-import java.util.Collection;
-
-import org.sonar.api.BatchExtension;
-import org.sonar.squid.api.Query;
-import org.sonar.squid.api.SourceCode;
-
-/**
- * The extension point to access the Squid data tree
- *
- * @since 1.11
- */
-public interface SquidSearch extends BatchExtension {
-  /**
-   * Returns a list of SourceCode objects base a set of queries given
-   *
-   * @param query the set of query
-   * @return SourceCode objects
-   */
-  Collection<SourceCode> search(Query... query);
-
-  /**
-   * Returns a SourceObject given its key
-   *
-   * @param key the key
-   * @return SourceCode object
-   */
-  SourceCode search(String key);
-}