CBB-1170: add constructor

collapse.go

@@ -1,13 +1,20 @@
 package query
 
-// Collapse represents the "collapse" param that can be applied to a request
+// CollapseRequest represents the "collapse" param that can be applied to a request
 // see: https://www.elastic.co/guide/en/elasticsearch/reference/current/collapse-search-results.html
-type Collapse struct {
+type CollapseRequest struct {
 	field string
 }
 
+// Collapse creates a new collapse request
+func Collapse(field string) *CollapseRequest {
+	return &CollapseRequest{
+		field: field,
+	}
+}
+
 // Map returns a map representation of the Source object.
-func (source Collapse) Map() map[string]interface{} {
+func (source CollapseRequest) Map() map[string]interface{} {
 	return map[string]interface{}{
 		"field": source.field,
 	}

collapse_test.go

@@ -10,9 +10,7 @@ func TestCollapse_Map(t *testing.T) {
 		[]mapTest{
 			{
 				name: "collapse",
-				q: Collapse{
-					field: "collapse_field",
-				},
+				q:    Collapse("collapse_field"),
 				exp: map[string]interface{}{
 					"field": "collapse_field",
 				},

search.go

@@ -26,7 +26,7 @@ type SearchRequest struct {
 	sorts       Sorts
 	source      Source
 	timeout     *time.Duration
-	collapse    *Collapse
+	collapse    *CollapseRequest
 }
 
 // Search creates a new SearchRequest object, to be filled via method chaining.
@@ -110,7 +110,7 @@ func (req *SearchRequest) Highlight(highlight Mappable) *SearchRequest {
 
 // Collapse sets the collapse param for the request.
 // See:https://www.elastic.co/guide/en/elasticsearch/reference/current/collapse-search-results.html
-func (req *SearchRequest) Collapse(collapse *Collapse) *SearchRequest {
+func (req *SearchRequest) Collapse(collapse *CollapseRequest) *SearchRequest {
 	req.collapse = collapse
 	return req
 }

search_test.go

@@ -134,7 +134,7 @@ func TestSearchMaps(t *testing.T) {
 		},
 		{
 			"a simple match_all query with a size and collapse",
-			Search().Query(MatchAll()).Size(20).Collapse(&Collapse{field: "collapse_field"}),
+			Search().Query(MatchAll()).Size(20).Collapse(&CollapseRequest{field: "collapse_field"}),
 			map[string]interface{}{
 				"query": map[string]interface{}{
 					"match_all": map[string]interface{}{},