Ported count method from version 1.2.2 to 2.0.0-SNAPSHOT

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]
 
 

pom.xml

@@ -26,7 +26,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-bom</artifactId>
-				<version>2.0.0-SNAPSHOT</version>
+				<version>2.0.1</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

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";

src/main/java/org/gcube/gcat/api/interfaces/Group.java

@@ -7,8 +7,10 @@ import javax.xml.ws.WebServiceException;
  */
 public interface Group<C,D> extends CRUD<C,D> {
 	
-	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;

src/main/java/org/gcube/gcat/api/interfaces/Item.java

@@ -9,8 +9,10 @@ import javax.xml.ws.WebServiceException;
  */
 public interface Item<C,D> extends CRUD<C,D> {
 	
-	String ITEMS = "items";
-
+	public static final String ITEMS = "items";
+	
+	public int count() throws WebServiceException;
+	
 	public String list(Map<String,String> parameters) throws WebServiceException;
 	
 	public String list(int limit, int offset) throws WebServiceException;

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();
 	

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();
 	

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<C,D> extends CRUD<C,D> {
 	
-	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);

src/main/java/org/gcube/gcat/api/interfaces/Profile.java

@@ -5,10 +5,12 @@ package org.gcube.gcat.api.interfaces;
  */
 public interface Profile<C,D> {
 	
-	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);

src/main/java/org/gcube/gcat/api/interfaces/Resource.java

@@ -5,7 +5,7 @@ package org.gcube.gcat.api.interfaces;
  */
 public interface Resource<C,D> {
 	
-	String RESOURCES = "resources";
+	public static final String RESOURCES = "resources";
 	
 	public String list(String itemID);
 	

src/main/java/org/gcube/gcat/api/interfaces/User.java

@@ -5,7 +5,7 @@ package org.gcube.gcat.api.interfaces;
  */
 public interface User<C,D> extends CRUD<C,D> {
 	
-	String USERS = "users";
+	public static final String USERS = "users";
 
 	public String list();