From 2ff9a198c735205e08a2392b655f167a1d3f0c5b Mon Sep 17 00:00:00 2001
From: Stephane Gamard <stephane.gamard@searchbox.com>
Date: Fri, 16 May 2014 19:27:37 +0200
Subject: [PATCH] SONAR-5007 - Deprecated old ES classes and Tests

---
 .../src/main/java/org/sonar/server/es/ESIndex.java   |  4 ++++
 .../main/java/org/sonar/server/es/SearchQuery.java   | 12 ++++++------
 .../test/java/org/sonar/server/es/ESIndexTest.java   |  3 +++
 .../server/qualityprofile/ESActiveRuleTest.java      |  3 +++
 .../qualityprofile/QProfileRuleLookupTest.java       |  3 +++
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/sonar-server/src/main/java/org/sonar/server/es/ESIndex.java b/sonar-server/src/main/java/org/sonar/server/es/ESIndex.java
index da51fbe5393..29487ede812 100644
--- a/sonar-server/src/main/java/org/sonar/server/es/ESIndex.java
+++ b/sonar-server/src/main/java/org/sonar/server/es/ESIndex.java
@@ -55,6 +55,10 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
+/**
+ * @deprecated  since 4.4
+ */
+@Deprecated
 public class ESIndex implements Startable {
 
   private static final String BULK_EXECUTE_FAILED = "Execution of bulk operation failed";
diff --git a/sonar-server/src/main/java/org/sonar/server/es/SearchQuery.java b/sonar-server/src/main/java/org/sonar/server/es/SearchQuery.java
index f7e98f28dc3..2a8a87a1888 100644
--- a/sonar-server/src/main/java/org/sonar/server/es/SearchQuery.java
+++ b/sonar-server/src/main/java/org/sonar/server/es/SearchQuery.java
@@ -39,14 +39,14 @@ import static org.elasticsearch.index.query.FilterBuilders.*;
  * This class can be used to build "AND" form queries, to be passed e.g to {@link ESIndex#findDocumentIds(SearchQuery)}
  * For instance the following code:
  * <blockquote>
-   SearchQuery.create("polop")
-      .field("field1", "value1")
-      .field("field2", "value2")
-   </blockquote>
+ SearchQuery.create("polop")
+ .field("field1", "value1")
+ .field("field2", "value2")
+ </blockquote>
  * ...corresponds to the following query string:<br/>
  * <blockquote>
-   polop AND field1:value1 AND field2:value2
-   </blockquote>
+ polop AND field1:value1 AND field2:value2
+ </blockquote>
  * @since 4.1
  */
 public class SearchQuery {
diff --git a/sonar-server/src/test/java/org/sonar/server/es/ESIndexTest.java b/sonar-server/src/test/java/org/sonar/server/es/ESIndexTest.java
index b112fa05268..07f44550db2 100644
--- a/sonar-server/src/test/java/org/sonar/server/es/ESIndexTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/es/ESIndexTest.java
@@ -25,6 +25,7 @@ import org.elasticsearch.common.io.BytesStream;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.sonar.api.config.Settings;
 import org.sonar.core.profiling.Profiling;
@@ -36,6 +37,8 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+@Ignore
+@Deprecated
 public class ESIndexTest {
 
   private EsSetup esSetup;
diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/ESActiveRuleTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ESActiveRuleTest.java
index 490844a11b4..0991fff678e 100644
--- a/sonar-server/src/test/java/org/sonar/server/qualityprofile/ESActiveRuleTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ESActiveRuleTest.java
@@ -31,6 +31,7 @@ import org.elasticsearch.common.settings.ImmutableSettings;
 import org.elasticsearch.search.SearchHit;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -61,6 +62,8 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
+@Ignore
+@Deprecated
 public class ESActiveRuleTest {
 
   EsSetup esSetup;
diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileRuleLookupTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileRuleLookupTest.java
index 92626cabaa9..7b04647cf82 100644
--- a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileRuleLookupTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileRuleLookupTest.java
@@ -26,6 +26,7 @@ import org.elasticsearch.client.Requests;
 import org.elasticsearch.common.settings.ImmutableSettings;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.sonar.api.config.Settings;
 import org.sonar.api.rule.Severity;
@@ -41,6 +42,8 @@ import static org.fest.assertions.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+@Ignore
+@Deprecated
 public class QProfileRuleLookupTest {
 
   private QProfileRuleLookup profileRules;
-- 
2.39.5