From 139775a525379316e43a876ccbd702e6d5ff1707 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Thu, 27 Jul 2023 12:42:07 +0200
Subject: [PATCH] zenodoItem setLicenses not null as LicenseBean S new

---
 .../server/CkanToZenodoPublisherServiceImpl.java            | 6 ++++--
 .../ckan2zenodopublisher/server/CkanToZenodoUtil.java       | 1 -
 .../ckan2zenodopublisher/shared/SerializableEnum.java       | 2 +-
 .../ckan2zenodopublisher/shared/wrapped/ZenodoMetadata.java | 2 ++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/CkanToZenodoPublisherServiceImpl.java b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/CkanToZenodoPublisherServiceImpl.java
index 3c13341..ff44dec 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/CkanToZenodoPublisherServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/CkanToZenodoPublisherServiceImpl.java
@@ -204,8 +204,10 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
 //			zenodoItem.getMetadata().setUpload_type(null);
 //			zenodoItem.getMetadata().setPublication_type(null);
 
-			LOG.info("zenodoItem setLicenses not null as LicenseBean new");
-			//zenodoItem.getMetadata().setLicenses(null);
+			LOG.info("zenodoItem setLicenses not null as LicenseBean S new");
+			
+			LOG.info("zenodoItem getLicenses: "+zenodoItem.getMetadata().getLicenses());
+			zenodoItem.getMetadata().setLicenses(null);
 			
 			LOG.debug("Returning item: "+zenodoItem);
 			
diff --git a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/CkanToZenodoUtil.java b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/CkanToZenodoUtil.java
index 71c9f86..604e170 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/CkanToZenodoUtil.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/CkanToZenodoUtil.java
@@ -5,7 +5,6 @@ import java.util.List;
 
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.SerializableEnum;
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.LicenseBean;
-import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoLicense;
 
 
 /**
diff --git a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/SerializableEnum.java b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/SerializableEnum.java
index acdbed8..054a9e2 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/SerializableEnum.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/SerializableEnum.java
@@ -11,7 +11,7 @@ import java.util.List;
  * Dec 10, 2019
  * @param <T> the generic type
  */
-public class SerializableEnum<E> implements Serializable{
+public class SerializableEnum<E extends Serializable> implements Serializable{
 	/**
 	 * 
 	 */
diff --git a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/ZenodoMetadata.java b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/ZenodoMetadata.java
index db2e57a..63b4d28 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/ZenodoMetadata.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/ZenodoMetadata.java
@@ -884,6 +884,8 @@ public class ZenodoMetadata implements Serializable {
 	public SerializableEnum<LicenseBean> getLicenses() {
 		return licenses;
 	}
+	
+	
 
 	@Override
 	public String toString() {