Mirrors/sonarqube
1
0
Fork 0
mirror of https://github.com/SonarSource/sonarqube.git synced 2024-08-08 03:05:57 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

SONAR-5824 upgrade to elasticsearch 1.4.1

Browse Source
This commit is contained in:
Simon Brandhof 2014-12-16 20:26:58 +01:00
parent d5b54f4074
commit c57c1f8926
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -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>

16
server/sonar-server/src/test/java/org/sonar/server/es/SortingTest.java
View File

@ -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);