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 6d01d89..0300871 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,8 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple // zenodoItem.getMetadata().setUpload_type(null); // zenodoItem.getMetadata().setPublication_type(null); - LOG.info("zenodoItem setLicenses null"); - zenodoItem.getMetadata().setLicenses(null); + LOG.info("zenodoItem setLicenses not null"); + //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 82307a4..e2921fc 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 @@ -57,8 +57,11 @@ public class CkanToZenodoUtil { * @param allLicenses the all licenses * @return the serializable enum */ - public static SerializableEnum toSerializableEnum(List selectedLicense, List allLicenses) { + public static SerializableEnum licenseToSerializableEnum(List selectedLicense, List allLicenses) { + if(allLicenses==null) + allLicenses = new ArrayList(); + return new SerializableEnum(selectedLicense, allLicenses); } diff --git a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/converter/ItemToZenodoConverter.java b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/converter/ItemToZenodoConverter.java index 0821ed8..1fbce87 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/converter/ItemToZenodoConverter.java +++ b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/converter/ItemToZenodoConverter.java @@ -239,7 +239,7 @@ public class ItemToZenodoConverter { if(depositionMetadata.getLicense()!=null) { selectedLicenses = Arrays.asList(new LicenseBean(depositionMetadata.getLicense(),depositionMetadata.getLicense(), null)); } - zm.setLicenses(CkanToZenodoUtil.toSerializableEnum(selectedLicenses, null)); //NEED TO ADD ALL LICENSES + zm.setLicenses(CkanToZenodoUtil.licenseToSerializableEnum(selectedLicenses, null)); //NEED TO ADD ALL LICENSES if(depositionMetadata.getEmbargo_date()!=null) {