Merge pull request #140 from kuzzleio/index-queryoptions

Add query options argument in all Go/CGO/C++ functions
kuzzleio · Mar 28, 2018 · a906029 · a906029
2 parents 29965aa + 15ee523
commit a906029
Show file tree

Hide file tree

Showing 21 changed files with 102 additions and 102 deletions.
diff --git a/index/create.go b/index/create.go
@@ -5,7 +5,7 @@ import (
 )
 
 // Create a new empty data index, with no associated mapping.
-func (i *Index) Create(index string) error {
+func (i *Index) Create(index string, options types.QueryOptions) error {
 	if index == "" {
 		return types.NewError("Index.Create: index required", 400)
 	}
@@ -17,7 +17,7 @@ func (i *Index) Create(index string) error {
 		Controller: "index",
 		Action:     "create",
 	}
-	go i.kuzzle.Query(query, nil, result)
+	go i.kuzzle.Query(query, options, result)
 
 	res := <-result
 

diff --git a/index/create_test.go b/index/create_test.go
@@ -16,7 +16,7 @@ import (
 func TestCreateNull(t *testing.T) {
 	k, _ := kuzzle.NewKuzzle(&internal.MockedConnection{}, nil)
 	i := index.NewIndex(k)
-	err := i.Create("")
+	err := i.Create("", nil)
 	assert.NotNil(t, err)
 }
 
@@ -28,7 +28,7 @@ func TestCreateQueryError(t *testing.T) {
 	}
 	k, _ := kuzzle.NewKuzzle(c, nil)
 	i := index.NewIndex(k)
-	err := i.Create("index")
+	err := i.Create("index", nil)
 	assert.NotNil(t, err)
 }
 
@@ -52,7 +52,7 @@ func TestCreate(t *testing.T) {
 	}
 	k, _ := kuzzle.NewKuzzle(c, nil)
 	i := index.NewIndex(k)
-	err := i.Create("index")
+	err := i.Create("index", nil)
 
 	assert.Nil(t, err)
 }
@@ -61,7 +61,7 @@ func ExampleIndex_Create() {
 	conn := websocket.NewWebSocket("localhost:7512", nil)
 	k, _ := kuzzle.NewKuzzle(conn, nil)
 	i := index.NewIndex(k)
-	err := i.Create("index")
+	err := i.Create("index", nil)
 	if err != nil {
 		fmt.Println(err.Error())
 		return

diff --git a/index/delete.go b/index/delete.go
@@ -3,7 +3,7 @@ package index
 import "github.com/kuzzleio/sdk-go/types"
 
 // Delete the given index
-func (i *Index) Delete(index string) error {
+func (i *Index) Delete(index string, options types.QueryOptions) error {
 	if index == "" {
 		return types.NewError("Index.Delete: index required", 400)
 	}
@@ -15,7 +15,7 @@ func (i *Index) Delete(index string) error {
 		Controller: "index",
 		Action:     "delete",
 	}
-	go i.kuzzle.Query(query, nil, result)
+	go i.kuzzle.Query(query, options, result)
 
 	res := <-result
 

diff --git a/index/delete_test.go b/index/delete_test.go
@@ -16,7 +16,7 @@ import (
 func TestDeleteNull(t *testing.T) {
 	k, _ := kuzzle.NewKuzzle(&internal.MockedConnection{}, nil)
 	i := index.NewIndex(k)
-	err := i.Delete("")
+	err := i.Delete("", nil)
 	assert.NotNil(t, err)
 }
 
@@ -28,7 +28,7 @@ func TestDeleteQueryError(t *testing.T) {
 	}
 	k, _ := kuzzle.NewKuzzle(c, nil)
 	i := index.NewIndex(k)
-	err := i.Delete("index")
+	err := i.Delete("index", nil)
 	assert.NotNil(t, err)
 }
 
@@ -52,7 +52,7 @@ func TestDelete(t *testing.T) {
 	}
 	k, _ := kuzzle.NewKuzzle(c, nil)
 	i := index.NewIndex(k)
-	err := i.Delete("index")
+	err := i.Delete("index", nil)
 
 	assert.Nil(t, err)
 }
@@ -61,8 +61,8 @@ func ExampleIndex_Delete() {
 	conn := websocket.NewWebSocket("localhost:7512", nil)
 	k, _ := kuzzle.NewKuzzle(conn, nil)
 	i := index.NewIndex(k)
-	i.Create("index")
-	err := i.Delete("index")
+	i.Create("index", nil)
+	err := i.Delete("index", nil)
 	if err != nil {
 		fmt.Println(err.Error())
 		return

diff --git a/index/exists.go b/index/exists.go
@@ -8,7 +8,7 @@ import (
 )
 
 // Exists check if the index exists
-func (i *Index) Exists(index string) (bool, error) {
+func (i *Index) Exists(index string, options types.QueryOptions) (bool, error) {
 	if index == "" {
 		return false, types.NewError("Index.Exists: index required", 400)
 	}
@@ -21,7 +21,7 @@ func (i *Index) Exists(index string) (bool, error) {
 		Action:     "exists",
 	}
 
-	go i.kuzzle.Query(query, nil, result)
+	go i.kuzzle.Query(query, options, result)
 
 	res := <-result
 

diff --git a/index/exists_test.go b/index/exists_test.go
@@ -16,7 +16,7 @@ import (
 func TestExistsNull(t *testing.T) {
 	k, _ := kuzzle.NewKuzzle(&internal.MockedConnection{}, nil)
 	i := index.NewIndex(k)
-	_, err := i.Exists("")
+	_, err := i.Exists("", nil)
 	assert.NotNil(t, err)
 }
 
@@ -28,7 +28,7 @@ func TestExistsQueryError(t *testing.T) {
 	}
 	k, _ := kuzzle.NewKuzzle(c, nil)
 	i := index.NewIndex(k)
-	_, err := i.Exists("index")
+	_, err := i.Exists("index", nil)
 	assert.NotNil(t, err)
 }
 
@@ -53,7 +53,7 @@ func TestExists(t *testing.T) {
 
 	k, _ := kuzzle.NewKuzzle(c, nil)
 	i := index.NewIndex(k)
-	res, err := i.Exists("index")
+	res, err := i.Exists("index", nil)
 
 	assert.Nil(t, err)
 	assert.NotNil(t, res)
@@ -64,8 +64,8 @@ func ExampleIndex_Exists() {
 	conn := websocket.NewWebSocket("localhost:7512", nil)
 	k, _ := kuzzle.NewKuzzle(conn, nil)
 	i := index.NewIndex(k)
-	i.Create("index")
-	_, err := i.Exists("index")
+	i.Create("index", nil)
+	_, err := i.Exists("index", nil)
 	if err != nil {
 		fmt.Println(err.Error())
 		return

diff --git a/index/getAutoRefresh.go b/index/getAutoRefresh.go
@@ -7,7 +7,7 @@ import (
 	"github.com/kuzzleio/sdk-go/types"
 )
 
-func (i *Index) GetAutoRefresh(index string) (bool, error) {
+func (i *Index) GetAutoRefresh(index string, options types.QueryOptions) (bool, error) {
 	if index == "" {
 		return false, types.NewError("Index.GetAutoRefresh: index required", 400)
 	}

diff --git a/index/getAutoRefresh_test.go b/index/getAutoRefresh_test.go
@@ -16,7 +16,7 @@ import (
 func TestGetAutoRefreshNull(t *testing.T) {
 	k, _ := kuzzle.NewKuzzle(&internal.MockedConnection{}, nil)
 	i := index.NewIndex(k)
-	_, err := i.GetAutoRefresh("")
+	_, err := i.GetAutoRefresh("", nil)
 	assert.NotNil(t, err)
 }
 
@@ -28,7 +28,7 @@ func TestGetAutoRefreshQueryError(t *testing.T) {
 	}
 	k, _ := kuzzle.NewKuzzle(c, nil)
 	i := index.NewIndex(k)
-	_, err := i.GetAutoRefresh("index")
+	_, err := i.GetAutoRefresh("index", nil)
 	assert.NotNil(t, err)
 }
 
@@ -53,7 +53,7 @@ func TestGetAutoRefresh(t *testing.T) {
 
 	k, _ := kuzzle.NewKuzzle(c, nil)
 	i := index.NewIndex(k)
-	_, err := i.GetAutoRefresh("index")
+	_, err := i.GetAutoRefresh("index", nil)
 
 	assert.Nil(t, err)
 }
@@ -62,8 +62,8 @@ func ExampleIndex_GetAutoRefresh() {
 	conn := websocket.NewWebSocket("localhost:7512", nil)
 	k, _ := kuzzle.NewKuzzle(conn, nil)
 	i := index.NewIndex(k)
-	i.Create("index")
-	_, err := i.GetAutoRefresh("index")
+	i.Create("index", nil)
+	_, err := i.GetAutoRefresh("index", nil)
 	if err != nil {
 		fmt.Println(err.Error())
 		return

diff --git a/index/list.go b/index/list.go
@@ -8,15 +8,15 @@ import (
 )
 
 // List list all index
-func (i *Index) List() ([]string, error) {
+func (i *Index) List(options types.QueryOptions) ([]string, error) {
 	result := make(chan *types.KuzzleResponse)
 
 	query := &types.KuzzleRequest{
 		Controller: "index",
 		Action:     "list",
 	}
 
-	go i.kuzzle.Query(query, nil, result)
+	go i.kuzzle.Query(query, options, result)
 
 	res := <-result
 

diff --git a/index/list_test.go b/index/list_test.go
@@ -21,7 +21,7 @@ func TestListError(t *testing.T) {
 	k, _ := kuzzle.NewKuzzle(c, nil)
 
 	i := index.NewIndex(k)
-	_, err := i.List()
+	_, err := i.List(nil)
 	assert.NotNil(t, err)
 	assert.Equal(t, "Unit test error", err.(*types.KuzzleError).Message)
 }
@@ -44,7 +44,7 @@ func TestList(t *testing.T) {
 	k, _ := kuzzle.NewKuzzle(c, nil)
 
 	i := index.NewIndex(k)
-	res, err := i.List()
+	res, err := i.List(nil)
 	expectedResponse := []string{"index_1", "index_2"}
 	assert.Nil(t, err)
 	assert.NotNil(t, res)
@@ -56,7 +56,7 @@ func ExampleIndex_List() {
 	k, _ := kuzzle.NewKuzzle(c, nil)
 
 	i := index.NewIndex(k)
-	res, err := i.List()
+	res, err := i.List(nil)
 
 	if err != nil {
 		fmt.Println(err.Error())

diff --git a/index/mDelete.go b/index/mDelete.go
@@ -8,7 +8,7 @@ import (
 )
 
 // Delete delete the index
-func (i *Index) MDelete(indexes []string) ([]string, error) {
+func (i *Index) MDelete(indexes []string, options types.QueryOptions) ([]string, error) {
 	if len(indexes) == 0 {
 		return nil, types.NewError("Index.MDelete: at least one index required", 400)
 	}
@@ -20,7 +20,7 @@ func (i *Index) MDelete(indexes []string) ([]string, error) {
 		Action:     "mDelete",
 		Body:       indexes,
 	}
-	go i.kuzzle.Query(query, nil, result)
+	go i.kuzzle.Query(query, options, result)
 
 	res := <-result
 

diff --git a/index/mDelete_test.go b/index/mDelete_test.go
@@ -17,7 +17,7 @@ func TestMDeleteNull(t *testing.T) {
 	k, _ := kuzzle.NewKuzzle(&internal.MockedConnection{}, nil)
 	i := index.NewIndex(k)
 	indexes := []string{}
-	_, err := i.MDelete(indexes)
+	_, err := i.MDelete(indexes, nil)
 	assert.NotNil(t, err)
 }
 
@@ -30,7 +30,7 @@ func TestMDeleteQueryError(t *testing.T) {
 	k, _ := kuzzle.NewKuzzle(c, nil)
 	i := index.NewIndex(k)
 	indexes := []string{"index"}
-	_, err := i.MDelete(indexes)
+	_, err := i.MDelete(indexes, nil)
 	assert.NotNil(t, err)
 }
 
@@ -55,7 +55,7 @@ func TestMDelete(t *testing.T) {
 	k, _ := kuzzle.NewKuzzle(c, nil)
 	i := index.NewIndex(k)
 	indexes := []string{"index1"}
-	res, err := i.MDelete(indexes)
+	res, err := i.MDelete(indexes, nil)
 
 	assert.Nil(t, err)
 	assert.NotNil(t, res)
@@ -66,13 +66,13 @@ func ExampleIndex_MDelete() {
 	conn := websocket.NewWebSocket("localhost:7512", nil)
 	k, _ := kuzzle.NewKuzzle(conn, nil)
 	i := index.NewIndex(k)
-	i.Create("index1")
-	i.Create("index2")
+	i.Create("index1", nil)
+	i.Create("index2", nil)
 	indexes := []string{
 		"index1",
 		"index2",
 	}
-	_, err := i.MDelete(indexes)
+	_, err := i.MDelete(indexes, nil)
 	if err != nil {
 		fmt.Println(err.Error())
 		return

diff --git a/index/refresh.go b/index/refresh.go
@@ -4,7 +4,7 @@ import (
 	"github.com/kuzzleio/sdk-go/types"
 )
 
-func (i *Index) Refresh(index string) error {
+func (i *Index) Refresh(index string, options types.QueryOptions) error {
 	if index == "" {
 		return types.NewError("Index.Refresh: index required", 400)
 	}
@@ -16,7 +16,7 @@ func (i *Index) Refresh(index string) error {
 		Action:     "refresh",
 		Index:      index,
 	}
-	go i.kuzzle.Query(query, nil, result)
+	go i.kuzzle.Query(query, options, result)
 
 	res := <-result
 

diff --git a/index/refreshInternal.go b/index/refreshInternal.go
@@ -2,15 +2,15 @@ package index
 
 import "github.com/kuzzleio/sdk-go/types"
 
-func (i *Index) RefreshInternal() error {
+func (i *Index) RefreshInternal(options types.QueryOptions) error {
 
 	result := make(chan *types.KuzzleResponse)
 
 	query := &types.KuzzleRequest{
 		Controller: "index",
 		Action:     "refreshInternal",
 	}
-	go i.kuzzle.Query(query, nil, result)
+	go i.kuzzle.Query(query, options, result)
 
 	res := <-result
 

diff --git a/index/refreshInternal_test.go b/index/refreshInternal_test.go
@@ -21,7 +21,7 @@ func TestRefreshInternalQueryError(t *testing.T) {
 	}
 	k, _ := kuzzle.NewKuzzle(c, nil)
 	i := index.NewIndex(k)
-	err := i.RefreshInternal()
+	err := i.RefreshInternal(nil)
 	assert.NotNil(t, err)
 }
 
@@ -44,7 +44,7 @@ func TestRefreshInternal(t *testing.T) {
 	}
 	k, _ := kuzzle.NewKuzzle(c, nil)
 	i := index.NewIndex(k)
-	err := i.RefreshInternal()
+	err := i.RefreshInternal(nil)
 
 	assert.Nil(t, err)
 }
@@ -53,7 +53,7 @@ func ExampleIndex_RefreshInternal() {
 	conn := websocket.NewWebSocket("localhost:7512", nil)
 	k, _ := kuzzle.NewKuzzle(conn, nil)
 	i := index.NewIndex(k)
-	err := i.RefreshInternal()
+	err := i.RefreshInternal(nil)
 	if err != nil {
 		fmt.Println(err.Error())
 		return