SONAR-5824 upgrade to elasticsearch 1.4.1

diff --git a/pom.xml b/pom.xml
index 62daa44a63236d2dc8626f838f65f5e2b10a3862..ae10299748e5713bc5fed8b57d4a1d979e4d2e1d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@
     <logback.version>1.0.13</logback.version>
     <slf4j.version>1.7.5</slf4j.version>
     <tomcat.version>7.0.54</tomcat.version>
-    <elasticsearch.version>1.1.2</elasticsearch.version>
+    <elasticsearch.version>1.4.1</elasticsearch.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.min.version>3.0.5</maven.min.version>
     <maven.api.version>3.0.5</maven.api.version>
@@ -677,7 +677,7 @@
       <dependency>
         <groupId>com.github.tlrx</groupId>
         <artifactId>elasticsearch-test</artifactId>
-        <version>0.90.6</version>
+        <version>1.2.1</version>
       </dependency>
       <dependency>
         <groupId>com.google.guava</groupId>

diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/SortingTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/SortingTest.java
index 509b5918b646facde4f8e5a192550d4dc26742af..eab76595c31726a2139886df2d29808001ac4506 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/es/SortingTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/es/SortingTest.java
@@ -21,7 +21,7 @@ package org.sonar.server.es;
 
 import org.apache.commons.lang.reflect.FieldUtils;
 import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.client.internal.InternalClient;
+import org.elasticsearch.client.Client;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.search.sort.SortBuilder;
 import org.elasticsearch.search.sort.SortOrder;
@@ -58,7 +58,7 @@ public class SortingTest {
     Sorting sorting = new Sorting();
     sorting.add("updatedAt");
 
-    SearchRequestBuilder request = new SearchRequestBuilder(mock(InternalClient.class));
+    SearchRequestBuilder request = new SearchRequestBuilder(mock(Client.class));
     sorting.fill(request, "updatedAt", true);
     List<SortBuilder> fields = fields(request);
     assertThat(fields).hasSize(1);
@@ -70,7 +70,7 @@ public class SortingTest {
     Sorting sorting = new Sorting();
     sorting.add("updatedAt");
 
-    SearchRequestBuilder request = new SearchRequestBuilder(mock(InternalClient.class));
+    SearchRequestBuilder request = new SearchRequestBuilder(mock(Client.class));
     sorting.fill(request, "updatedAt", false);
     List<SortBuilder> fields = fields(request);
     assertThat(fields).hasSize(1);
@@ -82,7 +82,7 @@ public class SortingTest {
     Sorting sorting = new Sorting();
     sorting.add("updatedAt").missingLast();
 
-    SearchRequestBuilder request = new SearchRequestBuilder(mock(InternalClient.class));
+    SearchRequestBuilder request = new SearchRequestBuilder(mock(Client.class));
     sorting.fill(request, "updatedAt", true);
     List<SortBuilder> fields = fields(request);
     assertThat(fields).hasSize(1);
@@ -94,7 +94,7 @@ public class SortingTest {
     Sorting sorting = new Sorting();
     sorting.add("updatedAt").missingLast();
 
-    SearchRequestBuilder request = new SearchRequestBuilder(mock(InternalClient.class));
+    SearchRequestBuilder request = new SearchRequestBuilder(mock(Client.class));
     sorting.fill(request, "updatedAt", false);
     List<SortBuilder> fields = fields(request);
     assertThat(fields).hasSize(1);
@@ -110,7 +110,7 @@ public class SortingTest {
     sorting.add("fileLine", "severity").reverse();
     sorting.add("fileLine", "key").missingLast();
 
-    SearchRequestBuilder request = new SearchRequestBuilder(mock(InternalClient.class));
+    SearchRequestBuilder request = new SearchRequestBuilder(mock(Client.class));
     sorting.fill(request, "fileLine", true);
     List<SortBuilder> fields = fields(request);
     assertThat(fields).hasSize(4);
@@ -126,7 +126,7 @@ public class SortingTest {
     sorting.add("file");
 
     try {
-      sorting.fill(new SearchRequestBuilder(mock(InternalClient.class)), "unknown", true);
+      sorting.fill(new SearchRequestBuilder(mock(Client.class)), "unknown", true);
       fail();
     } catch (BadRequestException e) {
       assertThat(e.getMessage()).isEqualTo("Bad sort field: unknown");
@@ -138,7 +138,7 @@ public class SortingTest {
     Sorting sorting = new Sorting();
     sorting.addDefault("file");
 
-    SearchRequestBuilder request = new SearchRequestBuilder(mock(InternalClient.class));
+    SearchRequestBuilder request = new SearchRequestBuilder(mock(Client.class));
     sorting.fillDefault(request);
     List<SortBuilder> fields = fields(request);
     assertThat(fields).hasSize(1);