From a5da7f0f0d159f24039a0bc57e9e031d3bfa6f9b Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Wed, 26 Jul 2023 17:25:52 +0200
Subject: [PATCH] zenodoItem setLicenses not null as LicenseBean

---
 .../server/CkanToZenodoPublisherServiceImpl.java   |  2 +-
 .../server/CkanToZenodoUtil.java                   | 14 +++++++-------
 .../shared/wrapped/LicenseBean.java                |  3 ++-
 3 files changed, 10 insertions(+), 9 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 0300871..0600e3d 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,7 +204,7 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
 //			zenodoItem.getMetadata().setUpload_type(null);
 //			zenodoItem.getMetadata().setPublication_type(null);
 
-			LOG.info("zenodoItem setLicenses not null");
+			LOG.info("zenodoItem setLicenses not null as LicenseBean");
 			//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 e2921fc..4c2679a 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,6 +5,7 @@ import java.util.List;
 
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.SerializableEnum;
 import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.ZenodoLicense;
+import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.LicenseBean;
 
 
 /**
@@ -48,21 +49,20 @@ public class CkanToZenodoUtil {
 		return new SerializableEnum<String>(selectedValues, values);
 	}
 	
-	
+
 	/**
-	 * To serializable enum.
+	 * License to serializable enum.
 	 *
-	 * @param <E> the element type
 	 * @param selectedLicense the selected license
 	 * @param allLicenses the all licenses
 	 * @return the serializable enum
 	 */
-	public static <E extends ZenodoLicense> SerializableEnum<E> licenseToSerializableEnum(List<E> selectedLicense, List<E> allLicenses) {
+	public static SerializableEnum<LicenseBean> licenseToSerializableEnum(List<LicenseBean> selectedLicense, List<LicenseBean> allLicenses) {
 
-		if(allLicenses==null)
-			allLicenses = new ArrayList<E>();
+//		if(allLicenses==null)
+//			allLicenses = new ArrayList<LicenseBean>();
 		
-		return new SerializableEnum<E>(selectedLicense, allLicenses);
+		return new SerializableEnum<LicenseBean>(selectedLicense, allLicenses);
 	}
 	
 	/**
diff --git a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/LicenseBean.java b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/LicenseBean.java
index 0c84920..91c0249 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/LicenseBean.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/LicenseBean.java
@@ -13,10 +13,11 @@ import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.ZenodoLicense;
  */
 public class LicenseBean implements ZenodoLicense, Serializable {
 
+	
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 6618784269251750489L;
+	private static final long serialVersionUID = -7484830974654963132L;
 	private String id;
 	private String title;
 	private String url;