SONAR-5007 - Deprecated old ES classes and Tests

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 da51fbe5393d40f8b2e24ae8526ca1e7da6e8403..29487ede8125c3d12a6226b8e835feee5ff45d97 100644 (file)
--- 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 f7e98f28dc34284e5f0719c14bd16100be70cdea..2a8a87a18881c6ea72c5e79f97f107b512148d0f 100644 (file)
--- 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 b112fa052683ea820b02983e35ebbe0778c6063e..07f44550db2c2fa17da38bd10f01588b54a2e767 100644 (file)
--- 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 490844a11b4082d61d6abd6907245416349dbe25..0991fff678ef7e70e40714f068e11140d91cd557 100644 (file)
--- 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 92626cabaa9e8da446fb1e0e4838ee89bfce735f..7b04647cf8238156f69824abc0e6652398ac96cd 100644 (file)
--- 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;