fix explain failure

Author: kimchy

modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java

@@ -185,7 +185,7 @@ private byte[] parseSearchSource(RestRequest request) {
 
 
         searchSourceBuilder.queryParserName(request.param("queryParserName"));
-        searchSourceBuilder.explain(request.paramAsBoolean("explain", false));
+        searchSourceBuilder.explain(request.paramAsBoolean("explain", null));
 
         List<String> fields = request.params("field");
         if (fields != null && !fields.isEmpty()) {

modules/elasticsearch/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java

@@ -127,7 +127,7 @@ public SearchSourceBuilder queryParserName(String queryParserName) {
      * Should each {@link org.elasticsearch.search.SearchHit} be returned with an
      * explanation of the hit (ranking).
      */
-    public SearchSourceBuilder explain(boolean explain) {
+    public SearchSourceBuilder explain(Boolean explain) {
         this.explain = explain;
         return this;
     }

modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/TransportTwoServersSearchTests.java

@@ -46,7 +46,7 @@
 import static org.hamcrest.Matchers.*;
 
 /**
- * @author kimchy (Shay Banon)
+ * @author kimchy (shay.banon)
  */
 public class TransportTwoServersSearchTests extends AbstractServersTests {
 
@@ -86,7 +86,8 @@ protected Client getClient() {
         assertThat(searchResponse.hits().hits().length, equalTo(60));
         for (int i = 0; i < 60; i++) {
             SearchHit hit = searchResponse.hits().hits()[i];
-//            System.out.println(hit.target() + ": " +  hit.explanation());
+//            System.out.println(hit.shard() + ": " +  hit.explanation());
+            assertThat(hit.explanation(), notNullValue());
             assertThat("id[" + hit.id() + "]", hit.id(), equalTo(Integer.toString(100 - i - 1)));
         }
 
@@ -113,7 +114,8 @@ protected Client getClient() {
         assertThat(searchResponse.hits().hits().length, equalTo(60));
         for (int i = 0; i < 60; i++) {
             SearchHit hit = searchResponse.hits().hits()[i];
-//            System.out.println(hit.target() + ": " +  hit.explanation());
+//            System.out.println(hit.shard() + ": " +  hit.explanation());
+            assertThat(hit.explanation(), notNullValue());
             assertThat("id[" + hit.id() + "]", hit.id(), equalTo(Integer.toString(i)));
         }
 
@@ -138,7 +140,8 @@ protected Client getClient() {
         assertThat(searchResponse.hits().hits().length, equalTo(60));
         for (int i = 0; i < 60; i++) {
             SearchHit hit = searchResponse.hits().hits()[i];
-//            System.out.println(hit.target() + ": " +  hit.explanation());
+//            System.out.println(hit.shard() + ": " +  hit.explanation());
+            assertThat(hit.explanation(), notNullValue());
             assertThat("id[" + hit.id() + "]", hit.id(), equalTo(Integer.toString(100 - i - 1)));
         }
 
@@ -163,7 +166,8 @@ protected Client getClient() {
         assertThat(searchResponse.hits().hits().length, equalTo(60));
         for (int i = 0; i < 60; i++) {
             SearchHit hit = searchResponse.hits().hits()[i];
-//            System.out.println(hit.target() + ": " +  hit.explanation());
+//            System.out.println(hit.shard() + ": " +  hit.explanation());
+            assertThat(hit.explanation(), notNullValue());
             assertThat("id[" + hit.id() + "]", hit.id(), equalTo(Integer.toString(i)));
         }
 
@@ -188,7 +192,8 @@ protected Client getClient() {
         assertThat(searchResponse.hits().hits().length, equalTo(60)); // 20 per shard
         for (int i = 0; i < 60; i++) {
             SearchHit hit = searchResponse.hits().hits()[i];
-//            System.out.println(hit.target() + ": " +  hit.explanation());
+//            System.out.println(hit.shard() + ": " +  hit.explanation());
+            assertThat(hit.explanation(), notNullValue());
             assertThat("id[" + hit.id() + "]", hit.id(), equalTo(Integer.toString(100 - i - 1)));
         }
 
@@ -214,7 +219,8 @@ protected Client getClient() {
         assertThat(searchResponse.hits().hits().length, equalTo(60)); // 20 per shard
         for (int i = 0; i < 60; i++) {
             SearchHit hit = searchResponse.hits().hits()[i];
-//            System.out.println(hit.target() + ": " +  hit.explanation());
+//            System.out.println(hit.shard() + ": " +  hit.explanation());
+            assertThat(hit.explanation(), notNullValue());
             assertThat("id[" + hit.id() + "]", hit.id(), equalTo(Integer.toString(100 - i - 1)));
         }