Fix compatibility of build with Java 8

diff --git a/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyBulkRequestBuilder.java b/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyBulkRequestBuilder.java
index 6ace4a6579b0657821edb74640d9e2c5d7162e7a..f1522fcbdf4327c628da190260a24550aca85b38 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyBulkRequestBuilder.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/es/request/ProxyBulkRequestBuilder.java
@@ -20,7 +20,8 @@
 
 package org.sonar.server.es.request;
 
-import com.google.common.collect.HashMultiset;
+import com.google.common.collect.LinkedHashMultiset;
+import com.google.common.collect.Multiset;
 import com.google.common.collect.Multiset.Entry;
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ListenableActionFuture;
@@ -80,7 +81,7 @@ public class ProxyBulkRequestBuilder extends BulkRequestBuilder {
   public String toString() {
     StringBuilder message = new StringBuilder();
     message.append("Bulk[");
-    HashMultiset<BulkRequestKey> groupedRequests = HashMultiset.create();
+    Multiset<BulkRequestKey> groupedRequests = LinkedHashMultiset.create();
     for (int i = 0; i < request.requests().size(); i++) {
       ActionRequest item = request.requests().get(i);
       String requestType, index, docType;

diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/FacetValue.java b/server/sonar-server/src/main/java/org/sonar/server/search/FacetValue.java
index 226ea4b57b6f9c8e745f3c55353db9ef6e277d90..41509047dfe0301e5a76da61b535323f82d0122d 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/search/FacetValue.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/search/FacetValue.java
@@ -61,9 +61,6 @@ public class FacetValue {
 
   @Override
   public String toString() {
-    return "FacetValue{" +
-      "key='" + getKey() + '\'' +
-      ", value=" + getValue() +
-      '}';
+    return String.format("{%s=%d}", getKey(), getValue());
   }
 }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/Facets.java b/server/sonar-server/src/main/java/org/sonar/server/search/Facets.java
index 2b23c003331aaf1bbb7fb9891e5b3ee91d83d0be..7f94bd314f56bc100a280ae5621d1df643be981e 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/search/Facets.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/search/Facets.java
@@ -21,8 +21,6 @@ package org.sonar.server.search;
 
 import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.Multimap;
-import org.apache.commons.lang.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.search.aggregations.Aggregation;
 import org.elasticsearch.search.aggregations.HasAggregations;
@@ -125,6 +123,6 @@ class Facets {
 
   @Override
   public String toString() {
-    return ReflectionToStringBuilder.toString(this, ToStringStyle.SIMPLE_STYLE);
+    return facetValues.toString();
   }
 }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyBulkRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyBulkRequestBuilderTest.java
index 7a6c911f6a4fd1b58049137bd399166e338a31fb..f0d0712857b8663e37f7ca477b55d6ea828282a5 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyBulkRequestBuilderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyBulkRequestBuilderTest.java
@@ -67,7 +67,7 @@ public class ProxyBulkRequestBuilderTest {
       .source(FakeIndexDefinition.newDoc(3)));
 
     assertThat(req.toString()).isEqualTo(
-      "Bulk[1 delete request(s) on index fakes and type fake, 1 update request(s) on index fakes and type fake, 1 index request(s) on index fakes and type fake]");
+      "Bulk[1 update request(s) on index fakes and type fake, 1 delete request(s) on index fakes and type fake, 1 index request(s) on index fakes and type fake]");
 
     BulkResponse response = req.get();
     assertThat(response.getItems()).hasSize(3);

diff --git a/server/sonar-server/src/test/java/org/sonar/server/search/FacetValueTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/FacetValueTest.java
index dd3ad35449db3c7bf379829cb34a30c6085b39d9..8f12b4a982cbd8c0147e0670e5d1cd8130727600 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/search/FacetValueTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/search/FacetValueTest.java
@@ -50,7 +50,7 @@ public class FacetValueTest {
   }
 
   @Test
-  public void should_define_toString() {
-    assertThat(new FacetValue("polop", 42).toString()).isEqualTo("FacetValue{key='polop', value=42}");
+  public void test_toString() {
+    assertThat(new FacetValue("polop", 42).toString()).isEqualTo("{polop=42}");
   }
 }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/search/FacetsMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/FacetsMediumTest.java
index ee969cc9866d87998ec7d1bb75796944244ff9df..62b14db364473e3886a31d2595ab5943d6ec30cb 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/search/FacetsMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/search/FacetsMediumTest.java
@@ -98,15 +98,7 @@ public class FacetsMediumTest {
     assertThat(facets.getFacets()).isNotEmpty();
     assertThat(facets.getFacetKeys(FIELD_TAGS)).containsOnly("", "tag1", "tag2", "tag4");
     assertThat(facets.getFacetKeys(FIELD_CREATED_AT)).isEmpty();
-    assertThat(facets.toString()).isEqualTo("{"
-      + "tags=["
-        + "FacetValue{key='tag1', value=2}, "
-        + "FacetValue{key='tag2', value=1}, "
-        + "FacetValue{key='tag4', value=1}, "
-        + "FacetValue{key='', value=1}"
-      + "], "
-      + "__ignored=[FacetValue{key='tag3', value=1}]"
-      + "}");
+    assertThat(facets.toString()).isEqualTo("{tags=[{tag4=1}, {=1}, {tag1=2}, {tag2=1}], __ignored=[{tag3=1}]}");
   }
 
   @Test