implemented licenseToSerializableEnum
This commit is contained in:
parent
99eedb50c7
commit
7cd0c9c5e8
|
@ -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);
|
||||
|
||||
|
|
|
@ -57,7 +57,10 @@ public class CkanToZenodoUtil {
|
|||
* @param allLicenses the all licenses
|
||||
* @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);
|
||||
}
|
||||
|
|
|
@ -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) {
|
||||
|
||||
|
|
Loading…
Reference in New Issue