From e71a91f217ec2e555a0a80eccb56982fee5de4db Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Tue, 9 Feb 2021 15:46:45 +0100 Subject: [PATCH 1/3] Ported count method from version 1.2.2 to 2.0.0-SNAPSHOT --- CHANGELOG.md | 7 ++++++- pom.xml | 2 +- src/main/java/org/gcube/gcat/api/GCatConstants.java | 5 ++++- src/main/java/org/gcube/gcat/api/interfaces/Group.java | 4 +++- src/main/java/org/gcube/gcat/api/interfaces/Item.java | 6 ++++-- src/main/java/org/gcube/gcat/api/interfaces/License.java | 2 +- .../java/org/gcube/gcat/api/interfaces/Namespace.java | 2 +- .../java/org/gcube/gcat/api/interfaces/Organization.java | 8 ++++++-- src/main/java/org/gcube/gcat/api/interfaces/Profile.java | 4 +++- src/main/java/org/gcube/gcat/api/interfaces/Resource.java | 2 +- src/main/java/org/gcube/gcat/api/interfaces/User.java | 2 +- 11 files changed, 31 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf87878..64aefc7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,14 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for gCube Catalogue (gCat) API +## [v2.0.0-SNAPSHOT] -## [v2.0.0-SNAPSHOT] [r5.0.0] - + +## [v1.2.2] + +- Added count method for Item collection [#20627] +- Added count method for Organization, Group and Profile collection [#20629] - Switched JSON management to gcube-jackson [#19735] diff --git a/pom.xml b/pom.xml index b00c07f..b91fd1f 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.gcube.distribution gcube-bom - 2.0.0-SNAPSHOT + 2.0.1 pom import diff --git a/src/main/java/org/gcube/gcat/api/GCatConstants.java b/src/main/java/org/gcube/gcat/api/GCatConstants.java index 9f3d743..2b2e63d 100644 --- a/src/main/java/org/gcube/gcat/api/GCatConstants.java +++ b/src/main/java/org/gcube/gcat/api/GCatConstants.java @@ -2,7 +2,7 @@ package org.gcube.gcat.api; public class GCatConstants { - public static final String SERVICE_CLASS = "DataPublishing"; + public static final String SERVICE_CLASS = "data-catalogue"; public static final String SERVICE_NAME = "gcat"; public static final String SERVICE_ENTRY_NAME = "org.gcube.gcat.ResourceInitializer"; @@ -10,6 +10,9 @@ public class GCatConstants { public static final String APPLICATION_JSON_CHARSET_UTF_8 = "application/json;charset=UTF-8"; public static final String LIMIT_PARAMETER = "limit"; public static final String OFFSET_PARAMETER = "offset"; + public static final String COUNT_PARAMETER = "count"; + + public static final String COUNT_KEY = "count"; public static final String ORGANIZATION_PARAMETER = "organization"; public static final String Q_KEY = "q"; diff --git a/src/main/java/org/gcube/gcat/api/interfaces/Group.java b/src/main/java/org/gcube/gcat/api/interfaces/Group.java index 679464c..a4afee9 100644 --- a/src/main/java/org/gcube/gcat/api/interfaces/Group.java +++ b/src/main/java/org/gcube/gcat/api/interfaces/Group.java @@ -7,8 +7,10 @@ import javax.xml.ws.WebServiceException; */ public interface Group extends CRUD { - String GROUPS = "groups"; + public static final String GROUPS = "groups"; + public int count() throws WebServiceException; + public String list(int limit, int offset) throws WebServiceException; public String patch(String name, String json) throws WebServiceException; diff --git a/src/main/java/org/gcube/gcat/api/interfaces/Item.java b/src/main/java/org/gcube/gcat/api/interfaces/Item.java index 6e55b07..576e9a4 100644 --- a/src/main/java/org/gcube/gcat/api/interfaces/Item.java +++ b/src/main/java/org/gcube/gcat/api/interfaces/Item.java @@ -9,8 +9,10 @@ import javax.xml.ws.WebServiceException; */ public interface Item extends CRUD { - String ITEMS = "items"; - + public static final String ITEMS = "items"; + + public int count() throws WebServiceException; + public String list(Map parameters) throws WebServiceException; public String list(int limit, int offset) throws WebServiceException; diff --git a/src/main/java/org/gcube/gcat/api/interfaces/License.java b/src/main/java/org/gcube/gcat/api/interfaces/License.java index cb8631d..39b948a 100644 --- a/src/main/java/org/gcube/gcat/api/interfaces/License.java +++ b/src/main/java/org/gcube/gcat/api/interfaces/License.java @@ -5,7 +5,7 @@ package org.gcube.gcat.api.interfaces; */ public interface License { - String LICENSES = "licenses"; + public static final String LICENSES = "licenses"; public String list(); diff --git a/src/main/java/org/gcube/gcat/api/interfaces/Namespace.java b/src/main/java/org/gcube/gcat/api/interfaces/Namespace.java index 98fd5a6..f6e48c3 100644 --- a/src/main/java/org/gcube/gcat/api/interfaces/Namespace.java +++ b/src/main/java/org/gcube/gcat/api/interfaces/Namespace.java @@ -5,7 +5,7 @@ package org.gcube.gcat.api.interfaces; */ public interface Namespace { - String NAMESPACES = "namespaces"; + public static final String NAMESPACES = "namespaces"; public String list(); diff --git a/src/main/java/org/gcube/gcat/api/interfaces/Organization.java b/src/main/java/org/gcube/gcat/api/interfaces/Organization.java index d776838..e61441f 100644 --- a/src/main/java/org/gcube/gcat/api/interfaces/Organization.java +++ b/src/main/java/org/gcube/gcat/api/interfaces/Organization.java @@ -1,12 +1,16 @@ package org.gcube.gcat.api.interfaces; +import javax.xml.ws.WebServiceException; + /** * @author Luca Frosini (ISTI - CNR) */ public interface Organization extends CRUD { - String ORGANIZATIONS = "organizations"; - + public static final String ORGANIZATIONS = "organizations"; + + public int count() throws WebServiceException; + public String list(int limit, int offset); public String patch(String name, String json); diff --git a/src/main/java/org/gcube/gcat/api/interfaces/Profile.java b/src/main/java/org/gcube/gcat/api/interfaces/Profile.java index 4c7cfff..05da932 100644 --- a/src/main/java/org/gcube/gcat/api/interfaces/Profile.java +++ b/src/main/java/org/gcube/gcat/api/interfaces/Profile.java @@ -5,10 +5,12 @@ package org.gcube.gcat.api.interfaces; */ public interface Profile { - String PROFILES = "profiles"; + public static final String PROFILES = "profiles"; public static final String SCHEMA = "SCHEMA"; + public int count(); + public String list(); public C create(String name, String xml); diff --git a/src/main/java/org/gcube/gcat/api/interfaces/Resource.java b/src/main/java/org/gcube/gcat/api/interfaces/Resource.java index d32dccf..dbf073b 100644 --- a/src/main/java/org/gcube/gcat/api/interfaces/Resource.java +++ b/src/main/java/org/gcube/gcat/api/interfaces/Resource.java @@ -5,7 +5,7 @@ package org.gcube.gcat.api.interfaces; */ public interface Resource { - String RESOURCES = "resources"; + public static final String RESOURCES = "resources"; public String list(String itemID); diff --git a/src/main/java/org/gcube/gcat/api/interfaces/User.java b/src/main/java/org/gcube/gcat/api/interfaces/User.java index cde96f2..cc2c703 100644 --- a/src/main/java/org/gcube/gcat/api/interfaces/User.java +++ b/src/main/java/org/gcube/gcat/api/interfaces/User.java @@ -5,7 +5,7 @@ package org.gcube.gcat.api.interfaces; */ public interface User extends CRUD { - String USERS = "users"; + public static final String USERS = "users"; public String list(); From 66002d866ea41180ac55a638cd005d6313c5661f Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Tue, 9 Feb 2021 17:12:59 +0100 Subject: [PATCH 2/3] downgraded gcube-bom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b91fd1f..05390b8 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.gcube.distribution gcube-bom - 2.0.1 + 2.0.0 pom import From 95c4f6f951c47386b18fbd9423c0a336fc36e270 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 14 Apr 2021 14:54:57 +0200 Subject: [PATCH 3/3] Fixed changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64aefc7..4193674 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [v2.0.0-SNAPSHOT] - +- Changed service class ## [v1.2.2]