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(selectedValues, values); } - + /** - * To serializable enum. + * License to serializable enum. * - * @param the element type * @param selectedLicense the selected license * @param allLicenses the all licenses * @return the serializable enum */ - public static SerializableEnum licenseToSerializableEnum(List selectedLicense, List allLicenses) { + public static SerializableEnum licenseToSerializableEnum(List selectedLicense, List allLicenses) { - if(allLicenses==null) - allLicenses = new ArrayList(); +// if(allLicenses==null) +// allLicenses = new ArrayList(); - return new SerializableEnum(selectedLicense, allLicenses); + return new SerializableEnum(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;