Only add params when there are; complete parameters on Get request

Author: olivere

alias.go

@@ -81,7 +81,9 @@ func (s *AliasService) Do() (*AliasResult, error) {
 	if s.pretty {
 		params.Set("pretty", fmt.Sprintf("%v", s.pretty))
 	}
-	urls += "?" + params.Encode()
+	if len(params) > 0 {
+		urls += "?" + params.Encode()
+	}
 
 	// Actions
 	body := make(map[string]interface{})

aliases.go

@@ -76,7 +76,9 @@ func (s *AliasesService) Do() (*AliasesResult, error) {
 	if s.pretty {
 		params.Set("pretty", fmt.Sprintf("%v", s.pretty))
 	}
-	urls += "?" + params.Encode()
+	if len(params) > 0 {
+		urls += "?" + params.Encode()
+	}
 
 	if s.debug {
 		out, _ := httputil.DumpRequestOut((*http.Request)(req), true)

bulk.go

@@ -23,18 +23,18 @@ type BulkService struct {
 	requests []BulkableRequest
 	//replicationType string
 	//consistencyLevel string
-	refresh *bool
-	pretty  bool
-	debug   bool
+	refresh      *bool
+	pretty       bool
+	debug        bool
 	debugOnError bool
 }
 
 func NewBulkService(client *Client) *BulkService {
 	builder := &BulkService{
-		client:   client,
-		requests: make([]BulkableRequest, 0),
-		pretty:   false,
-		debug:    false,
+		client:       client,
+		requests:     make([]BulkableRequest, 0),
+		pretty:       false,
+		debug:        false,
 		debugOnError: false,
 	}
 	return builder
@@ -132,7 +132,9 @@ func (s *BulkService) Do() (*BulkResponse, error) {
 	if s.refresh != nil {
 		params.Set("refresh", fmt.Sprintf("%v", *s.refresh))
 	}
-	urls += "?" + params.Encode()
+	if len(params) > 0 {
+		urls += "?" + params.Encode()
+	}
 
 	// Set up a new request
 	req, err := s.client.NewRequest("POST", urls)
@@ -171,7 +173,7 @@ func (s *BulkService) Do() (*BulkResponse, error) {
 	}
 	defer res.Body.Close()
 
-	// Debug	
+	// Debug
 	if s.debug {
 		out, _ := httputil.DumpResponse(res, true)
 		fmt.Printf("%s\n", string(out))

count.go

@@ -84,7 +84,9 @@ func (s *CountService) Do() (int64, error) {
 	if s.pretty {
 		params.Set("pretty", fmt.Sprintf("%v", s.pretty))
 	}
-	urls += "?" + params.Encode()
+	if len(params) > 0 {
+		urls += "?" + params.Encode()
+	}
 
 	// Set up a new request
 	req, err := s.client.NewRequest("GET", urls)

flush.go

@@ -75,7 +75,9 @@ func (s *FlushService) Do() (*FlushResult, error) {
 	if s.full != nil {
 		params.Set("full", fmt.Sprintf("%v", *s.full))
 	}
-	urls += "?" + params.Encode()
+	if len(params) > 0 {
+		urls += "?" + params.Encode()
+	}
 
 	// Set up a new request
 	req, err := s.client.NewRequest("POST", urls)

get.go

@@ -20,15 +20,14 @@ type GetService struct {
 	routing    string
 	preference string
 	fields     []string
-	refresh    bool
-	realtime   bool
+	refresh    *bool
+	realtime   *bool
 }
 
 func NewGetService(client *Client) *GetService {
 	builder := &GetService{
-		client:   client,
-		_type:    "_all",
-		realtime: true,
+		client: client,
+		_type:  "_all",
 	}
 	return builder
 }
@@ -82,12 +81,12 @@ func (b *GetService) Fields(fields ...string) *GetService {
 }
 
 func (b *GetService) Refresh(refresh bool) *GetService {
-	b.refresh = refresh
+	b.refresh = &refresh
 	return b
 }
 
 func (b *GetService) Realtime(realtime bool) *GetService {
-	b.realtime = realtime
+	b.realtime = &realtime
 	return b
 }
 
@@ -99,8 +98,23 @@ func (b *GetService) Do() (*GetResult, error) {
 	urls = strings.Replace(urls, "{id}", cleanPathString(b.id), 1)
 
 	params := make(url.Values)
+	if b.realtime != nil {
+		params.Add("realtime", fmt.Sprintf("%v", *b.realtime))
+	}
+	if len(b.fields) > 0 {
+		params.Add("fields", strings.Join(b.fields, ","))
+	}
+	if b.routing != "" {
+		params.Add("routing", b.routing)
+	}
+	if b.preference != "" {
+		params.Add("preference", b.preference)
+	}
+	if b.refresh != nil {
+		params.Add("refresh", fmt.Sprintf("%v", *b.refresh))
+	}
 	if len(params) > 0 {
-		urls += params.Encode()
+		urls += "?" + params.Encode()
 	}
 
 	// Set up a new request

index.go

@@ -89,7 +89,9 @@ func (b *IndexService) Do() (*IndexResult, error) {
 	if b.pretty {
 		params.Set("pretty", fmt.Sprintf("%v", b.pretty))
 	}
-	urls += "?" + params.Encode()
+	if len(params) > 0 {
+		urls += "?" + params.Encode()
+	}
 
 	// Set up a new request
 	req, err := b.client.NewRequest("PUT", urls)

scan.go

@@ -153,7 +153,9 @@ func (s *ScanService) Do() (*ScanCursor, error) {
 	if s.size != nil && *s.size > 0 {
 		params.Set("size", fmt.Sprintf("%d", *s.size))
 	}
-	urls += "?" + params.Encode()
+	if len(params) > 0 {
+		urls += "?" + params.Encode()
+	}
 
 	// Set up a new request
 	req, err := s.client.NewRequest("POST", urls)

search.go

@@ -212,7 +212,9 @@ func (s *SearchService) Do() (*SearchResult, error) {
 	if s.searchType != "" {
 		params.Set("search_type", s.searchType)
 	}
-	urls += "?" + params.Encode()
+	if len(params) > 0 {
+		urls += "?" + params.Encode()
+	}
 
 	// Set up a new request
 	req, err := s.client.NewRequest("POST", urls)