Merge pull request #27 from pib/allow_any_jsonable

Use interface{} so any JSON-encodable value can be passed in
This commit is contained in:
Jérôme Renard 2015-07-04 22:03:47 +02:00
commit c35de39565

14
goes.go
View File

@ -41,7 +41,7 @@ func (c *Connection) WithClient(cl *http.Client) *Connection {
} }
// CreateIndex creates a new index represented by a name and a mapping // CreateIndex creates a new index represented by a name and a mapping
func (c *Connection) CreateIndex(name string, mapping map[string]interface{}) (Response, error) { func (c *Connection) CreateIndex(name string, mapping interface{}) (Response, error) {
r := Request{ r := Request{
Conn: c, Conn: c,
Query: mapping, Query: mapping,
@ -196,7 +196,7 @@ func (c *Connection) BulkSend(documents []Document) (Response, error) {
} }
// Search executes a search query against an index // Search executes a search query against an index
func (c *Connection) Search(query map[string]interface{}, indexList []string, typeList []string, extraArgs url.Values) (Response, error) { func (c *Connection) Search(query interface{}, indexList []string, typeList []string, extraArgs url.Values) (Response, error) {
r := Request{ r := Request{
Conn: c, Conn: c,
Query: query, Query: query,
@ -211,7 +211,7 @@ func (c *Connection) Search(query map[string]interface{}, indexList []string, ty
} }
// Count executes a count query against an index, use the Count field in the response for the result // Count executes a count query against an index, use the Count field in the response for the result
func (c *Connection) Count(query map[string]interface{}, indexList []string, typeList []string, extraArgs url.Values) (Response, error) { func (c *Connection) Count(query interface{}, indexList []string, typeList []string, extraArgs url.Values) (Response, error) {
r := Request{ r := Request{
Conn: c, Conn: c,
Query: query, Query: query,
@ -228,7 +228,7 @@ func (c *Connection) Count(query map[string]interface{}, indexList []string, typ
//Query runs a query against an index using the provided http method. //Query runs a query against an index using the provided http method.
//This method can be used to execute a delete by query, just pass in "DELETE" //This method can be used to execute a delete by query, just pass in "DELETE"
//for the HTTP method. //for the HTTP method.
func (c *Connection) Query(query map[string]interface{}, indexList []string, typeList []string, httpMethod string, extraArgs url.Values) (Response, error) { func (c *Connection) Query(query interface{}, indexList []string, typeList []string, httpMethod string, extraArgs url.Values) (Response, error) {
r := Request{ r := Request{
Conn: c, Conn: c,
Query: query, Query: query,
@ -243,7 +243,7 @@ func (c *Connection) Query(query map[string]interface{}, indexList []string, typ
} }
// Scan starts scroll over an index // Scan starts scroll over an index
func (c *Connection) Scan(query map[string]interface{}, indexList []string, typeList []string, timeout string, size int) (Response, error) { func (c *Connection) Scan(query interface{}, indexList []string, typeList []string, timeout string, size int) (Response, error) {
v := url.Values{} v := url.Values{}
v.Add("search_type", "scan") v.Add("search_type", "scan")
v.Add("scroll", timeout) v.Add("scroll", timeout)
@ -459,7 +459,7 @@ func (b Bucket) Aggregation(name string) Aggregation {
} }
// PutMapping registers a specific mapping for one or more types in one or more indexes // PutMapping registers a specific mapping for one or more types in one or more indexes
func (c *Connection) PutMapping(typeName string, mapping map[string]interface{}, indexes []string) (Response, error) { func (c *Connection) PutMapping(typeName string, mapping interface{}, indexes []string) (Response, error) {
r := Request{ r := Request{
Conn: c, Conn: c,
@ -498,7 +498,7 @@ func (c *Connection) IndicesExist(indexes []string) (bool, error) {
return resp.Status == 200, err return resp.Status == 200, err
} }
func (c *Connection) Update(d Document, query map[string]interface{}, extraArgs url.Values) (Response, error) { func (c *Connection) Update(d Document, query interface{}, extraArgs url.Values) (Response, error) {
r := Request{ r := Request{
Conn: c, Conn: c,
Query: query, Query: query,