diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52e0db1..82caa1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
# Changelog for gCube Catalogue (gCat) Client
+## [v2.3.0-SNAPSHOT]
+
+- Removed service discovery to to old service class
+- Using renamed constant from gcat-api
+
+
## [v2.2.0]
- Added support to manage configurations [#22658]
diff --git a/pom.xml b/pom.xml
index 12c842f..23fabb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
org.gcube.data-catalogue
gcat-client
- 2.2.0
+ 2.3.0-SNAPSHOT
gCube Catalogue (gCat) Client
gCube Catalogue (gCat) Client is a library designed to interact with gCat Service exposed REST API
diff --git a/src/main/java/org/gcube/gcat/client/Group.java b/src/main/java/org/gcube/gcat/client/Group.java
index b1a284a..9308e0f 100644
--- a/src/main/java/org/gcube/gcat/client/Group.java
+++ b/src/main/java/org/gcube/gcat/client/Group.java
@@ -28,7 +28,7 @@ public class Group extends GCatClient implements org.gcube.gcat.api.interfaces.G
@Override
public int count() throws WebServiceException {
Map queryParams = new HashMap<>();
- queryParams.put(GCatConstants.COUNT_PARAMETER, String.valueOf(true));
+ queryParams.put(GCatConstants.COUNT_QUERY_PARAMETER, String.valueOf(true));
String ret = this.list(queryParams);
ObjectMapper objectMapper = new ObjectMapper();
try {
@@ -44,8 +44,8 @@ public class Group extends GCatClient implements org.gcube.gcat.api.interfaces.G
@Override
public String list(int limit, int offset) throws WebApplicationException {
Map queryParams = new HashMap<>();
- queryParams.put(GCatConstants.LIMIT_PARAMETER, String.valueOf(limit));
- queryParams.put(GCatConstants.OFFSET_PARAMETER, String.valueOf(offset));
+ queryParams.put(GCatConstants.LIMIT_QUERY_PARAMETER, String.valueOf(limit));
+ queryParams.put(GCatConstants.OFFSET_QUERY_PARAMETER, String.valueOf(offset));
return super.list(queryParams);
}
diff --git a/src/main/java/org/gcube/gcat/client/Item.java b/src/main/java/org/gcube/gcat/client/Item.java
index 51cb886..2c5a375 100644
--- a/src/main/java/org/gcube/gcat/client/Item.java
+++ b/src/main/java/org/gcube/gcat/client/Item.java
@@ -30,7 +30,7 @@ public class Item extends GCatClient implements org.gcube.gcat.api.interfaces.It
public int count() throws WebServiceException {
Map queryParams = new HashMap<>();
- queryParams.put(GCatConstants.COUNT_PARAMETER, String.valueOf(true));
+ queryParams.put(GCatConstants.COUNT_QUERY_PARAMETER, String.valueOf(true));
String ret = this.list(queryParams);
ObjectMapper objectMapper = new ObjectMapper();
try {
@@ -52,8 +52,8 @@ public class Item extends GCatClient implements org.gcube.gcat.api.interfaces.It
@Override
public String list(int limit, int offset) throws WebApplicationException {
Map queryParams = new HashMap<>();
- queryParams.put(GCatConstants.LIMIT_PARAMETER, String.valueOf(limit));
- queryParams.put(GCatConstants.OFFSET_PARAMETER, String.valueOf(offset));
+ queryParams.put(GCatConstants.LIMIT_QUERY_PARAMETER, String.valueOf(limit));
+ queryParams.put(GCatConstants.OFFSET_QUERY_PARAMETER, String.valueOf(offset));
return this.list(queryParams);
}
@@ -67,8 +67,8 @@ public class Item extends GCatClient implements org.gcube.gcat.api.interfaces.It
*/
public String list(int limit, int offset, String organizationName) throws WebApplicationException {
Map queryParams = new HashMap<>();
- queryParams.put(GCatConstants.LIMIT_PARAMETER, String.valueOf(limit));
- queryParams.put(GCatConstants.OFFSET_PARAMETER, String.valueOf(offset));
+ queryParams.put(GCatConstants.LIMIT_QUERY_PARAMETER, String.valueOf(limit));
+ queryParams.put(GCatConstants.OFFSET_QUERY_PARAMETER, String.valueOf(offset));
queryParams.put(GCatConstants.Q_KEY, String.format(GCatConstants.ORGANIZATION_FILTER_TEMPLATE, organizationName));
return super.list(queryParams);
}
diff --git a/src/main/java/org/gcube/gcat/client/Organization.java b/src/main/java/org/gcube/gcat/client/Organization.java
index b31e9bc..449be21 100644
--- a/src/main/java/org/gcube/gcat/client/Organization.java
+++ b/src/main/java/org/gcube/gcat/client/Organization.java
@@ -28,7 +28,7 @@ public class Organization extends GCatClient implements org.gcube.gcat.api.inter
@Override
public int count() throws WebServiceException {
Map queryParams = new HashMap<>();
- queryParams.put(GCatConstants.COUNT_PARAMETER, String.valueOf(true));
+ queryParams.put(GCatConstants.COUNT_QUERY_PARAMETER, String.valueOf(true));
String ret = this.list(queryParams);
ObjectMapper objectMapper = new ObjectMapper();
try {
@@ -44,8 +44,8 @@ public class Organization extends GCatClient implements org.gcube.gcat.api.inter
@Override
public String list(int limit, int offset) throws WebApplicationException {
Map queryParams = new HashMap<>();
- queryParams.put(GCatConstants.LIMIT_PARAMETER, String.valueOf(limit));
- queryParams.put(GCatConstants.OFFSET_PARAMETER, String.valueOf(offset));
+ queryParams.put(GCatConstants.LIMIT_QUERY_PARAMETER, String.valueOf(limit));
+ queryParams.put(GCatConstants.OFFSET_QUERY_PARAMETER, String.valueOf(offset));
return super.list(queryParams);
}
diff --git a/src/main/java/org/gcube/gcat/client/Profile.java b/src/main/java/org/gcube/gcat/client/Profile.java
index 582422f..1d431d7 100644
--- a/src/main/java/org/gcube/gcat/client/Profile.java
+++ b/src/main/java/org/gcube/gcat/client/Profile.java
@@ -31,7 +31,7 @@ public class Profile extends GCatClient implements org.gcube.gcat.api.interfaces
@Override
public int count() throws WebServiceException {
Map queryParams = new HashMap<>();
- queryParams.put(GCatConstants.COUNT_PARAMETER, String.valueOf(true));
+ queryParams.put(GCatConstants.COUNT_QUERY_PARAMETER, String.valueOf(true));
String ret = this.list(queryParams);
ObjectMapper objectMapper = new ObjectMapper();
try {