From a5892227cabb3d863b3a3e72a48cdb4e35c0d1c1 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Thu, 27 Jul 2023 15:52:22 +0200 Subject: [PATCH] removed LicenseBean and passed to String #25275 --- .../client/view/Ckan2ZenodoViewManager.java | 5 +- .../client/view/FieldUtil.java | 10 +- .../server/CkanToZenodoUtil.java | 14 -- .../converter/ItemToZenodoConverter.java | 14 +- .../shared/wrapped/LicenseDTO.java | 142 +++++++++--------- .../shared/wrapped/ZenodoItem.java | 2 - .../shared/wrapped/ZenodoMetadata.java | 6 +- 7 files changed, 86 insertions(+), 107 deletions(-) diff --git a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/view/Ckan2ZenodoViewManager.java b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/view/Ckan2ZenodoViewManager.java index be9b835..c1066ca 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/view/Ckan2ZenodoViewManager.java +++ b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/view/Ckan2ZenodoViewManager.java @@ -8,7 +8,6 @@ import java.util.List; import org.gcube.portlets.widgets.ckan2zenodopublisher.client.ui.BasicTabPanel; import org.gcube.portlets.widgets.ckan2zenodopublisher.client.ui.basicinformation.BasicInformationView; import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.SerializableEnum; -import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.LicenseDTO; import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoContributor; import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoCreator; import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoFile; @@ -162,8 +161,8 @@ public class Ckan2ZenodoViewManager { //license String licenseId = basicForm.getField_license().getSelectedValue(); if(licenseId!=null) { - LicenseDTO licenseBean = new LicenseDTO(licenseId, null, null); - meta.setLicenses(new SerializableEnum(Arrays.asList(licenseBean),null)); + //LicenseDTO licenseBean = new LicenseDTO(licenseId, null, null); + meta.setLicenses(new SerializableEnum(Arrays.asList(licenseId),null)); //meta.setLicenses(Arrays.asList(licenseBean)); } diff --git a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/view/FieldUtil.java b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/view/FieldUtil.java index 245990b..fe1e7ef 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/view/FieldUtil.java +++ b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/view/FieldUtil.java @@ -3,9 +3,6 @@ package org.gcube.portlets.widgets.ckan2zenodopublisher.client.view; import java.util.ArrayList; import java.util.List; -import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.LicenseDTO; -import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoLicense; - import com.github.gwtbootstrap.client.ui.ControlGroup; import com.github.gwtbootstrap.client.ui.ListBox; import com.github.gwtbootstrap.client.ui.TextBox; @@ -98,17 +95,18 @@ public class FieldUtil { /** * To zenodo ids. + * TODO Must passed an object License * * @param listLicenses the list licenses * @return the list */ - public static List toZenodoIds(List listLicenses){ + public static List toZenodoIds(List listLicenses){ if(listLicenses==null) return null; List licenses = new ArrayList(listLicenses.size()); - for (LicenseDTO zenodoLicense : listLicenses) { - licenses.add(zenodoLicense.getId()); + for (String zenodoLicense : listLicenses) { + licenses.add(zenodoLicense); } return licenses; 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 28e535a..d434bd8 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 @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.List; import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.SerializableEnum; -import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.LicenseDTO; /** @@ -48,19 +47,6 @@ public class CkanToZenodoUtil { return new SerializableEnum(selectedValues, values); } - - /** - * License to serializable enum. - * - * @param selectedLicense the selected license - * @param allLicenses the all licenses - * @return the serializable enum - */ - public static SerializableEnum licenseToSerializableEnum(List selectedLicense, List allLicenses) { - - return new SerializableEnum(selectedLicense, allLicenses); - } - /** * Checks if is not empty. * 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 2720a8e..6e02501 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 @@ -23,7 +23,6 @@ import org.gcube.data.publishing.ckan2zenodo.model.zenodo.Subject; import org.gcube.data.publishing.ckan2zenodo.model.zenodo.ZenodoDeposition; import org.gcube.portlets.widgets.ckan2zenodopublisher.server.CkanToZenodoUtil; import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.SerializableEnum; -import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.LicenseDTO; import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoAuthor; import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoCommunity; import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoContributor; @@ -235,13 +234,12 @@ public class ItemToZenodoConverter { zm.setImage_type(CkanToZenodoUtil.toSerializableEnum(imageType, ImageType.values())); //Licenses - List selectedLicenses = null; + SerializableEnum selectedLicenses = null; if(depositionMetadata.getLicense()!=null) { - selectedLicenses = Arrays.asList(new LicenseDTO(depositionMetadata.getLicense(),depositionMetadata.getLicense(), null)); + selectedLicenses = new SerializableEnum(Arrays.asList(depositionMetadata.getLicense()), null); //NEED TO ADD ALL LICENSES } if(selectedLicenses!=null) { - zm.setLicenses(CkanToZenodoUtil.licenseToSerializableEnum(selectedLicenses, null)); //NEED TO ADD ALL LICENSES - //zm.setLicenses(selectedLicenses); //NEED TO ADD ALL LICENSES + zm.setLicenses(selectedLicenses); } if(depositionMetadata.getEmbargo_date()!=null) { @@ -528,13 +526,13 @@ public class ItemToZenodoConverter { } //license - SerializableEnum licenses = metadata.getLicenses(); + SerializableEnum licenses = metadata.getLicenses(); LOG.debug("Read licenses: "+licenses); if(licenses!=null) { try { - LicenseDTO lB = licenses.getSelectedValues().get(0); + String lB = licenses.getSelectedValues().get(0); LOG.debug("Set license: "+lB); - depositionMetadata.setLicense(lB.getId()); + depositionMetadata.setLicense(lB); }catch (Exception e) { LOG.warn("Set license error: ",e); } diff --git a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/LicenseDTO.java b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/LicenseDTO.java index 28f4fe1..ef5e310 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/LicenseDTO.java +++ b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/LicenseDTO.java @@ -1,71 +1,71 @@ -package org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped; - -import java.io.Serializable; - -/** - * A license bean like the ckan's one. - * - * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it) - * - * Jan 13, 2020 - */ -public class LicenseDTO implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 8796338619448833841L; - private String id; - private String title; - private String url; - - /** - * Instantiates a new license bean. - */ - public LicenseDTO() { - } - - public LicenseDTO(String id, String title, String url) { - this.id = id; - this.title = title; - this.url = url; - } - - public String getId() { - return id; - } - - public String getTitle() { - return title; - } - - public String getUrl() { - return url; - } - - public void setId(String id) { - this.id = id; - } - - public void setTitle(String title) { - this.title = title; - } - - public void setUrl(String url) { - this.url = url; - } - - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("LicenseDTO [id="); - builder.append(id); - builder.append(", title="); - builder.append(title); - builder.append(", url="); - builder.append(url); - builder.append("]"); - return builder.toString(); - } - -} +//package org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped; +// +//import java.io.Serializable; +// +///** +// * A license bean like the ckan's one. +// * +// * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it) +// * +// * Jan 13, 2020 +// */ +//public class LicenseDTO implements Serializable { +// +// /** +// * +// */ +// private static final long serialVersionUID = 8796338619448833841L; +// private String id; +// private String title; +// private String url; +// +// /** +// * Instantiates a new license bean. +// */ +// public LicenseDTO() { +// } +// +// public LicenseDTO(String id, String title, String url) { +// this.id = id; +// this.title = title; +// this.url = url; +// } +// +// public String getId() { +// return id; +// } +// +// public String getTitle() { +// return title; +// } +// +// public String getUrl() { +// return url; +// } +// +// public void setId(String id) { +// this.id = id; +// } +// +// public void setTitle(String title) { +// this.title = title; +// } +// +// public void setUrl(String url) { +// this.url = url; +// } +// +// @Override +// public String toString() { +// StringBuilder builder = new StringBuilder(); +// builder.append("LicenseDTO [id="); +// builder.append(id); +// builder.append(", title="); +// builder.append(title); +// builder.append(", url="); +// builder.append(url); +// builder.append("]"); +// return builder.toString(); +// } +// +//} diff --git a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/ZenodoItem.java b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/ZenodoItem.java index effdff9..712efea 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/ZenodoItem.java +++ b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/ZenodoItem.java @@ -35,8 +35,6 @@ public class ZenodoItem implements Serializable { private String name; // this is the dataset name private ItemTranslateError translateError; - - private LicenseDTO licenseDTO; //not used, here only for GWT serialization /** * Instantiates a new zenodo item. diff --git a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/ZenodoMetadata.java b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/ZenodoMetadata.java index d820067..bfe2548 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/ZenodoMetadata.java +++ b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/wrapped/ZenodoMetadata.java @@ -77,7 +77,7 @@ public class ZenodoMetadata implements Serializable { private List dates; private String method; // TODO html - private SerializableEnum licenses; + private SerializableEnum licenses; /** * Instantiates a new zenodo metadata. @@ -882,7 +882,7 @@ public class ZenodoMetadata implements Serializable { * * @param licenses the new licenses */ - public void setLicenses(SerializableEnum licenses) { + public void setLicenses(SerializableEnum licenses) { this.licenses = licenses; } @@ -891,7 +891,7 @@ public class ZenodoMetadata implements Serializable { * * @return the licenses */ - public SerializableEnum getLicenses() { + public SerializableEnum getLicenses() { return licenses; }