gCubeSystem
/
ckan2zenodo-publisher-widget
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

implemented licenseToSerializableEnum

This commit is contained in:
Francesco Mangiacrapa 2023-07-26 17:00:39 +02:00
parent 99eedb50c7
commit 7cd0c9c5e8
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/CkanToZenodoPublisherServiceImpl.java
View File

@ -204,8 +204,8 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
// zenodoItem.getMetadata().setUpload_type(null); // zenodoItem.getMetadata().setUpload_type(null);
// zenodoItem.getMetadata().setPublication_type(null); // zenodoItem.getMetadata().setPublication_type(null);
LOG.info("zenodoItem setLicenses null"); LOG.info("zenodoItem setLicenses not null");
zenodoItem.getMetadata().setLicenses(null); //zenodoItem.getMetadata().setLicenses(null);
LOG.debug("Returning item: "+zenodoItem); LOG.debug("Returning item: "+zenodoItem);

5
src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/CkanToZenodoUtil.java
View File

@ -57,8 +57,11 @@ public class CkanToZenodoUtil {
* @param allLicenses the all licenses * @param allLicenses the all licenses
* @return the serializable enum * @return the serializable enum
*/ */
public static <E extends ZenodoLicense> SerializableEnum<E> toSerializableEnum(List<E> selectedLicense, List<E> allLicenses) { public static <E extends ZenodoLicense> SerializableEnum<E> licenseToSerializableEnum(List<E> selectedLicense, List<E> allLicenses) {
if(allLicenses==null)
allLicenses = new ArrayList<E>();
return new SerializableEnum<E>(selectedLicense, allLicenses); return new SerializableEnum<E>(selectedLicense, allLicenses);
} }

2
src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/converter/ItemToZenodoConverter.java
View File

@ -239,7 +239,7 @@ public class ItemToZenodoConverter {
if(depositionMetadata.getLicense()!=null) { if(depositionMetadata.getLicense()!=null) {
selectedLicenses = Arrays.asList(new LicenseBean(depositionMetadata.getLicense(),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) { if(depositionMetadata.getEmbargo_date()!=null) {