From 5917f8de5ea6fcd21592d30e37e2dc9cbdb76048 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Fri, 7 Feb 2020 11:07:18 +0100 Subject: [PATCH] Changed the bean CatalogueItem by adding itemId --- pom.xml | 6 +++--- .../client/CkanToZendoPublisherWidget.java | 2 +- .../CkanToZenodoPublisherServiceImpl.java | 10 +++++---- .../converter/ItemToZenodoConverter.java | 1 + .../shared/CatalogueItem.java | 21 ++++++++++++++----- 5 files changed, 27 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 7bfebb0..09baf8a 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ org.gcube.portlets.widgets ckan2zenodo-publisher-widget jar - 0.1.0 + 0.1.0-SNAPSHOT gCube Ckan2Zenodo Publisher widget allows to publish D4Science catalogue's items on Zenodo @@ -65,13 +65,13 @@ org.gcube.portlets.widgets switch-button-widget - [1.0.0, 2.0.0-SNAPSHOT) + [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) compile org.gcube.data.publishing ckan2zenodo-library - [0.0.1, 1.0.0-SNAPSHOT) + [0.0.1-SNAPSHOT, 1.0.0-SNAPSHOT) org.gcube.common diff --git a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/CkanToZendoPublisherWidget.java b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/CkanToZendoPublisherWidget.java index 1b28ce2..133505d 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/CkanToZendoPublisherWidget.java +++ b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/CkanToZendoPublisherWidget.java @@ -67,7 +67,7 @@ public class CkanToZendoPublisherWidget { */ public void publishOnZenodo(final CatalogueItem item) { - modal.setTitle("Upload to Zenodo..."); + modal.setTitle("Upload to Zenodo"); modal.addStyleName("ckan2zenodo-modal-style"); modal.setCloseVisible(true); buttonPublish.setEnabled(false); 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 30b59b4..8b4204f 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 @@ -147,10 +147,10 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple } //Get a preview of the deposition to be published - ZenodoDeposition zdPreview=loadItemPreviewFromService(item.getItemName()); + ZenodoDeposition zdPreview=loadItemPreviewFromService(item.getItemId()); //Loading Filtered resources according to VRE policies - List filteredResources = loadFilterResources(item.getItemName()); + List filteredResources = loadFilterResources(item.getItemId()); LOG.debug("Loaded filtered resources: "+filteredResources); //Converting ZenodoDeposition to ZenodoItem @@ -160,13 +160,15 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple List resources = ItemToZenodoConverter.toZenodoFiles(filteredResources, false); zenodoItem.addFiles(resources); - zenodoItem.setName(item.getItemName()); + //I'M SETTING THE ID BECAUSE THE NAME IS NULL INTO BEAN PASSED FROM PORTLET SIDE + //TODO I'M WAITING FOR itemName retrieved from ckan2zenodo library + zenodoItem.setName(item.getItemId()); LOG.debug("Returning item: "+zenodoItem); return zenodoItem; } catch (Exception e) { - String error = "Error on converting the catalogue item: "+item.getItemName(); + String error = "Error on converting the catalogue item with id: "+item.getItemId(); LOG.error(error, e); String clientError = String.format("%s. %s", error, e.getMessage()); throw new Exception(clientError); 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 be765a8..b04ddc0 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 @@ -265,6 +265,7 @@ public class ItemToZenodoConverter { zm.setTitle(depositionMetadata.getTitle()); zm.setVersion(depositionMetadata.getVersion()); zm.setNotes(depositionMetadata.getNotes()); + return zm; } diff --git a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/CatalogueItem.java b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/CatalogueItem.java index 51db6dd..fba592d 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/CatalogueItem.java +++ b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/shared/CatalogueItem.java @@ -17,7 +17,7 @@ public class CatalogueItem implements Serializable{ */ private static final long serialVersionUID = 1L; - + String itemId; String itemName; String itemURL; ITEM_TYPE itemType; @@ -26,12 +26,21 @@ public class CatalogueItem implements Serializable{ public CatalogueItem() {} - public CatalogueItem(String itemName, String itemURL, ITEM_TYPE itemType) { + public CatalogueItem(String itemId, String itemName, String itemURL, ITEM_TYPE itemType) { + this.itemId = itemId; this.itemName = itemName; this.itemURL = itemURL; this.itemType = itemType; } + public String getItemId() { + return itemId; + } + + public void setItemId(String itemId) { + this.itemId = itemId; + } + public String getItemName() { return itemName; } @@ -59,7 +68,9 @@ public class CatalogueItem implements Serializable{ @Override public String toString() { StringBuilder builder = new StringBuilder(); - builder.append("CatalogueItem [itemName="); + builder.append("CatalogueItem [itemId="); + builder.append(itemId); + builder.append(", itemName="); builder.append(itemName); builder.append(", itemURL="); builder.append(itemURL); @@ -68,6 +79,6 @@ public class CatalogueItem implements Serializable{ builder.append("]"); return builder.toString(); } - - + + }