From cf0cafdcd6490a40007ee30d8c83f3216217da66 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Thu, 4 Feb 2021 09:40:33 +0100
Subject: [PATCH] Fixed changelog and version

---
 CHANGELOG.md                                  |  5 ++--
 pom.xml                                       | 28 +------------------
 src/main/java/org/gcube/gcat/rest/Group.java  |  2 +-
 src/main/java/org/gcube/gcat/rest/Item.java   |  2 +-
 .../org/gcube/gcat/rest/Organization.java     |  2 +-
 .../java/org/gcube/gcat/rest/Profile.java     |  2 +-
 6 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c57ac9..5d40362 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,8 +5,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## [v1.4.4-SNAPSHOT] 
 
-- Added count method for Item collection #20627
-- Added count method for Organization, Group and Profile collection #20629
+- Added count method for Item collection [#20627]
+- Added count method for Organization, Group and Profile collection [#20629]
+- Switched JSON management to gcube-jackson [#19735]
 
 
 ## [v1.4.3] [r4.23.0] - 2020-06-19
diff --git a/pom.xml b/pom.xml
index ae6996f..7f3feab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,23 +46,12 @@
 		<dependency>
 			<groupId>org.gcube.data-catalogue</groupId>
 			<artifactId>gcat-api</artifactId>
-			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
+			<version>[1.2.2-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 		</dependency>
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.apache.tika</groupId> -->
-<!-- 			<artifactId>tika-core</artifactId> -->
-<!-- 			<version>1.20</version> -->
-<!-- 		</dependency> -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 		</dependency>
-		
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.gcube.core</groupId> -->
-<!-- 			<artifactId>common-encryption</artifactId> -->
-<!-- 		</dependency> -->
-		
 		<dependency>
 			<groupId>org.gcube.data-catalogue</groupId>
 			<artifactId>gcubedatacatalogue-metadata-discovery</artifactId>
@@ -83,21 +72,6 @@
 			<groupId>org.glassfish.jersey.containers</groupId>
 			<artifactId>jersey-container-servlet</artifactId>
 		</dependency>
-
-		<!-- Required with jersey 2.27 <dependency> <groupId>org.glassfish.jersey.inject</groupId> 
-			<artifactId>jersey-hk2</artifactId> </dependency> -->
-
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.glassfish.jersey.media</groupId> -->
-<!-- 			<artifactId>jersey-media-multipart</artifactId> -->
-<!-- 		</dependency> -->
-
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.gcube.common</groupId> -->
-<!-- 			<artifactId>storagehub-client-library</artifactId> -->
-<!-- 			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> -->
-<!-- 		</dependency> -->
-
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>gxHTTP</artifactId>
diff --git a/src/main/java/org/gcube/gcat/rest/Group.java b/src/main/java/org/gcube/gcat/rest/Group.java
index a6ef71b..7403227 100644
--- a/src/main/java/org/gcube/gcat/rest/Group.java
+++ b/src/main/java/org/gcube/gcat/rest/Group.java
@@ -44,7 +44,7 @@ public class Group extends REST<CKANGroup> implements org.gcube.gcat.api.interfa
 	@Produces(ResourceInitializer.APPLICATION_JSON_CHARSET_UTF_8)
 	public String list(@QueryParam(GCatConstants.LIMIT_PARAMETER) @DefaultValue("10") int limit,
 			@QueryParam(GCatConstants.OFFSET_PARAMETER) @DefaultValue("0") int offset, 
-			@QueryParam(GCatConstants.COUNT_ONLY_PARAMETER) @DefaultValue("false") Boolean countOnly) {
+			@QueryParam(GCatConstants.COUNT_PARAMETER) @DefaultValue("false") Boolean countOnly) {
 		if(countOnly) {
 			int count = count();
 			return createCountJson(count);
diff --git a/src/main/java/org/gcube/gcat/rest/Item.java b/src/main/java/org/gcube/gcat/rest/Item.java
index 09f3ba1..6503d4b 100644
--- a/src/main/java/org/gcube/gcat/rest/Item.java
+++ b/src/main/java/org/gcube/gcat/rest/Item.java
@@ -55,7 +55,7 @@ public class Item extends REST<CKANPackage> implements org.gcube.gcat.api.interf
 	@Produces(ResourceInitializer.APPLICATION_JSON_CHARSET_UTF_8)
 	public String list(@QueryParam(GCatConstants.LIMIT_PARAMETER) @DefaultValue("10") int limit,
 			@QueryParam(GCatConstants.OFFSET_PARAMETER) @DefaultValue("0") int offset, 
-			@QueryParam(GCatConstants.COUNT_ONLY_PARAMETER) @DefaultValue("false") Boolean countOnly) {
+			@QueryParam(GCatConstants.COUNT_PARAMETER) @DefaultValue("false") Boolean countOnly) {
 		if(countOnly) {
 			int count = count();
 			return createCountJson(count);
diff --git a/src/main/java/org/gcube/gcat/rest/Organization.java b/src/main/java/org/gcube/gcat/rest/Organization.java
index e5eef1a..11b0d53 100644
--- a/src/main/java/org/gcube/gcat/rest/Organization.java
+++ b/src/main/java/org/gcube/gcat/rest/Organization.java
@@ -45,7 +45,7 @@ public class Organization extends REST<CKANOrganization>
 	@Produces(ResourceInitializer.APPLICATION_JSON_CHARSET_UTF_8)
 	public String list(@QueryParam(GCatConstants.LIMIT_PARAMETER) @DefaultValue("10") int limit,
 			@QueryParam(GCatConstants.OFFSET_PARAMETER) @DefaultValue("0") int offset, 
-			@QueryParam(GCatConstants.COUNT_ONLY_PARAMETER) @DefaultValue("false") Boolean countOnly) {
+			@QueryParam(GCatConstants.COUNT_PARAMETER) @DefaultValue("false") Boolean countOnly) {
 		if(countOnly) {
 			int count = count();
 			return createCountJson(count);
diff --git a/src/main/java/org/gcube/gcat/rest/Profile.java b/src/main/java/org/gcube/gcat/rest/Profile.java
index 2ba3daa..4b115a8 100644
--- a/src/main/java/org/gcube/gcat/rest/Profile.java
+++ b/src/main/java/org/gcube/gcat/rest/Profile.java
@@ -73,7 +73,7 @@ public class Profile extends BaseREST implements org.gcube.gcat.api.interfaces.P
 	
 	@GET
 	@Produces(MediaType.APPLICATION_JSON)
-	public String listOrCount(@QueryParam(GCatConstants.COUNT_ONLY_PARAMETER) @DefaultValue("false") Boolean countOnly) {
+	public String listOrCount(@QueryParam(GCatConstants.COUNT_PARAMETER) @DefaultValue("false") Boolean countOnly) {
 		setCalledMethod("GET /" + PROFILES);
 		try {
 			ISProfile isProfile = new ISProfile();