From 58839cefb50e56ae5b157b37e9814ae83ceee70b Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Thu, 20 Jul 2017 15:22:49 -0700
Subject: Upgrading server dependancies (#6984)

---
 .../olivere/elastic.v5/fetch_source_context.go     | 58 ++++++++++++++--------
 1 file changed, 37 insertions(+), 21 deletions(-)

(limited to 'vendor/gopkg.in/olivere/elastic.v5/fetch_source_context.go')

diff --git a/vendor/gopkg.in/olivere/elastic.v5/fetch_source_context.go b/vendor/gopkg.in/olivere/elastic.v5/fetch_source_context.go
index 59a453c9e..53e7fcd90 100644
--- a/vendor/gopkg.in/olivere/elastic.v5/fetch_source_context.go
+++ b/vendor/gopkg.in/olivere/elastic.v5/fetch_source_context.go
@@ -9,13 +9,20 @@ import (
 	"strings"
 )
 
+// FetchSourceContext enables source filtering, i.e. it allows control
+// over how the _source field is returned with every hit. It is used
+// with various endpoints, e.g. when searching for documents, retrieving
+// individual documents, or even updating documents.
+//
+// See https://www.elastic.co/guide/en/elasticsearch/reference/5.5/search-request-source-filtering.html
+// for details.
 type FetchSourceContext struct {
-	fetchSource     bool
-	transformSource bool
-	includes        []string
-	excludes        []string
+	fetchSource bool
+	includes    []string
+	excludes    []string
 }
 
+// NewFetchSourceContext returns a new FetchSourceContext.
 func NewFetchSourceContext(fetchSource bool) *FetchSourceContext {
 	return &FetchSourceContext{
 		fetchSource: fetchSource,
@@ -24,51 +31,60 @@ func NewFetchSourceContext(fetchSource bool) *FetchSourceContext {
 	}
 }
 
+// FetchSource indicates whether to return the _source.
 func (fsc *FetchSourceContext) FetchSource() bool {
 	return fsc.fetchSource
 }
 
+// SetFetchSource specifies whether to return the _source.
 func (fsc *FetchSourceContext) SetFetchSource(fetchSource bool) {
 	fsc.fetchSource = fetchSource
 }
 
+// Include indicates to return specific parts of the _source.
+// Wildcards are allowed here.
 func (fsc *FetchSourceContext) Include(includes ...string) *FetchSourceContext {
 	fsc.includes = append(fsc.includes, includes...)
 	return fsc
 }
 
+// Exclude indicates to exclude specific parts of the _source.
+// Wildcards are allowed here.
 func (fsc *FetchSourceContext) Exclude(excludes ...string) *FetchSourceContext {
 	fsc.excludes = append(fsc.excludes, excludes...)
 	return fsc
 }
 
-func (fsc *FetchSourceContext) TransformSource(transformSource bool) *FetchSourceContext {
-	fsc.transformSource = transformSource
-	return fsc
-}
-
+// Source returns the JSON-serializable data to be used in a body.
 func (fsc *FetchSourceContext) Source() (interface{}, error) {
 	if !fsc.fetchSource {
 		return false, nil
 	}
-	return map[string]interface{}{
-		"includes": fsc.includes,
-		"excludes": fsc.excludes,
-	}, nil
+	if len(fsc.includes) == 0 && len(fsc.excludes) == 0 {
+		return true, nil
+	}
+	src := make(map[string]interface{})
+	if len(fsc.includes) > 0 {
+		src["includes"] = fsc.includes
+	}
+	if len(fsc.excludes) > 0 {
+		src["excludes"] = fsc.excludes
+	}
+	return src, nil
 }
 
 // Query returns the parameters in a form suitable for a URL query string.
 func (fsc *FetchSourceContext) Query() url.Values {
 	params := url.Values{}
-	if !fsc.fetchSource {
+	if fsc.fetchSource {
+		if len(fsc.includes) > 0 {
+			params.Add("_source_include", strings.Join(fsc.includes, ","))
+		}
+		if len(fsc.excludes) > 0 {
+			params.Add("_source_exclude", strings.Join(fsc.excludes, ","))
+		}
+	} else {
 		params.Add("_source", "false")
-		return params
-	}
-	if len(fsc.includes) > 0 {
-		params.Add("_source_include", strings.Join(fsc.includes, ","))
-	}
-	if len(fsc.excludes) > 0 {
-		params.Add("_source_exclude", strings.Join(fsc.excludes, ","))
 	}
 	return params
 }
-- 
cgit v1.2.3-1-g7c22