(iceberg-go) branch main updated: fix(rest): rename page-size & page-token query params (#372)

[zeroshade]

This is an automated email from the ASF dual-hosted git repository.

zeroshade pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg-go.git


The following commit(s) were added to refs/heads/main by this push:
     new 80db7b7  fix(rest): rename page-size & page-token query params (#372)
80db7b7 is described below

commit 80db7b712d74a30fe92d03c5dab43da718761dcd
Author: jwtryg <136602430+jwt...@users.noreply.github.com>
AuthorDate: Wed Apr 2 17:35:43 2025 +0200

    fix(rest): rename page-size & page-token query params (#372)
    
    fixes https://github.com/apache/iceberg-go/issues/371
---
 catalog/rest/rest.go      |  8 ++++----
 catalog/rest/rest_test.go | 28 ++++++++++++++--------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/catalog/rest/rest.go b/catalog/rest/rest.go
index 5eb870f..133ae4c 100644
--- a/catalog/rest/rest.go
+++ b/catalog/rest/rest.go
@@ -697,10 +697,10 @@ func (r *Catalog) listTablesPage(ctx context.Context, 
namespace table.Identifier
 
        v := url.Values{}
        if pageSize >= 0 {
-               v.Set("page-size", strconv.Itoa(pageSize))
+               v.Set("pageSize", strconv.Itoa(pageSize))
        }
        if pageToken != "" {
-               v.Set("page-token", pageToken)
+               v.Set("pageToken", pageToken)
        }
 
        uri.RawQuery = v.Encode()
@@ -1089,10 +1089,10 @@ func (r *Catalog) listViewsPage(ctx context.Context, 
namespace table.Identifier,
 
        v := url.Values{}
        if pageSize >= 0 {
-               v.Set("page-size", strconv.Itoa(pageSize))
+               v.Set("pageSize", strconv.Itoa(pageSize))
        }
        if pageToken != "" {
-               v.Set("page-token", pageToken)
+               v.Set("pageToken", pageToken)
        }
 
        uri.RawQuery = v.Encode()
diff --git a/catalog/rest/rest_test.go b/catalog/rest/rest_test.go
index b397db7..93ffebf 100644
--- a/catalog/rest/rest_test.go
+++ b/catalog/rest/rest_test.go
@@ -242,8 +242,8 @@ func (r *RestCatalogSuite) TestListTables200() {
                for k, v := range TestHeaders {
                        r.Equal(v, req.Header.Values(k))
                }
-               pageToken := req.URL.Query().Get("page-token")
-               pageSize := req.URL.Query().Get("page-size")
+               pageToken := req.URL.Query().Get("pageToken")
+               pageSize := req.URL.Query().Get("pageSize")
                r.Equal("", pageToken)
                r.Equal(strconv.Itoa(customPageSize), pageSize)
                json.NewEncoder(w).Encode(map[string]any{
@@ -307,8 +307,8 @@ func (r *RestCatalogSuite) TestListTablesPrefixed200() {
                for k, v := range TestHeaders {
                        r.Equal(v, req.Header.Values(k))
                }
-               pageToken := req.URL.Query().Get("page-token")
-               pageSize := req.URL.Query().Get("page-size")
+               pageToken := req.URL.Query().Get("pageToken")
+               pageSize := req.URL.Query().Get("pageSize")
                r.Equal("", pageToken)
                r.Equal(strconv.Itoa(defaultPageSize), pageSize)
 
@@ -357,8 +357,8 @@ func (r *RestCatalogSuite) TestListTablesPagination() {
                        r.Equal(v, req.Header.Values(k))
                }
 
-               pageToken := req.URL.Query().Get("page-token")
-               pageSize := req.URL.Query().Get("page-size")
+               pageToken := req.URL.Query().Get("pageToken")
+               pageSize := req.URL.Query().Get("pageSize")
                r.Equal(strconv.Itoa(defaultPageSize), pageSize)
 
                var response map[string]any
@@ -439,7 +439,7 @@ func (r *RestCatalogSuite) 
TestListTablesPaginationErrorOnSubsequentPage() {
                        r.Equal(v, req.Header.Values(k))
                }
 
-               pageToken := req.URL.Query().Get("page-token")
+               pageToken := req.URL.Query().Get("pageToken")
 
                // First page succeeds
                if pageToken == "" {
@@ -512,8 +512,8 @@ func (r *RestCatalogSuite) TestListTables404() {
                        r.Equal(v, req.Header.Values(k))
                }
 
-               pageToken := req.URL.Query().Get("page-token")
-               pageSize := req.URL.Query().Get("page-size")
+               pageToken := req.URL.Query().Get("pageToken")
+               pageSize := req.URL.Query().Get("pageSize")
                r.Equal("", pageToken)
                r.Equal(strconv.Itoa(defaultPageSize), pageSize)
                w.WriteHeader(http.StatusNotFound)
@@ -1544,8 +1544,8 @@ func (r *RestCatalogSuite) TestListViews200() {
                        r.Equal(v, req.Header.Values(k))
                }
 
-               pageToken := req.URL.Query().Get("page-token")
-               pageSize := req.URL.Query().Get("page-size")
+               pageToken := req.URL.Query().Get("pageToken")
+               pageSize := req.URL.Query().Get("pageSize")
                r.Equal("", pageToken)
                r.Equal(strconv.Itoa(customPageSize), pageSize)
 
@@ -1597,8 +1597,8 @@ func (r *RestCatalogSuite) TestListViewsPagination() {
                        r.Equal(v, req.Header.Values(k))
                }
 
-               pageToken := req.URL.Query().Get("page-token")
-               pageSize := req.URL.Query().Get("page-size")
+               pageToken := req.URL.Query().Get("pageToken")
+               pageSize := req.URL.Query().Get("pageSize")
                r.Equal(strconv.Itoa(defaultPageSize), pageSize)
 
                var response map[string]any
@@ -1679,7 +1679,7 @@ func (r *RestCatalogSuite) 
TestListViewsPaginationErrorOnSubsequentPage() {
                        r.Equal(v, req.Header.Values(k))
                }
 
-               pageToken := req.URL.Query().Get("page-token")
+               pageToken := req.URL.Query().Get("pageToken")
 
                // First page succeeds
                if pageToken == "" {