Count api: simplify default handling and toString representation

For minScore and terminateAfter we can just rely on defaults set to SearchSourceBuilder. Also simplified toString representation of CountRequestBuilder

Author: javanna

core/src/main/java/org/elasticsearch/action/count/CountRequest.java

@@ -32,8 +32,6 @@
 import java.io.IOException;
 import java.util.Arrays;
 
-import static org.elasticsearch.search.internal.SearchContext.DEFAULT_TERMINATE_AFTER;
-
 /**
  * A request to count the number of documents matching a specific query. Best created with
  * {@link org.elasticsearch.client.Requests#countRequest(String...)}.
@@ -44,8 +42,6 @@
  */
 public class CountRequest extends BroadcastRequest<CountRequest> {
 
-    public static final float DEFAULT_MIN_SCORE = -1f;
-
     @Nullable
     protected String routing;
 
@@ -63,8 +59,6 @@ public class CountRequest extends BroadcastRequest<CountRequest> {
     public CountRequest(String... indices) {
         super(indices);
         searchSourceBuilder.size(0);
-        searchSourceBuilder.minScore(DEFAULT_MIN_SCORE);
-        searchSourceBuilder.terminateAfter(DEFAULT_TERMINATE_AFTER);
     }
 
     /**
@@ -83,7 +77,6 @@ public CountRequest minScore(float minScore) {
         return this;
     }
 
-
     /**
      * The query to execute
      */
@@ -172,10 +165,6 @@ public String toString() {
         return "[" + Arrays.toString(indices) + "]" + Arrays.toString(types) + ", source[" + sSource + "]";
     }
 
-    public String sourceBuilderString() {
-        return searchSourceBuilder.toString();
-    }
-
     public SearchRequest toSearchRequest() {
         SearchRequest searchRequest = new SearchRequest(indices());
         searchRequest.source(searchSourceBuilder);

core/src/main/java/org/elasticsearch/action/count/CountRequestBuilder.java

@@ -106,6 +106,6 @@ protected CountResponse getDelegatedFromInstigator(SearchResponse response) {
 
     @Override
     public String toString() {
-        return request.sourceBuilderString();
+        return request.toString();
     }
 }

core/src/main/java/org/elasticsearch/rest/action/count/RestCountAction.java

@@ -45,7 +45,6 @@
 
 import java.io.IOException;
 
-import static org.elasticsearch.action.count.CountRequest.DEFAULT_MIN_SCORE;
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 import static org.elasticsearch.rest.RestRequest.Method.POST;
 import static org.elasticsearch.rest.action.support.RestActions.buildBroadcastShardsHeader;
@@ -91,7 +90,10 @@ public void handleRequest(final RestRequest request, final RestChannel channel,
             }
         }
         countRequest.routing(request.param("routing"));
-        countRequest.minScore(request.paramAsFloat("min_score", DEFAULT_MIN_SCORE));
+        float minScore = request.paramAsFloat("min_score", -1f);
+        if (minScore != -1f) {
+            countRequest.minScore(minScore);
+        }
         countRequest.types(Strings.splitStringByCommaToArray(request.param("type")));
         countRequest.preference(request.param("preference"));