From e3df379c87c27640e9dbf222436845a2b4f0ce95 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Thu, 6 Aug 2020 15:04:01 +0200
Subject: [PATCH] Switched JSON management to gcube-jackson

---
 .settings/.gitignore                          |  2 ++
 CHANGELOG.md                                  | 31 +++++++++++++++++++
 changelog.xml                                 | 18 -----------
 pom.xml                                       | 29 +++++------------
 .../java/org/gcube/gcat/client/GroupTest.java |  7 ++---
 .../java/org/gcube/gcat/client/ItemTest.java  |  7 ++---
 .../org/gcube/gcat/client/LicenseTest.java    |  7 ++---
 .../org/gcube/gcat/client/NamespaceTest.java  |  7 ++---
 .../gcube/gcat/client/OrganizationTest.java   |  7 ++---
 .../org/gcube/gcat/client/ProfileTest.java    |  5 ++-
 .../org/gcube/gcat/client/ResourceTest.java   |  7 ++---
 .../gcat/client/SaveAndRestoreProfiles.java   |  5 ++-
 .../java/org/gcube/gcat/client/UserTest.java  |  7 ++---
 13 files changed, 65 insertions(+), 74 deletions(-)
 create mode 100644 .settings/.gitignore
 create mode 100644 CHANGELOG.md
 delete mode 100644 changelog.xml

diff --git a/.settings/.gitignore b/.settings/.gitignore
new file mode 100644
index 0000000..57d3934
--- /dev/null
+++ b/.settings/.gitignore
@@ -0,0 +1,2 @@
+/org.eclipse.jdt.core.prefs
+/org.eclipse.core.resources.prefs
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..96698ad
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,31 @@
+This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+# Changelog for gCube Catalogue (gCat) Client
+
+
+## [v2.0.0-SNAPSHOT] [r5.0.0] - 
+
+- Switched JSON management to gcube-jackson [#19735]
+
+
+## [v1.2.1] [r4.18.0] - 2019-12-20
+
+- Fixed distro files and pom according to new release procedure
+
+
+## [v1.2.0] [r4.15.0] - 2019-11-06
+
+- Enforce Content-Type in requests [#16774]
+
+
+## [v1.1.0] [r4.14.0] - 2019-05-27
+
+- Added the possibility to enforce gCat service URL
+- Added the possibility to disable social post [#13335]
+- Added the possibility to get a profile as JSON
+
+
+## [v1.0.0] [rX.X.0] - 2019-02-26
+
+- First Release
+
diff --git a/changelog.xml b/changelog.xml
deleted file mode 100644
index 61ed105..0000000
--- a/changelog.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xml>
-<ReleaseNotes>
-	<Changeset component="org.gcube.data-publishing.gcat-client.1-2-1" date="${buildDate}">
-		<Change>Fixed distro files and pom according to new release procedure</Change>
-	</Changeset>
-	<Changeset component="org.gcube.data-publishing.gcat-client.1-2-0" date="2019-11-06">
-		<Change>Enforce Content-Type in requests #16774</Change>
-	</Changeset>
-	<Changeset component="org.gcube.data-publishing.gcat-client.1-1-0" date="2019-05-27">
-		<Change>Added the possibility to enforce gCat service URL</Change>
-		<Change>Added the possibility to disable social post #16322</Change>
-		<Change>Added the possibility to get a porfile as JSON</Change>
-	</Changeset>
-	<Changeset component="org.gcube.data-publishing.gcat-client.1-0-0" date="2019-02-26">
-		<Change>First Release</Change>
-	</Changeset>
-</ReleaseNotes>
diff --git a/pom.xml b/pom.xml
index d84b7a3..77c146f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,16 +7,16 @@
 		<artifactId>maven-parent</artifactId>
 		<version>1.1.0</version>
 	</parent>
-	<groupId>org.gcube.data-publishing</groupId>
+	<groupId>org.gcube.data-catalogue</groupId>
 	<artifactId>gcat-client</artifactId>
-	<version>1.2.2-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<name>gCube Catalogue (gCat) Client</name>
 	<description>gCube Catalogue (gCat) Client is a library designed to interact with gCat Service exposed REST API</description>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<distroDirectory>${project.basedir}/distro</distroDirectory>
-		<serviceClass>DataPublishing</serviceClass>
+		<serviceClass>data-catalogue</serviceClass>
 	</properties>
 
 	<scm>
@@ -30,7 +30,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-bom</artifactId>
-				<version>1.4.0</version>
+				<version>2.0.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -41,7 +41,7 @@
 		<dependency>
 			<groupId>org.gcube.data-publishing</groupId>
 			<artifactId>gcat-api</artifactId>
-			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
+			<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.resources.discovery</groupId>
@@ -61,8 +61,8 @@
 		</dependency>
 		<!-- Test Dependencies -->
 		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
+			<groupId>org.gcube.common</groupId>
+			<artifactId>gcube-jackson-databind</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -77,19 +77,4 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>make-servicearchive</id>
-						<phase>package</phase>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
 </project>
\ No newline at end of file
diff --git a/src/test/java/org/gcube/gcat/client/GroupTest.java b/src/test/java/org/gcube/gcat/client/GroupTest.java
index a27c610..4339f4c 100644
--- a/src/test/java/org/gcube/gcat/client/GroupTest.java
+++ b/src/test/java/org/gcube/gcat/client/GroupTest.java
@@ -6,15 +6,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.gcube.com.fasterxml.jackson.databind.JavaType;
+import org.gcube.com.fasterxml.jackson.databind.JsonNode;
+import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 /**
  * @author Luca Frosini (ISTI - CNR)
  */
diff --git a/src/test/java/org/gcube/gcat/client/ItemTest.java b/src/test/java/org/gcube/gcat/client/ItemTest.java
index b0d455a..b82d943 100644
--- a/src/test/java/org/gcube/gcat/client/ItemTest.java
+++ b/src/test/java/org/gcube/gcat/client/ItemTest.java
@@ -8,16 +8,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import org.gcube.com.fasterxml.jackson.databind.JavaType;
+import org.gcube.com.fasterxml.jackson.databind.JsonNode;
+import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
 import org.gcube.gcat.api.GCatConstants;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 /**
  * @author Luca Frosini (ISTI - CNR)
  */
diff --git a/src/test/java/org/gcube/gcat/client/LicenseTest.java b/src/test/java/org/gcube/gcat/client/LicenseTest.java
index 58ebcec..daf8762 100644
--- a/src/test/java/org/gcube/gcat/client/LicenseTest.java
+++ b/src/test/java/org/gcube/gcat/client/LicenseTest.java
@@ -4,15 +4,14 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.gcube.com.fasterxml.jackson.databind.JavaType;
+import org.gcube.com.fasterxml.jackson.databind.JsonNode;
+import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 /**
  * @author Luca Frosini (ISTI - CNR)
  */
diff --git a/src/test/java/org/gcube/gcat/client/NamespaceTest.java b/src/test/java/org/gcube/gcat/client/NamespaceTest.java
index 0dc36cc..ad516d9 100644
--- a/src/test/java/org/gcube/gcat/client/NamespaceTest.java
+++ b/src/test/java/org/gcube/gcat/client/NamespaceTest.java
@@ -4,15 +4,14 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.gcube.com.fasterxml.jackson.databind.JavaType;
+import org.gcube.com.fasterxml.jackson.databind.JsonNode;
+import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 /**
  * @author Luca Frosini (ISTI - CNR)
  */
diff --git a/src/test/java/org/gcube/gcat/client/OrganizationTest.java b/src/test/java/org/gcube/gcat/client/OrganizationTest.java
index c0ca9e3..d838097 100644
--- a/src/test/java/org/gcube/gcat/client/OrganizationTest.java
+++ b/src/test/java/org/gcube/gcat/client/OrganizationTest.java
@@ -6,15 +6,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.gcube.com.fasterxml.jackson.databind.JavaType;
+import org.gcube.com.fasterxml.jackson.databind.JsonNode;
+import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 /**
  * @author Luca Frosini (ISTI - CNR)
  */
diff --git a/src/test/java/org/gcube/gcat/client/ProfileTest.java b/src/test/java/org/gcube/gcat/client/ProfileTest.java
index c2c1525..cd4f25a 100644
--- a/src/test/java/org/gcube/gcat/client/ProfileTest.java
+++ b/src/test/java/org/gcube/gcat/client/ProfileTest.java
@@ -9,14 +9,13 @@ import javax.ws.rs.NotFoundException;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
+import org.gcube.com.fasterxml.jackson.databind.JavaType;
+import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.InputSource;
 
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 /**
  * @author Luca Frosini (ISTI - CNR)
  */
diff --git a/src/test/java/org/gcube/gcat/client/ResourceTest.java b/src/test/java/org/gcube/gcat/client/ResourceTest.java
index 111bc87..f45d710 100644
--- a/src/test/java/org/gcube/gcat/client/ResourceTest.java
+++ b/src/test/java/org/gcube/gcat/client/ResourceTest.java
@@ -6,15 +6,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.gcube.com.fasterxml.jackson.databind.JavaType;
+import org.gcube.com.fasterxml.jackson.databind.JsonNode;
+import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 /**
  * @author Luca Frosini (ISTI - CNR)
  */
diff --git a/src/test/java/org/gcube/gcat/client/SaveAndRestoreProfiles.java b/src/test/java/org/gcube/gcat/client/SaveAndRestoreProfiles.java
index 9b4cf53..259a127 100644
--- a/src/test/java/org/gcube/gcat/client/SaveAndRestoreProfiles.java
+++ b/src/test/java/org/gcube/gcat/client/SaveAndRestoreProfiles.java
@@ -13,14 +13,13 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.gcube.com.fasterxml.jackson.databind.JavaType;
+import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
 import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
 import org.gcube.common.authorization.library.provider.UserInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 public class SaveAndRestoreProfiles {
 	
 	private static Logger logger = LoggerFactory.getLogger(SaveAndRestoreProfiles.class);
diff --git a/src/test/java/org/gcube/gcat/client/UserTest.java b/src/test/java/org/gcube/gcat/client/UserTest.java
index 5c7a169..3c60d12 100644
--- a/src/test/java/org/gcube/gcat/client/UserTest.java
+++ b/src/test/java/org/gcube/gcat/client/UserTest.java
@@ -4,15 +4,14 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.gcube.com.fasterxml.jackson.databind.JavaType;
+import org.gcube.com.fasterxml.jackson.databind.JsonNode;
+import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 /**
  * @author Luca Frosini (ISTI - CNR)
  */