From 961c04cae992eadb42d286d2f85f8a675bdc68c8 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Mon, 29 Jan 2018 14:17:40 -0800 Subject: Upgrading server dependancies (#8154) --- .../gopkg.in/olivere/elastic.v5/search_queries_percolator.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'vendor/gopkg.in/olivere/elastic.v5/search_queries_percolator.go') diff --git a/vendor/gopkg.in/olivere/elastic.v5/search_queries_percolator.go b/vendor/gopkg.in/olivere/elastic.v5/search_queries_percolator.go index 16f7611ed..a7605655b 100644 --- a/vendor/gopkg.in/olivere/elastic.v5/search_queries_percolator.go +++ b/vendor/gopkg.in/olivere/elastic.v5/search_queries_percolator.go @@ -9,10 +9,10 @@ import "errors" // PercolatorQuery can be used to match queries stored in an index. // // For more details, see -// https://www.elastic.co/guide/en/elasticsearch/reference/5.x/query-dsl-percolate-query.html +// https://www.elastic.co/guide/en/elasticsearch/reference/6.0/query-dsl-percolate-query.html type PercolatorQuery struct { field string - documentType string + documentType string // deprecated document interface{} indexedDocumentIndex string indexedDocumentType string @@ -32,6 +32,7 @@ func (q *PercolatorQuery) Field(field string) *PercolatorQuery { return q } +// Deprecated: DocumentType is deprecated as of 6.0. func (q *PercolatorQuery) DocumentType(typ string) *PercolatorQuery { q.documentType = typ return q @@ -77,9 +78,6 @@ func (q *PercolatorQuery) Source() (interface{}, error) { if len(q.field) == 0 { return nil, errors.New("elastic: Field is required in PercolatorQuery") } - if len(q.documentType) == 0 { - return nil, errors.New("elastic: DocumentType is required in PercolatorQuery") - } if q.document == nil { return nil, errors.New("elastic: Document is required in PercolatorQuery") } @@ -91,7 +89,9 @@ func (q *PercolatorQuery) Source() (interface{}, error) { params := make(map[string]interface{}) source["percolate"] = params params["field"] = q.field - params["document_type"] = q.documentType + if q.documentType != "" { + params["document_type"] = q.documentType + } params["document"] = q.document if len(q.indexedDocumentIndex) > 0 { params["index"] = q.indexedDocumentIndex -- cgit v1.2.3-1-g7c22