Compare commits
44 Commits
|
@ -1,11 +1,11 @@
|
||||||
eclipse.preferences.version=1
|
eclipse.preferences.version=1
|
||||||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
||||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
||||||
org.eclipse.jdt.core.compiler.compliance=1.7
|
org.eclipse.jdt.core.compiler.compliance=1.8
|
||||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
|
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
|
||||||
org.eclipse.jdt.core.compiler.release=disabled
|
org.eclipse.jdt.core.compiler.release=disabled
|
||||||
org.eclipse.jdt.core.compiler.source=1.7
|
org.eclipse.jdt.core.compiler.source=1.8
|
||||||
|
|
21
CHANGELOG.md
21
CHANGELOG.md
|
@ -4,6 +4,27 @@
|
||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
|
## [v1.1.4] - 2023-12-21
|
||||||
|
|
||||||
|
- Fixing `publication_date` issue [#26166]
|
||||||
|
|
||||||
|
## [v1.1.3] - 2023-07-25
|
||||||
|
|
||||||
|
- Fixing `null` issue, recompiling this component [#25275]
|
||||||
|
|
||||||
|
## [v1.1.2] - 2022-10-27
|
||||||
|
|
||||||
|
**Enhancements**
|
||||||
|
|
||||||
|
- [#24038] Moved to GWT 2.9.0
|
||||||
|
- Moved to maven-portal-bom 3.6.4
|
||||||
|
|
||||||
|
## [v1.1.0] - 2021-10-05
|
||||||
|
|
||||||
|
**New Features**
|
||||||
|
[#19988] Integrated with `checkEnvironment` reporting the status of "Upload to Zenodo" facility
|
||||||
|
Moved to `maven-portal-bom` 3.6.3
|
||||||
|
|
||||||
## [v1.0.2] - 2021-04-26
|
## [v1.0.2] - 2021-04-26
|
||||||
|
|
||||||
**Bug fixes**
|
**Bug fixes**
|
||||||
|
|
34
pom.xml
34
pom.xml
|
@ -7,15 +7,14 @@
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>maven-parent</artifactId>
|
<artifactId>maven-parent</artifactId>
|
||||||
<groupId>org.gcube.tools</groupId>
|
<groupId>org.gcube.tools</groupId>
|
||||||
<version>1.1.0</version>
|
<version>1.2.0</version>
|
||||||
<relativePath />
|
<relativePath />
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
||||||
<groupId>org.gcube.portlets.widgets</groupId>
|
<groupId>org.gcube.portlets.widgets</groupId>
|
||||||
<artifactId>ckan2zenodo-publisher-widget</artifactId>
|
<artifactId>ckan2zenodo-publisher-widget</artifactId>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<version>1.0.2</version>
|
<version>1.1.4</version>
|
||||||
|
|
||||||
<description>
|
<description>
|
||||||
gCube Ckan2Zenodo Publisher widget allows to publish D4Science catalogue's items on Zenodo
|
gCube Ckan2Zenodo Publisher widget allows to publish D4Science catalogue's items on Zenodo
|
||||||
|
@ -31,10 +30,10 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Convenience property to set the GWT version -->
|
<!-- Convenience property to set the GWT version -->
|
||||||
<gwtVersion>2.7.0</gwtVersion>
|
<gwtVersion>2.10.0</gwtVersion>
|
||||||
|
|
||||||
<!-- GWT needs at least java 1.6 -->
|
<!-- GWT needs at least java 1.6 -->
|
||||||
<maven.compiler.source>1.7</maven.compiler.source>
|
<maven.compiler.source>1.8</maven.compiler.source>
|
||||||
<maven.compiler.target>1.8</maven.compiler.target>
|
<maven.compiler.target>1.8</maven.compiler.target>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
</properties>
|
</properties>
|
||||||
|
@ -44,7 +43,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.distribution</groupId>
|
<groupId>org.gcube.distribution</groupId>
|
||||||
<artifactId>maven-portal-bom</artifactId>
|
<artifactId>maven-portal-bom</artifactId>
|
||||||
<version>3.6.1</version>
|
<version>3.6.4</version>
|
||||||
<type>pom</type>
|
<type>pom</type>
|
||||||
<scope>import</scope>
|
<scope>import</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
@ -58,6 +57,18 @@
|
||||||
<version>${gwtVersion}</version>
|
<version>${gwtVersion}</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.google.gwt</groupId>
|
||||||
|
<artifactId>gwt-servlet</artifactId>
|
||||||
|
<version>${gwtVersion}</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.google.gwt</groupId>
|
||||||
|
<artifactId>gwt-dev</artifactId>
|
||||||
|
<version>${gwtVersion}</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.github.gwtbootstrap</groupId>
|
<groupId>com.github.gwtbootstrap</groupId>
|
||||||
<artifactId>gwt-bootstrap</artifactId>
|
<artifactId>gwt-bootstrap</artifactId>
|
||||||
|
@ -65,7 +76,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.portlets.widgets</groupId>
|
<groupId>org.gcube.portlets.widgets</groupId>
|
||||||
<artifactId>switch-button-widget</artifactId>
|
<artifactId>switch-button-widget</artifactId>
|
||||||
<version>[1.0.0, 2.0.0)</version>
|
<version>[1.0.0, 2.0.0-SNAPSHOT)</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -119,6 +130,15 @@
|
||||||
<artifactId>slf4j-api</artifactId>
|
<artifactId>slf4j-api</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<!-- REQUIRED FOR JDK_11 -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.projectlombok</groupId>
|
||||||
|
<artifactId>lombok</artifactId>
|
||||||
|
<version>1.18.4</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>junit</groupId>
|
<groupId>junit</groupId>
|
||||||
<artifactId>junit</artifactId>
|
<artifactId>junit</artifactId>
|
||||||
|
|
|
@ -12,6 +12,7 @@ import org.gcube.portlets.widgets.ckan2zenodopublisher.client.view.FormValidator
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.client.view.LoaderIcon;
|
import org.gcube.portlets.widgets.ckan2zenodopublisher.client.view.LoaderIcon;
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.CatalogueItem;
|
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.CatalogueItem;
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.ZenodoError;
|
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.ZenodoError;
|
||||||
|
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.DOI_dv;
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoItem;
|
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoItem;
|
||||||
|
|
||||||
import com.github.gwtbootstrap.client.ui.Alert;
|
import com.github.gwtbootstrap.client.ui.Alert;
|
||||||
|
@ -30,6 +31,8 @@ import com.google.gwt.json.client.JSONParser;
|
||||||
import com.google.gwt.json.client.JSONValue;
|
import com.google.gwt.json.client.JSONValue;
|
||||||
import com.google.gwt.user.client.Window;
|
import com.google.gwt.user.client.Window;
|
||||||
import com.google.gwt.user.client.rpc.AsyncCallback;
|
import com.google.gwt.user.client.rpc.AsyncCallback;
|
||||||
|
import com.google.gwt.user.client.ui.FlowPanel;
|
||||||
|
import com.google.gwt.user.client.ui.HTML;
|
||||||
import com.google.gwt.user.client.ui.VerticalPanel;
|
import com.google.gwt.user.client.ui.VerticalPanel;
|
||||||
import com.google.gwt.user.client.ui.Widget;
|
import com.google.gwt.user.client.ui.Widget;
|
||||||
|
|
||||||
|
@ -97,6 +100,7 @@ public class CkanToZendoPublisherWidget {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onSuccess(ZenodoItem result) {
|
public void onSuccess(ZenodoItem result) {
|
||||||
|
GWT.log("Zenodo item returned is: "+result);
|
||||||
loader.setVisible(false);
|
loader.setVisible(false);
|
||||||
modal.remove(loader);
|
modal.remove(loader);
|
||||||
manager = new Ckan2ZenodoViewManager();
|
manager = new Ckan2ZenodoViewManager();
|
||||||
|
@ -163,7 +167,7 @@ public class CkanToZendoPublisherWidget {
|
||||||
//Submit publish on zenodo.
|
//Submit publish on zenodo.
|
||||||
ZenodoItem zenodoItem = manager.getZenodoItemFromFieldsForm();
|
ZenodoItem zenodoItem = manager.getZenodoItemFromFieldsForm();
|
||||||
GWT.log("Publishing file: "+zenodoItem.getFiles());
|
GWT.log("Publishing file: "+zenodoItem.getFiles());
|
||||||
ckanToZenodoService.publishOnZenodo(zenodoItem, new AsyncCallback<String>() {
|
ckanToZenodoService.publishOnZenodo(zenodoItem, new AsyncCallback<DOI_dv>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onFailure(Throwable caught) {
|
public void onFailure(Throwable caught) {
|
||||||
|
@ -179,7 +183,7 @@ public class CkanToZendoPublisherWidget {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onSuccess(String doi) {
|
public void onSuccess(DOI_dv doi_dv) {
|
||||||
buttonPublish.setEnabled(false);
|
buttonPublish.setEnabled(false);
|
||||||
basicTabPanel.getElement().getStyle().setOpacity(1.0);
|
basicTabPanel.getElement().getStyle().setOpacity(1.0);
|
||||||
try {
|
try {
|
||||||
|
@ -189,15 +193,27 @@ public class CkanToZendoPublisherWidget {
|
||||||
}
|
}
|
||||||
String msg = "The item has been uploaded to Zenodo correctly";
|
String msg = "The item has been uploaded to Zenodo correctly";
|
||||||
|
|
||||||
if(doi!=null)
|
|
||||||
msg+=" "+doi;
|
|
||||||
|
|
||||||
Alert infoLabel = new Alert();
|
Alert infoLabel = new Alert();
|
||||||
infoLabel.setClose(false);
|
infoLabel.setClose(false);
|
||||||
infoLabel.setType(AlertType.INFO);
|
infoLabel.setType(AlertType.INFO);
|
||||||
infoLabel.setText(msg);
|
infoLabel.setText(msg);
|
||||||
|
|
||||||
showResults(Arrays.asList(infoLabel.asWidget()));
|
Modal modal = new Modal(true, true);
|
||||||
|
modal.setCloseVisible(true);
|
||||||
|
modal.setTitle("Item uploaded to Zenodo!");
|
||||||
|
modal.add(infoLabel);
|
||||||
|
if(doi_dv!=null) {
|
||||||
|
FlowPanel dF = new FlowPanel();
|
||||||
|
dF.add(new HTML("DOI: "+doi_dv.getDoi()));
|
||||||
|
FlowPanel dFU = new FlowPanel();
|
||||||
|
dFU.add(new HTML("DOI URL: <a href='"+doi_dv.getDoi_url()+"' target='_blank'>"+doi_dv.getDoi_url()+"</a>"));
|
||||||
|
modal.add(dF);
|
||||||
|
modal.add(dFU);
|
||||||
|
}
|
||||||
|
|
||||||
|
modal.show();
|
||||||
|
|
||||||
|
//showResults(Arrays.asList(infoLabel.asWidget()));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,7 @@ package org.gcube.portlets.widgets.ckan2zenodopublisher.client;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.CatalogueItem;
|
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.CatalogueItem;
|
||||||
|
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.DOI_dv;
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoItem;
|
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoItem;
|
||||||
|
|
||||||
import com.google.gwt.user.client.rpc.RemoteService;
|
import com.google.gwt.user.client.rpc.RemoteService;
|
||||||
|
@ -13,35 +14,43 @@ import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
|
||||||
*
|
*
|
||||||
* @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
|
* @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
|
||||||
*
|
*
|
||||||
* Jan 28, 2020
|
* Jan 28, 2020
|
||||||
*/
|
*/
|
||||||
@RemoteServiceRelativePath("ckantozenodo")
|
@RemoteServiceRelativePath("ckantozenodo")
|
||||||
public interface CkanToZenodoPublisherService extends RemoteService {
|
public interface CkanToZenodoPublisherService extends RemoteService {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Convert to zenodo item.
|
* Convert to zenodo item.
|
||||||
*
|
*
|
||||||
* @param item the item
|
* @param item the item
|
||||||
* @return the zenodo item
|
* @return the zenodo item
|
||||||
* @throws Exception the exception
|
* @throws Exception the exception
|
||||||
*/
|
*/
|
||||||
ZenodoItem convertToZenodoItem(CatalogueItem item) throws Exception;
|
ZenodoItem convertToZenodoItem(CatalogueItem item) throws Exception;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Publish on zenodo.
|
* Publish on zenodo.
|
||||||
*
|
*
|
||||||
* @param zenodoItem the zenodo item
|
* @param zenodoItem the zenodo item
|
||||||
* @return the DOI of published Zenodo Item
|
* @return the DOI of published Zenodo Item
|
||||||
* @throws Exception the exception
|
* @throws Exception the exception
|
||||||
*/
|
*/
|
||||||
String publishOnZenodo(ZenodoItem zenodoItem) throws Exception;
|
DOI_dv publishOnZenodo(ZenodoItem zenodoItem) throws Exception;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Read fields descriptions.
|
* Read fields descriptions.
|
||||||
*
|
*
|
||||||
* @return the map
|
* @return the map
|
||||||
* @throws Exception the exception
|
* @throws Exception the exception
|
||||||
*/
|
*/
|
||||||
Map<String, String> readFieldsDescriptions() throws Exception;
|
Map<String, String> readFieldsDescriptions() throws Exception;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check zenodo environment.
|
||||||
|
*
|
||||||
|
* @return the true is Zenodo environment is configured in the operating scope,
|
||||||
|
* false otherwise
|
||||||
|
*/
|
||||||
|
Boolean checkZenodoEnvironment();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,6 +3,7 @@ package org.gcube.portlets.widgets.ckan2zenodopublisher.client;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.CatalogueItem;
|
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.CatalogueItem;
|
||||||
|
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.DOI_dv;
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoItem;
|
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoItem;
|
||||||
|
|
||||||
import com.google.gwt.core.client.GWT;
|
import com.google.gwt.core.client.GWT;
|
||||||
|
@ -33,9 +34,11 @@ public interface CkanToZenodoPublisherServiceAsync {
|
||||||
|
|
||||||
void convertToZenodoItem(CatalogueItem item, AsyncCallback<ZenodoItem> callback);
|
void convertToZenodoItem(CatalogueItem item, AsyncCallback<ZenodoItem> callback);
|
||||||
|
|
||||||
void publishOnZenodo(ZenodoItem zenodoItem, AsyncCallback<String> callback);
|
void publishOnZenodo(ZenodoItem zenodoItem, AsyncCallback<DOI_dv> callback);
|
||||||
|
|
||||||
void readFieldsDescriptions(AsyncCallback<Map<String, String>> callback);
|
void readFieldsDescriptions(AsyncCallback<Map<String, String>> callback);
|
||||||
|
|
||||||
|
void checkZenodoEnvironment(AsyncCallback<Boolean> callback);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -259,6 +259,8 @@ public class BasicInformationView extends Composite implements FormValidator {
|
||||||
InfoTextAndLabels.addTooltipForFieldKey("description", cl_description);
|
InfoTextAndLabels.addTooltipForFieldKey("description", cl_description);
|
||||||
field_doi.setValue(zenodoItem.getDoi());
|
field_doi.setValue(zenodoItem.getDoi());
|
||||||
|
|
||||||
|
GWT.log("Filling form with: "+zenodoItem.getMetadata());
|
||||||
|
|
||||||
ZenodoMetadata zMeta = zenodoItem.getMetadata();
|
ZenodoMetadata zMeta = zenodoItem.getMetadata();
|
||||||
if (zMeta != null) {
|
if (zMeta != null) {
|
||||||
|
|
||||||
|
@ -327,20 +329,19 @@ public class BasicInformationView extends Composite implements FormValidator {
|
||||||
InfoTextAndLabels.addTooltipForFieldKey("access_conditions", cl_access_conditions);
|
InfoTextAndLabels.addTooltipForFieldKey("access_conditions", cl_access_conditions);
|
||||||
|
|
||||||
// License
|
// License
|
||||||
if (zMeta.getLicenses() != null) {
|
if (zMeta.getLicenseIDs() != null) {
|
||||||
List<String> listLicensesIds = null;
|
//List<String> listLicensesIds = null;
|
||||||
List<String> selectedLicensesId = FieldUtil.toZenodoIds(zMeta.getLicenses().getSelectedValues());
|
List<String> selectedLicensesId = FieldUtil.toZenodoIds(zMeta.getLicenseIDs());
|
||||||
if(zMeta.getLicenses().getSelectableValues()!=null) {
|
if(selectedLicensesId!=null) {
|
||||||
listLicensesIds = FieldUtil.toZenodoIds(zMeta.getLicenses().getSelectableValues());
|
FieldUtil.addValuesToListBox(field_license, selectedLicensesId);
|
||||||
FieldUtil.addValuesToListBox(field_license, listLicensesIds);
|
|
||||||
field_license.setEnabled(true);
|
field_license.setEnabled(true);
|
||||||
}else {
|
}else {
|
||||||
//Exception case on missing list of selectable license ids
|
//Exception case on missing list of selectable license ids
|
||||||
FieldUtil.addValuesToListBox(field_license, selectedLicensesId);
|
//FieldUtil.addValuesToListBox(field_license, selectedLicensesId);
|
||||||
field_license.setEnabled(false); //only one license id is available
|
field_license.setEnabled(false); //only one license id is available
|
||||||
|
|
||||||
}
|
}
|
||||||
FieldUtil.selectValueToListBox(field_license, selectedLicensesId);
|
//FieldUtil.selectValueToListBox(field_license, selectedLicensesId);
|
||||||
}else
|
}else
|
||||||
field_license.setEnabled(false);
|
field_license.setEnabled(false);
|
||||||
|
|
||||||
|
|
|
@ -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.BasicTabPanel;
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.client.ui.basicinformation.BasicInformationView;
|
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.SerializableEnum;
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.LicenseBean;
|
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoContributor;
|
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.ZenodoCreator;
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoFile;
|
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoFile;
|
||||||
|
@ -124,6 +123,9 @@ public class Ckan2ZenodoViewManager {
|
||||||
meta.setDescription(basicForm.getField_description().getValue());
|
meta.setDescription(basicForm.getField_description().getValue());
|
||||||
meta.setKeywords(basicForm.getTags()); // these are the keywords
|
meta.setKeywords(basicForm.getTags()); // these are the keywords
|
||||||
|
|
||||||
|
//Setting publication date fxing #26166
|
||||||
|
meta.setPublication_date(basicForm.getField_publication_date().getValue());
|
||||||
|
|
||||||
List<ZenodoCreator> creators = basicForm.getListOfCreators();
|
List<ZenodoCreator> creators = basicForm.getListOfCreators();
|
||||||
GWT.log("Read creators from FORM: "+creators);
|
GWT.log("Read creators from FORM: "+creators);
|
||||||
meta.setCreators(creators);
|
meta.setCreators(creators);
|
||||||
|
@ -162,8 +164,11 @@ public class Ckan2ZenodoViewManager {
|
||||||
//license
|
//license
|
||||||
String licenseId = basicForm.getField_license().getSelectedValue();
|
String licenseId = basicForm.getField_license().getSelectedValue();
|
||||||
if(licenseId!=null) {
|
if(licenseId!=null) {
|
||||||
LicenseBean licenseBean = new LicenseBean(licenseId, null, null);
|
//LicenseDTO licenseBean = new LicenseDTO(licenseId, null, null);
|
||||||
meta.setLicenses(new SerializableEnum<LicenseBean>(Arrays.asList(licenseBean),null));
|
List<String> licenses = new ArrayList<String>();
|
||||||
|
licenses.add(licenseId);
|
||||||
|
meta.setLicenseIDs(licenses);
|
||||||
|
//meta.setLicenses(Arrays.asList(licenseBean));
|
||||||
}
|
}
|
||||||
|
|
||||||
//embargo date
|
//embargo date
|
||||||
|
|
|
@ -3,9 +3,6 @@ package org.gcube.portlets.widgets.ckan2zenodopublisher.client.view;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.ZenodoLicense;
|
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.LicenseBean;
|
|
||||||
|
|
||||||
import com.github.gwtbootstrap.client.ui.ControlGroup;
|
import com.github.gwtbootstrap.client.ui.ControlGroup;
|
||||||
import com.github.gwtbootstrap.client.ui.ListBox;
|
import com.github.gwtbootstrap.client.ui.ListBox;
|
||||||
import com.github.gwtbootstrap.client.ui.TextBox;
|
import com.github.gwtbootstrap.client.ui.TextBox;
|
||||||
|
@ -98,17 +95,18 @@ public class FieldUtil {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* To zenodo ids.
|
* To zenodo ids.
|
||||||
|
* TODO Must passed an object License
|
||||||
*
|
*
|
||||||
* @param listLicenses the list licenses
|
* @param listLicenses the list licenses
|
||||||
* @return the list
|
* @return the list
|
||||||
*/
|
*/
|
||||||
public static List<String> toZenodoIds(List<LicenseBean> listLicenses){
|
public static List<String> toZenodoIds(List<String> listLicenses){
|
||||||
if(listLicenses==null)
|
if(listLicenses==null)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
List<String> licenses = new ArrayList<String>(listLicenses.size());
|
List<String> licenses = new ArrayList<String>(listLicenses.size());
|
||||||
for (ZenodoLicense zenodoLicense : listLicenses) {
|
for (String zenodoLicense : listLicenses) {
|
||||||
licenses.add(zenodoLicense.getId());
|
licenses.add(zenodoLicense);
|
||||||
}
|
}
|
||||||
|
|
||||||
return licenses;
|
return licenses;
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
package org.gcube.portlets.widgets.ckan2zenodopublisher.server;
|
package org.gcube.portlets.widgets.ckan2zenodopublisher.server;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
@ -15,6 +16,7 @@ import org.gcube.data.publishing.ckan2zenodo.model.faults.ConfigurationException
|
||||||
import org.gcube.data.publishing.ckan2zenodo.model.faults.GcatException;
|
import org.gcube.data.publishing.ckan2zenodo.model.faults.GcatException;
|
||||||
import org.gcube.data.publishing.ckan2zenodo.model.faults.TransformationException;
|
import org.gcube.data.publishing.ckan2zenodo.model.faults.TransformationException;
|
||||||
import org.gcube.data.publishing.ckan2zenodo.model.faults.ZenodoException;
|
import org.gcube.data.publishing.ckan2zenodo.model.faults.ZenodoException;
|
||||||
|
import org.gcube.data.publishing.ckan2zenodo.model.report.EnvironmentReport;
|
||||||
import org.gcube.data.publishing.ckan2zenodo.model.zenodo.DepositionMetadata;
|
import org.gcube.data.publishing.ckan2zenodo.model.zenodo.DepositionMetadata;
|
||||||
import org.gcube.data.publishing.ckan2zenodo.model.zenodo.ZenodoDeposition;
|
import org.gcube.data.publishing.ckan2zenodo.model.zenodo.ZenodoDeposition;
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.client.CkanToZenodoPublisherService;
|
import org.gcube.portlets.widgets.ckan2zenodopublisher.client.CkanToZenodoPublisherService;
|
||||||
|
@ -24,6 +26,7 @@ import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.CatalogueItem;
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.ItemTranslateError;
|
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.ItemTranslateError;
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.ItemTranslateError.ERROR_TYPE;
|
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.ItemTranslateError.ERROR_TYPE;
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.ZenodoError;
|
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.ZenodoError;
|
||||||
|
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.DOI_dv;
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoFile;
|
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoFile;
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoItem;
|
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoItem;
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoMetadata;
|
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoMetadata;
|
||||||
|
@ -38,27 +41,31 @@ import com.liferay.portal.service.UserLocalServiceUtil;
|
||||||
*
|
*
|
||||||
* @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
|
* @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
|
||||||
*
|
*
|
||||||
* Jan 15, 2020
|
* Jan 15, 2020
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet implements CkanToZenodoPublisherService {
|
public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet implements CkanToZenodoPublisherService {
|
||||||
|
|
||||||
private static Logger LOG = LoggerFactory.getLogger(CkanToZenodoPublisherServiceImpl.class);
|
private static Logger LOG = LoggerFactory.getLogger(CkanToZenodoPublisherServiceImpl.class);
|
||||||
|
|
||||||
|
/*
|
||||||
/* (non-Javadoc)
|
* (non-Javadoc)
|
||||||
* @see org.gcube.portlets.widgets.ckan2zenodopublisher.client.CkanToZenodoPublisherService#publishOnZenodo(org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoItem)
|
*
|
||||||
|
* @see org.gcube.portlets.widgets.ckan2zenodopublisher.client.
|
||||||
|
* CkanToZenodoPublisherService#publishOnZenodo(org.gcube.portlets.widgets.
|
||||||
|
* ckan2zenodopublisher.shared.wrapped.ZenodoItem)
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String publishOnZenodo(ZenodoItem zenodoItem) throws Exception {
|
public DOI_dv publishOnZenodo(ZenodoItem zenodoItem) throws Exception {
|
||||||
|
LOG.info("publishOnZenodo called");
|
||||||
try {
|
try {
|
||||||
|
|
||||||
if(isOutFromPortal()) {
|
if (isOutFromPortal()) {
|
||||||
PortalUtils.getCurrentContext(this.getThreadLocalRequest(), true);
|
PortalUtils.getCurrentContext(this.getThreadLocalRequest(), true);
|
||||||
PortalUtils.getCurrentToken(this.getThreadLocalRequest(), true);
|
PortalUtils.getCurrentToken(this.getThreadLocalRequest(), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
LOG.debug("publishOnZenodo called with metadata: "+zenodoItem.getMetadata());
|
||||||
|
|
||||||
Ckan2Zenodo client = new Ckan2ZenodoImpl();
|
Ckan2Zenodo client = new Ckan2ZenodoImpl();
|
||||||
// Get the item representation
|
// Get the item representation
|
||||||
|
@ -72,28 +79,30 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
|
||||||
zenodoDepositionPreview = client.forceTranslation(itemDescr);
|
zenodoDepositionPreview = client.forceTranslation(itemDescr);
|
||||||
}
|
}
|
||||||
|
|
||||||
//(EVENTUALLY) UPDATING BASIC INFO CHANGED BY FORM ON CLIENT-SIDE
|
// (EVENTUALLY) UPDATING BASIC INFO CHANGED BY FORM ON CLIENT-SIDE
|
||||||
//Basic info
|
// Basic info
|
||||||
zenodoDepositionPreview.setTitle(zenodoItem.getTitle());
|
zenodoDepositionPreview.setTitle(zenodoItem.getTitle());
|
||||||
|
|
||||||
//Updating Deposition Metadata potentially changed on client-side
|
// Updating Deposition Metadata potentially changed on client-side
|
||||||
ZenodoMetadata metadata = zenodoItem.getMetadata();
|
ZenodoMetadata metadata = zenodoItem.getMetadata();
|
||||||
DepositionMetadata depositionMetadata = zenodoDepositionPreview.getMetadata();
|
DepositionMetadata depositionMetadata = zenodoDepositionPreview.getMetadata();
|
||||||
depositionMetadata = ItemToZenodoConverter.updateMetadataInfoOfDepositionMetadata(metadata, depositionMetadata);
|
depositionMetadata = ItemToZenodoConverter.updateMetadataInfoOfDepositionMetadata(metadata,
|
||||||
|
depositionMetadata);
|
||||||
zenodoDepositionPreview.setMetadata(depositionMetadata);
|
zenodoDepositionPreview.setMetadata(depositionMetadata);
|
||||||
|
|
||||||
//Loading Filtered resources according to VRE policies
|
// Loading Filtered resources according to VRE policies
|
||||||
List<CkanResource> filteredResources = loadFilterResources(zenodoItem.getName());
|
List<CkanResource> filteredResources = loadFilterResources(zenodoItem.getName());
|
||||||
|
|
||||||
HashSet<CkanResource> toUpload = new HashSet<CkanResource>();
|
HashSet<CkanResource> toUpload = new HashSet<CkanResource>();
|
||||||
|
|
||||||
//Adding for publishing only the resources selected on clien-side
|
// Adding for publishing only the resources selected on clien-side
|
||||||
if(zenodoItem.getFiles()!=null) {
|
if (zenodoItem.getFiles() != null) {
|
||||||
for (ZenodoFile zf : zenodoItem.getFiles()) {
|
for (ZenodoFile zf : zenodoItem.getFiles()) {
|
||||||
for (CkanResource ckanResource : filteredResources) {
|
for (CkanResource ckanResource : filteredResources) {
|
||||||
if(zf.getId().compareTo(ckanResource.getId())==0 && zf.getIsAlreadyPublished()==false) {
|
if (zf.getId().compareTo(ckanResource.getId()) == 0 && zf.getIsAlreadyPublished() == false) {
|
||||||
if(CkanToZenodoUtil.isNotEmpty(zf.getFilename())) {
|
if (CkanToZenodoUtil.isNotEmpty(zf.getFilename())) {
|
||||||
ckanResource.setName(zf.getFilename()); //only the filename can be changed on clien-side
|
ckanResource.setName(zf.getFilename()); // only the filename can be changed on
|
||||||
|
// clien-side
|
||||||
toUpload.add(ckanResource);
|
toUpload.add(ckanResource);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -101,47 +110,63 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//Actually publish to zenodo :
|
// Actually publish to zenodo :
|
||||||
// Step 1 : metadata
|
// Step 1 : metadata
|
||||||
client= new Ckan2ZenodoImpl();
|
client = new Ckan2ZenodoImpl();
|
||||||
LOG.debug("Calling updatedMetadata for: "+zenodoDepositionPreview);
|
LOG.debug("Calling updatedMetadata for: " + zenodoDepositionPreview);
|
||||||
|
|
||||||
|
//fixing issue #26166
|
||||||
|
Date thePublicationDate = zenodoDepositionPreview.getMetadata().getPublication_date();
|
||||||
|
LOG.debug("Publication_Date before update is: " + thePublicationDate);
|
||||||
|
|
||||||
zenodoDepositionPreview = client.updatedMetadata(zenodoDepositionPreview);
|
zenodoDepositionPreview = client.updatedMetadata(zenodoDepositionPreview);
|
||||||
|
|
||||||
//Step 2 : publish Resources
|
// Step 2 : publish Resources
|
||||||
if(toUpload.size()>0) {
|
if (toUpload.size() > 0) {
|
||||||
LOG.debug("Trying to publish the set of CKAN resources: "+toUpload.toString());
|
LOG.debug("Trying to publish the set of CKAN resources: " + toUpload.toString());
|
||||||
Future<ZenodoDeposition> future_Dep=client.uploadFiles(toUpload, zenodoDepositionPreview);
|
|
||||||
while(!future_Dep.isDone()) {
|
//fixing issue #26166
|
||||||
LOG.debug("Waiting for completed future computation (publishing of resources on Zenodo)...");
|
zenodoDepositionPreview.getMetadata().setPublication_date(thePublicationDate);
|
||||||
Thread.sleep(2000);
|
LOG.debug("Publication_Date before uploadFiles is: " + zenodoDepositionPreview.getMetadata().getPublication_date());
|
||||||
|
Future<ZenodoDeposition> future_Dep = client.uploadFiles(toUpload, zenodoDepositionPreview);
|
||||||
|
|
||||||
|
while (!future_Dep.isDone()) {
|
||||||
|
LOG.debug("Waiting for completed future computation (publishing of resources on Zenodo)...");
|
||||||
|
Thread.sleep(2000);
|
||||||
}
|
}
|
||||||
zenodoDepositionPreview = future_Dep.get(600,TimeUnit.SECONDS);
|
zenodoDepositionPreview = future_Dep.get(600, TimeUnit.SECONDS);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get the item representation
|
// Get the item representation
|
||||||
CkanItemDescriptor item=client.read(zenodoItem.getName());
|
CkanItemDescriptor item = client.read(zenodoItem.getName());
|
||||||
//Finalize
|
|
||||||
LOG.debug("Calling publish on Zenodo for: "+zenodoDepositionPreview);
|
//fixing issue #26166
|
||||||
|
LOG.debug("Publication_Date before publish is: " + thePublicationDate);
|
||||||
|
zenodoDepositionPreview.getMetadata().setPublication_date(thePublicationDate);
|
||||||
|
|
||||||
|
// Finalize
|
||||||
|
LOG.debug("Calling publish on Zenodo for: " + zenodoDepositionPreview);
|
||||||
zenodoDepositionPreview = client.publish(zenodoDepositionPreview, item);
|
zenodoDepositionPreview = client.publish(zenodoDepositionPreview, item);
|
||||||
return zenodoDepositionPreview.getDoi();
|
return new DOI_dv(zenodoDepositionPreview.getDoi(), zenodoDepositionPreview.getDoi_url());
|
||||||
|
|
||||||
//throw new ZenodoException();
|
// throw new ZenodoException();
|
||||||
|
|
||||||
}catch (TimeoutException e) {
|
} catch (TimeoutException e) {
|
||||||
String error = "I'm waiting too time to upload the files to Zenodo. Check by yourself the result later";
|
String error = "I'm waiting too time to upload the files to Zenodo. Check by yourself the result later";
|
||||||
LOG.error(error, e);
|
LOG.error(error, e);
|
||||||
String clientError = String.format("%s", error);
|
String clientError = String.format("%s", error);
|
||||||
throw new Exception(clientError);
|
throw new Exception(clientError);
|
||||||
} catch (ZenodoException e) {
|
} catch (ZenodoException e) {
|
||||||
String error = ZenodoException.class.getName()+" during upload to Zenodo the catalogue item: "+zenodoItem.getName();
|
String error = ZenodoException.class.getName() + " during upload to Zenodo the catalogue item: "
|
||||||
|
+ zenodoItem.getName();
|
||||||
LOG.error(error, e);
|
LOG.error(error, e);
|
||||||
//String clientError = String.format("%s", e.getRemoteMessage());
|
// String clientError = String.format("%s", e.getRemoteMessage());
|
||||||
ZenodoError zenodoError = new ZenodoError(e);
|
ZenodoError zenodoError = new ZenodoError(e);
|
||||||
zenodoError.setRemoteMessage(e.getRemoteMessage());
|
zenodoError.setRemoteMessage(e.getRemoteMessage());
|
||||||
zenodoError.setResponseHTTPCode(e.getResponseHTTPCode());
|
zenodoError.setResponseHTTPCode(e.getResponseHTTPCode());
|
||||||
throw zenodoError;
|
throw zenodoError;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
String error = "Error during upload to Zenodo the catalogue item: "+zenodoItem.getName();
|
String error = "Error during upload to Zenodo the catalogue item: " + zenodoItem.getName();
|
||||||
LOG.error(error, e);
|
LOG.error(error, e);
|
||||||
String clientError = String.format("%s. %s", error, e.getMessage());
|
String clientError = String.format("%s. %s", error, e.getMessage());
|
||||||
throw new Exception(clientError);
|
throw new Exception(clientError);
|
||||||
|
@ -149,15 +174,19 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* (non-Javadoc)
|
/*
|
||||||
* @see org.gcube.portlets.widgets.ckan2zenodopublisher.client.CkanToZenodoPublisherService#convertToZenodoItem(org.gcube.portlets.widgets.ckan2zenodopublisher.shared.CatalogueItem)
|
* (non-Javadoc)
|
||||||
|
*
|
||||||
|
* @see org.gcube.portlets.widgets.ckan2zenodopublisher.client.
|
||||||
|
* CkanToZenodoPublisherService#convertToZenodoItem(org.gcube.portlets.widgets.
|
||||||
|
* ckan2zenodopublisher.shared.CatalogueItem)
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public ZenodoItem convertToZenodoItem(CatalogueItem item) throws Exception {
|
public ZenodoItem convertToZenodoItem(CatalogueItem item) throws Exception {
|
||||||
|
LOG.info("convertToZenodoItem called");
|
||||||
try {
|
try {
|
||||||
|
|
||||||
if(isOutFromPortal()) {
|
if (isOutFromPortal()) {
|
||||||
PortalUtils.getCurrentContext(this.getThreadLocalRequest(), true);
|
PortalUtils.getCurrentContext(this.getThreadLocalRequest(), true);
|
||||||
PortalUtils.getCurrentToken(this.getThreadLocalRequest(), true);
|
PortalUtils.getCurrentToken(this.getThreadLocalRequest(), true);
|
||||||
}
|
}
|
||||||
|
@ -170,47 +199,51 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
|
||||||
ItemTranslateError itemTrError = null;
|
ItemTranslateError itemTrError = null;
|
||||||
try {
|
try {
|
||||||
zdDeposition = client.translate(itemDescr);
|
zdDeposition = client.translate(itemDescr);
|
||||||
} catch (ConfigurationException e) {
|
} catch (ConfigurationException | TransformationException e) {
|
||||||
LOG.info(ConfigurationException.class.getSimpleName() + " thrown, trying to use forceTranslation for: "
|
LOG.info(ConfigurationException.class.getSimpleName() + " thrown, trying to use forceTranslation for: "
|
||||||
+ itemDescr.getName());
|
+ itemDescr.getName());
|
||||||
itemTrError = new ItemTranslateError(e.getMessage(), ERROR_TYPE.INFO);
|
itemTrError = new ItemTranslateError(e.getMessage(), ERROR_TYPE.INFO);
|
||||||
zdDeposition = client.forceTranslation(itemDescr);
|
zdDeposition = client.forceTranslation(itemDescr);
|
||||||
}
|
}
|
||||||
|
|
||||||
//Loading Filtered resources according to VRE policies
|
|
||||||
List<CkanResource> filteredResources = loadFilterResources(item.getItemId());
|
List<CkanResource> filteredResources = loadFilterResources(item.getItemId());
|
||||||
|
LOG.debug("Loaded filtered resources: " + filteredResources);
|
||||||
|
|
||||||
LOG.debug("Loaded filtered resources: "+filteredResources);
|
// Converting ZenodoDeposition to ZenodoItem
|
||||||
|
|
||||||
//Converting ZenodoDeposition to ZenodoItem
|
|
||||||
ZenodoItem zenodoItem = ItemToZenodoConverter.toZenodoItem(zdDeposition);
|
ZenodoItem zenodoItem = ItemToZenodoConverter.toZenodoItem(zdDeposition);
|
||||||
|
|
||||||
//Adding ItemTranslateError eventually occurred by calling client.translate
|
// Adding ItemTranslateError eventually occurred by calling client.translate
|
||||||
zenodoItem.setTranslateError(itemTrError);
|
zenodoItem.setTranslateError(itemTrError);
|
||||||
|
|
||||||
//Adding the filtered resources
|
// Adding the filtered resources
|
||||||
List<ZenodoFile> resources = ItemToZenodoConverter.toZenodoFiles(filteredResources, false);
|
List<ZenodoFile> resources = ItemToZenodoConverter.toZenodoFiles(filteredResources, false);
|
||||||
zenodoItem.addFiles(resources);
|
zenodoItem.addFiles(resources);
|
||||||
|
|
||||||
//I'M SETTING THE ID BECAUSE THE NAME IS NULL INTO BEAN PASSED FROM PORTLET SIDE
|
// I'M SETTING THE ID BECAUSE THE NAME IS NULL INTO BEAN PASSED FROM PORTLET
|
||||||
//TODO I'M WAITING FOR itemName retrieved from ckan2zenodo library
|
// SIDE
|
||||||
|
// TODO I'M WAITING FOR itemName retrieved from ckan2zenodo library
|
||||||
zenodoItem.setName(item.getItemId());
|
zenodoItem.setName(item.getItemId());
|
||||||
|
|
||||||
LOG.debug("Returning item: "+zenodoItem);
|
LOG.debug("zenodoItem getLicenses as list: " + zenodoItem.getMetadata().getLicenseIDs());
|
||||||
|
//LOG.debug("setting licenses at null");
|
||||||
|
//zenodoItem.getMetadata().setLicenseIDs(null);
|
||||||
|
|
||||||
|
LOG.debug("Returning item: " + zenodoItem);
|
||||||
|
|
||||||
return zenodoItem;
|
return zenodoItem;
|
||||||
|
|
||||||
} catch (ZenodoException e) {
|
} catch (ZenodoException e) {
|
||||||
String error = ZenodoException.class.getName()+" on converting the catalogue item with id: "+item.getItemId();
|
String error = ZenodoException.class.getName() + " on converting the catalogue item with id: "
|
||||||
|
+ item.getItemId();
|
||||||
LOG.error(error, e);
|
LOG.error(error, e);
|
||||||
//String clientError = String.format("%s. %s", error, e.getRemoteMessage());
|
// String clientError = String.format("%s. %s", error, e.getRemoteMessage());
|
||||||
ZenodoError zenodoError = new ZenodoError(e);
|
ZenodoError zenodoError = new ZenodoError(e);
|
||||||
zenodoError.setRemoteMessage(e.getRemoteMessage());
|
zenodoError.setRemoteMessage(e.getRemoteMessage());
|
||||||
zenodoError.setResponseHTTPCode(e.getResponseHTTPCode());
|
zenodoError.setResponseHTTPCode(e.getResponseHTTPCode());
|
||||||
throw zenodoError;
|
throw zenodoError;
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
String error = "Error on converting the catalogue item with id: "+item.getItemId();
|
String error = "Error on converting the catalogue item with id: " + item.getItemId();
|
||||||
LOG.error(error, e);
|
LOG.error(error, e);
|
||||||
String clientError = String.format("%s. %s", error, e.getMessage());
|
String clientError = String.format("%s. %s", error, e.getMessage());
|
||||||
throw new Exception(clientError);
|
throw new Exception(clientError);
|
||||||
|
@ -218,15 +251,19 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* (non-Javadoc)
|
/*
|
||||||
* @see org.gcube.portlets.widgets.ckan2zenodopublisher.client.CkanToZenodoPublisherService#convertToZenodoItem(org.gcube.portlets.widgets.ckan2zenodopublisher.shared.CatalogueItem)
|
* (non-Javadoc)
|
||||||
|
*
|
||||||
|
* @see org.gcube.portlets.widgets.ckan2zenodopublisher.client.
|
||||||
|
* CkanToZenodoPublisherService#convertToZenodoItem(org.gcube.portlets.widgets.
|
||||||
|
* ckan2zenodopublisher.shared.CatalogueItem)
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Map<String, String> readFieldsDescriptions() throws Exception {
|
public Map<String, String> readFieldsDescriptions() throws Exception {
|
||||||
|
LOG.info("readFieldsDescriptions called");
|
||||||
try {
|
try {
|
||||||
|
|
||||||
if(isOutFromPortal()) {
|
if (isOutFromPortal()) {
|
||||||
PortalUtils.getCurrentContext(this.getThreadLocalRequest(), true);
|
PortalUtils.getCurrentContext(this.getThreadLocalRequest(), true);
|
||||||
PortalUtils.getCurrentToken(this.getThreadLocalRequest(), true);
|
PortalUtils.getCurrentToken(this.getThreadLocalRequest(), true);
|
||||||
}
|
}
|
||||||
|
@ -242,21 +279,47 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Boolean checkZenodoEnvironment() {
|
||||||
|
LOG.info("checkZenodoEnvironment called");
|
||||||
|
boolean isZenodoConfigured = false;
|
||||||
|
|
||||||
|
try {
|
||||||
|
|
||||||
|
if (isOutFromPortal()) {
|
||||||
|
PortalUtils.getCurrentContext(this.getThreadLocalRequest(), true);
|
||||||
|
PortalUtils.getCurrentToken(this.getThreadLocalRequest(), true);
|
||||||
|
}
|
||||||
|
|
||||||
|
LOG.info("readFieldsDescriptions called");
|
||||||
|
Ckan2Zenodo client = new Ckan2ZenodoImpl();
|
||||||
|
EnvironmentReport report = client.checkEnvironment();
|
||||||
|
LOG.info("EnvironmentReport returned: " + report);
|
||||||
|
isZenodoConfigured = report.isok();
|
||||||
|
} catch (Exception e) {
|
||||||
|
LOG.error("Error occurred during checkEnvironment: ", e);
|
||||||
|
}
|
||||||
|
|
||||||
|
LOG.info("Is Zenodo Environment configured? " + isZenodoConfigured);
|
||||||
|
return isZenodoConfigured;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Load filter resources.
|
* Load filter resources.
|
||||||
*
|
*
|
||||||
* @param itemName the item name
|
* @param itemName the item name
|
||||||
* @return the list
|
* @return the list
|
||||||
* @throws GcatException the gcat exception
|
* @throws GcatException the gcat exception
|
||||||
* @throws ConfigurationException the configuration exception
|
* @throws ConfigurationException the configuration exception
|
||||||
* @throws TransformationException the transformation exception
|
* @throws TransformationException the transformation exception
|
||||||
*/
|
*/
|
||||||
private List<CkanResource> loadFilterResources(String itemName) throws GcatException, ConfigurationException, TransformationException {
|
private List<CkanResource> loadFilterResources(String itemName)
|
||||||
|
throws GcatException, ConfigurationException, TransformationException {
|
||||||
|
|
||||||
Ckan2Zenodo client = new Ckan2ZenodoImpl();
|
Ckan2Zenodo client = new Ckan2ZenodoImpl();
|
||||||
// Get the item representation
|
// Get the item representation
|
||||||
CkanItemDescriptor itemDescr=client.read(itemName);
|
CkanItemDescriptor itemDescr = client.read(itemName);
|
||||||
//Filter resources according to VRE policies
|
// Filter resources according to VRE policies
|
||||||
return client.filterResources(itemDescr);
|
return client.filterResources(itemDescr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -269,10 +332,10 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
|
||||||
try {
|
try {
|
||||||
UserLocalServiceUtil.getService();
|
UserLocalServiceUtil.getService();
|
||||||
return false;
|
return false;
|
||||||
}
|
} catch (com.liferay.portal.kernel.bean.BeanLocatorException ex) {
|
||||||
catch (com.liferay.portal.kernel.bean.BeanLocatorException ex) {
|
|
||||||
LOG.debug("Development Mode ON");
|
LOG.debug("Development Mode ON");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,6 @@ import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.SerializableEnum;
|
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.SerializableEnum;
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.ZenodoLicense;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -48,20 +47,6 @@ public class CkanToZenodoUtil {
|
||||||
return new SerializableEnum<String>(selectedValues, values);
|
return new SerializableEnum<String>(selectedValues, values);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* To serializable enum.
|
|
||||||
*
|
|
||||||
* @param <E> the element type
|
|
||||||
* @param selectedLicense the selected license
|
|
||||||
* @param allLicenses the all licenses
|
|
||||||
* @return the serializable enum
|
|
||||||
*/
|
|
||||||
public static <E extends ZenodoLicense> SerializableEnum<E> toSerializableEnum(List<E> selectedLicense, List<E> allLicenses) {
|
|
||||||
|
|
||||||
return new SerializableEnum<E>(selectedLicense, allLicenses);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks if is not empty.
|
* Checks if is not empty.
|
||||||
*
|
*
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
package org.gcube.portlets.widgets.ckan2zenodopublisher.server.converter;
|
package org.gcube.portlets.widgets.ckan2zenodopublisher.server.converter;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@ -23,7 +22,6 @@ import org.gcube.data.publishing.ckan2zenodo.model.zenodo.Subject;
|
||||||
import org.gcube.data.publishing.ckan2zenodo.model.zenodo.ZenodoDeposition;
|
import org.gcube.data.publishing.ckan2zenodo.model.zenodo.ZenodoDeposition;
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.server.CkanToZenodoUtil;
|
import org.gcube.portlets.widgets.ckan2zenodopublisher.server.CkanToZenodoUtil;
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.SerializableEnum;
|
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.SerializableEnum;
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.LicenseBean;
|
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoAuthor;
|
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.ZenodoCommunity;
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoContributor;
|
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoContributor;
|
||||||
|
@ -37,18 +35,17 @@ import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped.ZenodoSubj
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The Class ItemToZenodoConverter.
|
* The Class ItemToZenodoConverter.
|
||||||
*
|
*
|
||||||
* @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
|
* @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
|
||||||
*
|
*
|
||||||
* Dec 10, 2019
|
* Dec 10, 2019
|
||||||
*/
|
*/
|
||||||
public class ItemToZenodoConverter {
|
public class ItemToZenodoConverter {
|
||||||
|
|
||||||
private static Logger LOG = LoggerFactory.getLogger(ItemToZenodoConverter.class);
|
private static Logger LOG = LoggerFactory.getLogger(ItemToZenodoConverter.class);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* **
|
* **
|
||||||
*
|
*
|
||||||
|
@ -59,7 +56,6 @@ public class ItemToZenodoConverter {
|
||||||
* @return the zenodo item
|
* @return the zenodo item
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* To zenodo item.
|
* To zenodo item.
|
||||||
*
|
*
|
||||||
|
@ -68,46 +64,45 @@ public class ItemToZenodoConverter {
|
||||||
*/
|
*/
|
||||||
public static ZenodoItem toZenodoItem(ZenodoDeposition zenodoDeposition) {
|
public static ZenodoItem toZenodoItem(ZenodoDeposition zenodoDeposition) {
|
||||||
|
|
||||||
if(zenodoDeposition==null)
|
if (zenodoDeposition == null)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
LOG.debug("Converting item: "+zenodoDeposition);
|
LOG.debug("Converting item: " + zenodoDeposition);
|
||||||
|
|
||||||
ZenodoItem zi = new ZenodoItem();
|
ZenodoItem zi = new ZenodoItem();
|
||||||
zi.setId(zenodoDeposition.getId());
|
zi.setId(zenodoDeposition.getId());
|
||||||
zi.setDoi(zenodoDeposition.getDoi());
|
zi.setDoi(zenodoDeposition.getDoi());
|
||||||
zi.setCreated(zenodoDeposition.getCreated());
|
zi.setCreated(zenodoDeposition.getCreated());
|
||||||
|
|
||||||
//Add files already published in the deposition
|
// Add files already published in the deposition
|
||||||
List<ZenodoFile> files = toZenodoFiles(zenodoDeposition.getFiles(),true);
|
List<ZenodoFile> files = toZenodoFiles(zenodoDeposition.getFiles(), true);
|
||||||
zi.addFiles(files);
|
zi.addFiles(files);
|
||||||
|
|
||||||
zi.setModified(zenodoDeposition.getModified());
|
zi.setModified(zenodoDeposition.getModified());
|
||||||
zi.setOwner(zenodoDeposition.getOwner());
|
zi.setOwner(zenodoDeposition.getOwner());
|
||||||
zi.setRecord_id(zenodoDeposition.getRecord_id());
|
zi.setRecord_id(zenodoDeposition.getRecord_id());
|
||||||
zi.setRecord_url(zenodoDeposition.getRecord_url()!=null?zenodoDeposition.getRecord_url().toString():null);
|
zi.setRecord_url(zenodoDeposition.getRecord_url() != null ? zenodoDeposition.getRecord_url().toString() : null);
|
||||||
zi.setState(zenodoDeposition.getState());
|
zi.setState(zenodoDeposition.getState());
|
||||||
zi.setSubmitted(zenodoDeposition.getSubmitted());
|
zi.setSubmitted(zenodoDeposition.getSubmitted());
|
||||||
zi.setTitle(zenodoDeposition.getTitle());
|
zi.setTitle(zenodoDeposition.getTitle());
|
||||||
|
|
||||||
zi.setMetadata(toZenodoMetadata(zenodoDeposition.getMetadata()));
|
zi.setMetadata(toZenodoMetadata(zenodoDeposition.getMetadata()));
|
||||||
|
|
||||||
LOG.debug("Converted item: "+zi);
|
LOG.debug("Converted item: " + zi);
|
||||||
|
|
||||||
return zi;
|
return zi;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Adds the files.
|
* Adds the files.
|
||||||
*
|
*
|
||||||
* @param files the files
|
* @param files the files
|
||||||
* @param filesAlreadyPublished the files already published
|
* @param filesAlreadyPublished the files already published
|
||||||
* @return the list
|
* @return the list
|
||||||
*/
|
*/
|
||||||
private static List<ZenodoFile> toZenodoFiles(ArrayList<FileDeposition> files, boolean filesAlreadyPublished) {
|
private static List<ZenodoFile> toZenodoFiles(ArrayList<FileDeposition> files, boolean filesAlreadyPublished) {
|
||||||
|
|
||||||
if(files==null)
|
if (files == null)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
List<ZenodoFile> listOfFiles = new ArrayList<ZenodoFile>(files.size());
|
List<ZenodoFile> listOfFiles = new ArrayList<ZenodoFile>(files.size());
|
||||||
|
@ -121,56 +116,53 @@ public class ItemToZenodoConverter {
|
||||||
/**
|
/**
|
||||||
* To zenodo files.
|
* To zenodo files.
|
||||||
*
|
*
|
||||||
* @param filteredResources the filtered resources
|
* @param filteredResources the filtered resources
|
||||||
* @param filesAlreadyPublished the files already published
|
* @param filesAlreadyPublished the files already published
|
||||||
* @return the list
|
* @return the list
|
||||||
*/
|
*/
|
||||||
public static List<ZenodoFile> toZenodoFiles(List<CkanResource> filteredResources, boolean filesAlreadyPublished) {
|
public static List<ZenodoFile> toZenodoFiles(List<CkanResource> filteredResources, boolean filesAlreadyPublished) {
|
||||||
if(filteredResources==null)
|
if (filteredResources == null)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
List<ZenodoFile> listOfFiles = new ArrayList<ZenodoFile>(filteredResources.size());
|
List<ZenodoFile> listOfFiles = new ArrayList<ZenodoFile>(filteredResources.size());
|
||||||
for (CkanResource ckanResource : filteredResources) {
|
for (CkanResource ckanResource : filteredResources) {
|
||||||
listOfFiles.add(toZenodoFile(ckanResource,filesAlreadyPublished));
|
listOfFiles.add(toZenodoFile(ckanResource, filesAlreadyPublished));
|
||||||
}
|
}
|
||||||
|
|
||||||
return listOfFiles;
|
return listOfFiles;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* To zenodo file.
|
* To zenodo file.
|
||||||
*
|
*
|
||||||
* @param fileDeposition the file deposition
|
* @param fileDeposition the file deposition
|
||||||
* @param fileAlreadyPublished the file already published
|
* @param fileAlreadyPublished the file already published
|
||||||
* @return the zenodo file
|
* @return the zenodo file
|
||||||
*/
|
*/
|
||||||
public static ZenodoFile toZenodoFile(FileDeposition fileDeposition, boolean fileAlreadyPublished) {
|
public static ZenodoFile toZenodoFile(FileDeposition fileDeposition, boolean fileAlreadyPublished) {
|
||||||
|
|
||||||
if(fileDeposition==null)
|
if (fileDeposition == null)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
ZenodoFile zf = new ZenodoFile();
|
ZenodoFile zf = new ZenodoFile();
|
||||||
zf.setId(fileDeposition.getId());
|
zf.setId(fileDeposition.getId());
|
||||||
zf.setFilename(fileDeposition.getFilename());
|
zf.setFilename(fileDeposition.getFilename());
|
||||||
zf.setFilesize(fileDeposition.getFilesize()+"");
|
zf.setFilesize(fileDeposition.getFilesize() + "");
|
||||||
zf.setChecksum(fileDeposition.getChecksum());
|
zf.setChecksum(fileDeposition.getChecksum());
|
||||||
zf.setIsAlreadyPublished(fileAlreadyPublished);
|
zf.setIsAlreadyPublished(fileAlreadyPublished);
|
||||||
return zf;
|
return zf;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* To zenodo file.
|
* To zenodo file.
|
||||||
*
|
*
|
||||||
* @param ckanResource the ckan resource
|
* @param ckanResource the ckan resource
|
||||||
* @param fileAlreadyPublished the file already published
|
* @param fileAlreadyPublished the file already published
|
||||||
* @return the zenodo file
|
* @return the zenodo file
|
||||||
*/
|
*/
|
||||||
public static ZenodoFile toZenodoFile(CkanResource ckanResource, boolean fileAlreadyPublished) {
|
public static ZenodoFile toZenodoFile(CkanResource ckanResource, boolean fileAlreadyPublished) {
|
||||||
|
|
||||||
if(ckanResource==null)
|
if (ckanResource == null)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
ZenodoFile zf = new ZenodoFile();
|
ZenodoFile zf = new ZenodoFile();
|
||||||
|
@ -185,63 +177,68 @@ public class ItemToZenodoConverter {
|
||||||
return zf;
|
return zf;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* To zenodo metadata.
|
* To zenodo metadata.
|
||||||
*
|
*
|
||||||
* @param depositionMetadata the deposition metadata
|
* @param depositionMetadata the deposition metadata
|
||||||
* @return the zenodo metadata
|
* @return the zenodo metadata
|
||||||
*/
|
*/
|
||||||
public static ZenodoMetadata toZenodoMetadata(DepositionMetadata depositionMetadata){
|
public static ZenodoMetadata toZenodoMetadata(DepositionMetadata depositionMetadata) {
|
||||||
|
|
||||||
if(depositionMetadata==null)
|
if (depositionMetadata == null)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
ZenodoMetadata zm = new ZenodoMetadata();
|
ZenodoMetadata zm = new ZenodoMetadata();
|
||||||
zm.setAccess_conditions(depositionMetadata.getAccess_conditions());
|
zm.setAccess_conditions(depositionMetadata.getAccess_conditions());
|
||||||
zm.setDescription(depositionMetadata.getDescription());
|
zm.setDescription(depositionMetadata.getDescription());
|
||||||
|
|
||||||
//Access Type
|
// fixing bug #26165 on publication_date = null
|
||||||
|
zm.setPublication_date(depositionMetadata.getPublication_date());
|
||||||
|
|
||||||
|
// Access Type
|
||||||
AccessRights[] accessRight = null;
|
AccessRights[] accessRight = null;
|
||||||
if(depositionMetadata.getAccess_right()!=null) {
|
if (depositionMetadata.getAccess_right() != null) {
|
||||||
AccessRights[] theAccessRight = { depositionMetadata.getAccess_right() };
|
AccessRights[] theAccessRight = { depositionMetadata.getAccess_right() };
|
||||||
accessRight = theAccessRight;
|
accessRight = theAccessRight;
|
||||||
}
|
}
|
||||||
zm.setAccess_right(CkanToZenodoUtil.toSerializableEnum(accessRight, AccessRights.values()));
|
zm.setAccess_right(CkanToZenodoUtil.toSerializableEnum(accessRight, AccessRights.values()));
|
||||||
|
|
||||||
//Upload Type
|
// Upload Type
|
||||||
UploadType[] uploadType = null;
|
UploadType[] uploadType = null;
|
||||||
if(depositionMetadata.getUpload_type()!=null) {
|
if (depositionMetadata.getUpload_type() != null) {
|
||||||
UploadType[] theUploadType = { depositionMetadata.getUpload_type() };
|
UploadType[] theUploadType = { depositionMetadata.getUpload_type() };
|
||||||
uploadType = theUploadType;
|
uploadType = theUploadType;
|
||||||
|
|
||||||
}
|
}
|
||||||
zm.setUpload_type(CkanToZenodoUtil.toSerializableEnum(uploadType, UploadType.values()));
|
zm.setUpload_type(CkanToZenodoUtil.toSerializableEnum(uploadType, UploadType.values()));
|
||||||
|
|
||||||
//Publication Type
|
// Publication Type
|
||||||
PublicationType[] publicationType = null;
|
PublicationType[] publicationType = null;
|
||||||
if(depositionMetadata.getPublication_type()!=null) {
|
if (depositionMetadata.getPublication_type() != null) {
|
||||||
PublicationType[] thepublicationType = { depositionMetadata.getPublication_type() };
|
PublicationType[] thepublicationType = { depositionMetadata.getPublication_type() };
|
||||||
publicationType = thepublicationType;
|
publicationType = thepublicationType;
|
||||||
}
|
}
|
||||||
zm.setPublication_type(CkanToZenodoUtil.toSerializableEnum(publicationType, PublicationType.values()));
|
zm.setPublication_type(CkanToZenodoUtil.toSerializableEnum(publicationType, PublicationType.values()));
|
||||||
|
|
||||||
//Image Type
|
// Image Type
|
||||||
ImageType[] imageType = null;
|
ImageType[] imageType = null;
|
||||||
if(depositionMetadata.getImage_type()!=null) {
|
if (depositionMetadata.getImage_type() != null) {
|
||||||
ImageType[] theImageType = { depositionMetadata.getImage_type() };
|
ImageType[] theImageType = { depositionMetadata.getImage_type() };
|
||||||
imageType = theImageType;
|
imageType = theImageType;
|
||||||
}
|
}
|
||||||
zm.setImage_type(CkanToZenodoUtil.toSerializableEnum(imageType, ImageType.values()));
|
zm.setImage_type(CkanToZenodoUtil.toSerializableEnum(imageType, ImageType.values()));
|
||||||
|
|
||||||
//Licenses
|
// Licenses
|
||||||
List<LicenseBean> selectedLicenses = null;
|
List<String> selectedLicenses = null;
|
||||||
if(depositionMetadata.getLicense()!=null) {
|
if (depositionMetadata.getLicense() != null) {
|
||||||
selectedLicenses = Arrays.asList(new LicenseBean(depositionMetadata.getLicense(),depositionMetadata.getLicense(), null));
|
selectedLicenses = new ArrayList<String>();
|
||||||
|
selectedLicenses.add(depositionMetadata.getLicense()); // NEED TO ADD ALL LICENSES
|
||||||
|
}
|
||||||
|
if (selectedLicenses != null) {
|
||||||
|
zm.setLicenseIDs(selectedLicenses);
|
||||||
}
|
}
|
||||||
zm.setLicenses(CkanToZenodoUtil.toSerializableEnum(selectedLicenses, null)); //NEED TO ADD ALL LICENSES
|
|
||||||
|
|
||||||
if(depositionMetadata.getEmbargo_date()!=null) {
|
if (depositionMetadata.getEmbargo_date() != null) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -257,7 +254,7 @@ public class ItemToZenodoConverter {
|
||||||
|
|
||||||
zm.setContributors(toZenodoContributors(depositionMetadata.getContributors()));
|
zm.setContributors(toZenodoContributors(depositionMetadata.getContributors()));
|
||||||
|
|
||||||
//to manage empty or null contributors from mapping
|
// to manage empty or null contributors from mapping
|
||||||
zm.setContributorsTypes(CkanToZenodoUtil.toSerializableEnum(null, Contributor.Type.values()));
|
zm.setContributorsTypes(CkanToZenodoUtil.toSerializableEnum(null, Contributor.Type.values()));
|
||||||
|
|
||||||
zm.setCreators(toZenodoCreators(depositionMetadata.getCreators()));
|
zm.setCreators(toZenodoCreators(depositionMetadata.getCreators()));
|
||||||
|
@ -274,7 +271,6 @@ public class ItemToZenodoConverter {
|
||||||
return zm;
|
return zm;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* To zenodo subjects.
|
* To zenodo subjects.
|
||||||
*
|
*
|
||||||
|
@ -282,7 +278,7 @@ public class ItemToZenodoConverter {
|
||||||
* @return the list
|
* @return the list
|
||||||
*/
|
*/
|
||||||
private static List<ZenodoSubject> toZenodoSubjects(List<Subject> subjects) {
|
private static List<ZenodoSubject> toZenodoSubjects(List<Subject> subjects) {
|
||||||
if(subjects==null)
|
if (subjects == null)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
List<ZenodoSubject> list = new ArrayList<ZenodoSubject>(subjects.size());
|
List<ZenodoSubject> list = new ArrayList<ZenodoSubject>(subjects.size());
|
||||||
|
@ -302,13 +298,13 @@ public class ItemToZenodoConverter {
|
||||||
*/
|
*/
|
||||||
private static List<ZenodoRelatedIdentifier> toRelatedIdentifiers(List<RelatedIdentifier> related_identifiers) {
|
private static List<ZenodoRelatedIdentifier> toRelatedIdentifiers(List<RelatedIdentifier> related_identifiers) {
|
||||||
|
|
||||||
if(related_identifiers==null)
|
if (related_identifiers == null)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
List<ZenodoRelatedIdentifier> list = new ArrayList<ZenodoRelatedIdentifier>(related_identifiers.size());
|
List<ZenodoRelatedIdentifier> list = new ArrayList<ZenodoRelatedIdentifier>(related_identifiers.size());
|
||||||
for (RelatedIdentifier relatedIdentifier : related_identifiers) {
|
for (RelatedIdentifier relatedIdentifier : related_identifiers) {
|
||||||
Relation[] rel = { relatedIdentifier.getRelation() };
|
Relation[] rel = { relatedIdentifier.getRelation() };
|
||||||
SerializableEnum<String> sEnum = CkanToZenodoUtil.toSerializableEnum(rel, Relation.values());
|
SerializableEnum<String> sEnum = CkanToZenodoUtil.toSerializableEnum(rel, Relation.values());
|
||||||
ZenodoRelatedIdentifier zdi = new ZenodoRelatedIdentifier(relatedIdentifier.getIdentifier(), sEnum);
|
ZenodoRelatedIdentifier zdi = new ZenodoRelatedIdentifier(relatedIdentifier.getIdentifier(), sEnum);
|
||||||
list.add(zdi);
|
list.add(zdi);
|
||||||
}
|
}
|
||||||
|
@ -316,7 +312,6 @@ public class ItemToZenodoConverter {
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* To zenodo date intervals.
|
* To zenodo date intervals.
|
||||||
*
|
*
|
||||||
|
@ -325,18 +320,19 @@ public class ItemToZenodoConverter {
|
||||||
*/
|
*/
|
||||||
private static List<ZenodoDateInterval> toZenodoDateIntervals(List<DateInterval> dateIntervals) {
|
private static List<ZenodoDateInterval> toZenodoDateIntervals(List<DateInterval> dateIntervals) {
|
||||||
|
|
||||||
if(dateIntervals==null)
|
if (dateIntervals == null)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
List<ZenodoDateInterval> list = new ArrayList<ZenodoDateInterval>(dateIntervals.size());
|
List<ZenodoDateInterval> list = new ArrayList<ZenodoDateInterval>(dateIntervals.size());
|
||||||
for (DateInterval dateInterval : dateIntervals) {
|
for (DateInterval dateInterval : dateIntervals) {
|
||||||
SerializableEnum<String> types = null;
|
SerializableEnum<String> types = null;
|
||||||
if(dateInterval.getType()!=null) {
|
if (dateInterval.getType() != null) {
|
||||||
DateInterval.Type[] rel = { dateInterval.getType() };
|
DateInterval.Type[] rel = { dateInterval.getType() };
|
||||||
types = CkanToZenodoUtil.toSerializableEnum(rel, DateInterval.Type.values());
|
types = CkanToZenodoUtil.toSerializableEnum(rel, DateInterval.Type.values());
|
||||||
}
|
}
|
||||||
|
|
||||||
list.add(new ZenodoDateInterval(dateInterval.getStart(), dateInterval.getEnd(), types, dateInterval.getDescription()));
|
list.add(new ZenodoDateInterval(dateInterval.getStart(), dateInterval.getEnd(), types,
|
||||||
|
dateInterval.getDescription()));
|
||||||
}
|
}
|
||||||
|
|
||||||
return list;
|
return list;
|
||||||
|
@ -350,7 +346,7 @@ public class ItemToZenodoConverter {
|
||||||
*/
|
*/
|
||||||
public static List<ZenodoCommunity> toZenodoCommunities(List<Community> communities) {
|
public static List<ZenodoCommunity> toZenodoCommunities(List<Community> communities) {
|
||||||
|
|
||||||
if(communities==null)
|
if (communities == null)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
List<ZenodoCommunity> list = new ArrayList<ZenodoCommunity>(communities.size());
|
List<ZenodoCommunity> list = new ArrayList<ZenodoCommunity>(communities.size());
|
||||||
|
@ -369,7 +365,7 @@ public class ItemToZenodoConverter {
|
||||||
*/
|
*/
|
||||||
public static List<ZenodoContributor> toZenodoContributors(List<Contributor> contributors) {
|
public static List<ZenodoContributor> toZenodoContributors(List<Contributor> contributors) {
|
||||||
|
|
||||||
if(contributors==null)
|
if (contributors == null)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
List<ZenodoContributor> list = new ArrayList<ZenodoContributor>(contributors.size());
|
List<ZenodoContributor> list = new ArrayList<ZenodoContributor>(contributors.size());
|
||||||
|
@ -380,7 +376,7 @@ public class ItemToZenodoConverter {
|
||||||
zc.setName(contr.getName());
|
zc.setName(contr.getName());
|
||||||
zc.setOrcid(contr.getOrcid());
|
zc.setOrcid(contr.getOrcid());
|
||||||
SerializableEnum<String> types = null;
|
SerializableEnum<String> types = null;
|
||||||
if(contr.getType()!=null) {
|
if (contr.getType() != null) {
|
||||||
Contributor.Type[] rel = { contr.getType() };
|
Contributor.Type[] rel = { contr.getType() };
|
||||||
types = CkanToZenodoUtil.toSerializableEnum(rel, Contributor.Type.values());
|
types = CkanToZenodoUtil.toSerializableEnum(rel, Contributor.Type.values());
|
||||||
}
|
}
|
||||||
|
@ -399,7 +395,7 @@ public class ItemToZenodoConverter {
|
||||||
*/
|
*/
|
||||||
public static List<ZenodoCreator> toZenodoCreators(List<Creator> creators) {
|
public static List<ZenodoCreator> toZenodoCreators(List<Creator> creators) {
|
||||||
|
|
||||||
if(creators==null)
|
if (creators == null)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
List<ZenodoCreator> list = new ArrayList<ZenodoCreator>(creators.size());
|
List<ZenodoCreator> list = new ArrayList<ZenodoCreator>(creators.size());
|
||||||
|
@ -415,7 +411,6 @@ public class ItemToZenodoConverter {
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* To service file deposition.
|
* To service file deposition.
|
||||||
*
|
*
|
||||||
|
@ -424,7 +419,7 @@ public class ItemToZenodoConverter {
|
||||||
*/
|
*/
|
||||||
public static FileDeposition toServiceFileDeposition(ZenodoFile zenodoFile) {
|
public static FileDeposition toServiceFileDeposition(ZenodoFile zenodoFile) {
|
||||||
|
|
||||||
if(zenodoFile==null)
|
if (zenodoFile == null)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
FileDeposition fileDep = new FileDeposition();
|
FileDeposition fileDep = new FileDeposition();
|
||||||
|
@ -432,165 +427,164 @@ public class ItemToZenodoConverter {
|
||||||
fileDep.setFilename(zenodoFile.getFilename());
|
fileDep.setFilename(zenodoFile.getFilename());
|
||||||
try {
|
try {
|
||||||
fileDep.setFilesize(Integer.parseInt(zenodoFile.getFilesize()));
|
fileDep.setFilesize(Integer.parseInt(zenodoFile.getFilesize()));
|
||||||
}catch (Exception e) {
|
} catch (Exception e) {
|
||||||
// TODO: handle exception
|
// TODO: handle exception
|
||||||
}
|
}
|
||||||
fileDep.setChecksum(zenodoFile.getChecksum());
|
fileDep.setChecksum(zenodoFile.getChecksum());
|
||||||
return fileDep;
|
return fileDep;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Update metadata info of deposition metadata.
|
* Update metadata info of deposition metadata.
|
||||||
*
|
*
|
||||||
* @param metadata the metadata
|
* @param metadata the metadata
|
||||||
* @param depositionMetadata the deposition metadata
|
* @param depositionMetadata the deposition metadata
|
||||||
* @return the deposition metadata
|
* @return the deposition metadata
|
||||||
*/
|
*/
|
||||||
public static DepositionMetadata updateMetadataInfoOfDepositionMetadata(ZenodoMetadata metadata, DepositionMetadata depositionMetadata) {
|
public static DepositionMetadata updateMetadataInfoOfDepositionMetadata(ZenodoMetadata metadata,
|
||||||
|
DepositionMetadata depositionMetadata) {
|
||||||
|
|
||||||
//description
|
// description
|
||||||
String description = metadata.getDescription();
|
String description = metadata.getDescription();
|
||||||
LOG.debug("Read description: "+description);
|
LOG.debug("Read description: " + description);
|
||||||
if(description!=null) {
|
if (description != null) {
|
||||||
depositionMetadata.setDescription(description);
|
depositionMetadata.setDescription(description);
|
||||||
}
|
}
|
||||||
|
|
||||||
//upload type
|
// upload type
|
||||||
SerializableEnum<String> uploadType = metadata.getUpload_type();
|
SerializableEnum<String> uploadType = metadata.getUpload_type();
|
||||||
LOG.debug("Read upload type: "+uploadType);
|
LOG.debug("Read upload type: " + uploadType);
|
||||||
if(uploadType!=null && uploadType.getSelectedValues()!=null) {
|
if (uploadType != null && uploadType.getSelectedValues() != null) {
|
||||||
String theUploadTypeValue = uploadType.getSelectedValues().get(0);
|
String theUploadTypeValue = uploadType.getSelectedValues().get(0);
|
||||||
LOG.debug("Set upload type: "+theUploadTypeValue);
|
LOG.debug("Set upload type: " + theUploadTypeValue);
|
||||||
depositionMetadata.setUpload_type(UploadType.valueOf(theUploadTypeValue));
|
depositionMetadata.setUpload_type(UploadType.valueOf(theUploadTypeValue));
|
||||||
}
|
}
|
||||||
|
|
||||||
//access right
|
// access right
|
||||||
SerializableEnum<String> accessRight = metadata.getAccess_right();
|
SerializableEnum<String> accessRight = metadata.getAccess_right();
|
||||||
LOG.debug("Read access type: "+accessRight);
|
LOG.debug("Read access type: " + accessRight);
|
||||||
if(accessRight!=null && accessRight.getSelectedValues()!=null) {
|
if (accessRight != null && accessRight.getSelectedValues() != null) {
|
||||||
try {
|
try {
|
||||||
String theAccessRightValue = accessRight.getSelectedValues().get(0);
|
String theAccessRightValue = accessRight.getSelectedValues().get(0);
|
||||||
LOG.debug("Set access right: "+theAccessRightValue);
|
LOG.debug("Set access right: " + theAccessRightValue);
|
||||||
depositionMetadata.setAccess_right(AccessRights.valueOf(theAccessRightValue));
|
depositionMetadata.setAccess_right(AccessRights.valueOf(theAccessRightValue));
|
||||||
}catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LOG.warn("Set access right error: ",e);
|
LOG.warn("Set access right error: ", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//publication type
|
// publication type
|
||||||
SerializableEnum<String> publicationType = metadata.getPublication_type();
|
SerializableEnum<String> publicationType = metadata.getPublication_type();
|
||||||
LOG.debug("Read publication type: "+publicationType);
|
LOG.debug("Read publication type: " + publicationType);
|
||||||
if(publicationType!=null && publicationType.getSelectedValues()!=null) {
|
if (publicationType != null && publicationType.getSelectedValues() != null) {
|
||||||
try {
|
try {
|
||||||
String thePublicationTypeValue = publicationType.getSelectedValues().get(0);
|
String thePublicationTypeValue = publicationType.getSelectedValues().get(0);
|
||||||
LOG.debug("Set publication type: "+thePublicationTypeValue);
|
LOG.debug("Set publication type: " + thePublicationTypeValue);
|
||||||
depositionMetadata.setPublication_type(PublicationType.valueOf(thePublicationTypeValue));
|
depositionMetadata.setPublication_type(PublicationType.valueOf(thePublicationTypeValue));
|
||||||
}catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LOG.warn("Set publication type error: ",e);
|
LOG.warn("Set publication type error: ", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//image type
|
// image type
|
||||||
SerializableEnum<String> imageType = metadata.getImage_type();
|
SerializableEnum<String> imageType = metadata.getImage_type();
|
||||||
LOG.debug("Read image type: "+imageType);
|
LOG.debug("Read image type: " + imageType);
|
||||||
if(imageType!=null && imageType.getSelectedValues()!=null) {
|
if (imageType != null && imageType.getSelectedValues() != null) {
|
||||||
try {
|
try {
|
||||||
String imageTypeValue = imageType.getSelectedValues().get(0);
|
String imageTypeValue = imageType.getSelectedValues().get(0);
|
||||||
LOG.debug("Set image type: "+imageTypeValue);
|
LOG.debug("Set image type: " + imageTypeValue);
|
||||||
depositionMetadata.setImage_type(ImageType.valueOf(imageTypeValue));
|
depositionMetadata.setImage_type(ImageType.valueOf(imageTypeValue));
|
||||||
}catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LOG.warn("Set image type error: ",e);
|
LOG.warn("Set image type error: ", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//embargo_date
|
// embargo_date
|
||||||
Date embargoDate = metadata.getEmbargo_date();
|
Date embargoDate = metadata.getEmbargo_date();
|
||||||
LOG.debug("Read embargo date: "+imageType);
|
LOG.debug("Read embargo date: " + imageType);
|
||||||
if(embargoDate!=null) {
|
if (embargoDate != null) {
|
||||||
try {
|
try {
|
||||||
LOG.debug("Set embargo date: "+embargoDate);
|
LOG.debug("Set embargo date: " + embargoDate);
|
||||||
depositionMetadata.setEmbargo_date(embargoDate);
|
depositionMetadata.setEmbargo_date(embargoDate);
|
||||||
}catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LOG.warn("Set embargo date error: ",e);
|
LOG.warn("Set embargo date error: ", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//access conditions
|
// access conditions
|
||||||
String accessConditions = metadata.getAccess_conditions();
|
String accessConditions = metadata.getAccess_conditions();
|
||||||
LOG.debug("Read access conditions: "+accessConditions);
|
LOG.debug("Read access conditions: " + accessConditions);
|
||||||
if(accessConditions!=null) {
|
if (accessConditions != null) {
|
||||||
LOG.debug("Set access conditions: "+accessConditions);
|
LOG.debug("Set access conditions: " + accessConditions);
|
||||||
depositionMetadata.setAccess_conditions(accessConditions);
|
depositionMetadata.setAccess_conditions(accessConditions);
|
||||||
}
|
}
|
||||||
|
|
||||||
//license
|
// license
|
||||||
SerializableEnum<LicenseBean> licenses = metadata.getLicenses();
|
List<String> licenses = metadata.getLicenseIDs();
|
||||||
LOG.debug("Read licenses: "+licenses);
|
LOG.debug("Read licenses: " + licenses);
|
||||||
if(licenses!=null) {
|
if (licenses != null && licenses.size() > 0) {
|
||||||
try {
|
try {
|
||||||
LicenseBean lB = licenses.getSelectedValues().get(0);
|
String lB = licenses.get(0);
|
||||||
LOG.debug("Set license: "+lB);
|
LOG.debug("Set license: " + lB);
|
||||||
depositionMetadata.setLicense(lB.getId());
|
depositionMetadata.setLicense(lB);
|
||||||
}catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LOG.warn("Set license error: ",e);
|
LOG.warn("Set license error: ", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//creators
|
// creators
|
||||||
List<Creator> creators = null;
|
List<Creator> creators = null;
|
||||||
List<? extends ZenodoAuthor> zenodoCreators = metadata.getCreators();
|
List<? extends ZenodoAuthor> zenodoCreators = metadata.getCreators();
|
||||||
LOG.debug("Read Creators: "+zenodoCreators);
|
LOG.debug("Read Creators: " + zenodoCreators);
|
||||||
if(zenodoCreators!=null) {
|
if (zenodoCreators != null) {
|
||||||
creators = toCreators(zenodoCreators);
|
creators = toCreators(zenodoCreators);
|
||||||
}
|
}
|
||||||
LOG.debug("Set Creators: "+creators);
|
LOG.debug("Set Creators: " + creators);
|
||||||
depositionMetadata.setCreators(creators);
|
depositionMetadata.setCreators(creators);
|
||||||
|
|
||||||
//contributors
|
// contributors
|
||||||
List<Contributor> contributors = null;
|
List<Contributor> contributors = null;
|
||||||
List<? extends ZenodoAuthor> zenodoContributors = metadata.getContributors();
|
List<? extends ZenodoAuthor> zenodoContributors = metadata.getContributors();
|
||||||
LOG.debug("Read Contributors: "+zenodoContributors);
|
LOG.debug("Read Contributors: " + zenodoContributors);
|
||||||
if(zenodoContributors!=null) {
|
if (zenodoContributors != null) {
|
||||||
contributors = toContributors(zenodoContributors);
|
contributors = toContributors(zenodoContributors);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(LOG.isDebugEnabled()) {
|
if (LOG.isDebugEnabled()) {
|
||||||
for (Contributor contributor : contributors) {
|
for (Contributor contributor : contributors) {
|
||||||
LOG.debug("Set contributor: name "+contributor.getName() + " type "+contributor.getType());
|
LOG.debug("Set contributor: name " + contributor.getName() + " type " + contributor.getType());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
depositionMetadata.setContributors(contributors);
|
depositionMetadata.setContributors(contributors);
|
||||||
|
|
||||||
//keywords
|
// keywords
|
||||||
depositionMetadata.setKeywords(metadata.getKeywords());
|
depositionMetadata.setKeywords(metadata.getKeywords());
|
||||||
|
|
||||||
return depositionMetadata;
|
return depositionMetadata;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* To creators.
|
* To creators.
|
||||||
*
|
*
|
||||||
* @param zenodoCreators the zenodo creators
|
* @param zenodoCreators the zenodo creators
|
||||||
* @return the list
|
* @return the list
|
||||||
*/
|
*/
|
||||||
public static List<Creator> toCreators(List<? extends ZenodoAuthor> zenodoCreators){
|
public static List<Creator> toCreators(List<? extends ZenodoAuthor> zenodoCreators) {
|
||||||
|
|
||||||
if(zenodoCreators==null)
|
if (zenodoCreators == null)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
List<Creator> listOfCreators = new ArrayList<>(zenodoCreators.size());
|
List<Creator> listOfCreators = new ArrayList<>(zenodoCreators.size());
|
||||||
for (ZenodoAuthor zenodoAuthor : zenodoCreators) {
|
for (ZenodoAuthor zenodoAuthor : zenodoCreators) {
|
||||||
Creator creator = new Creator();
|
Creator creator = new Creator();
|
||||||
creator.setName(zenodoAuthor.getName());
|
creator.setName(zenodoAuthor.getName());
|
||||||
if(CkanToZenodoUtil.isNotEmpty(zenodoAuthor.getAffiliation())) {
|
if (CkanToZenodoUtil.isNotEmpty(zenodoAuthor.getAffiliation())) {
|
||||||
creator.setAffiliation(zenodoAuthor.getAffiliation());
|
creator.setAffiliation(zenodoAuthor.getAffiliation());
|
||||||
}
|
}
|
||||||
if(CkanToZenodoUtil.isNotEmpty(zenodoAuthor.getGnd())) {
|
if (CkanToZenodoUtil.isNotEmpty(zenodoAuthor.getGnd())) {
|
||||||
creator.setGnd(zenodoAuthor.getGnd());
|
creator.setGnd(zenodoAuthor.getGnd());
|
||||||
}
|
}
|
||||||
if(CkanToZenodoUtil.isNotEmpty(zenodoAuthor.getOrcid())) {
|
if (CkanToZenodoUtil.isNotEmpty(zenodoAuthor.getOrcid())) {
|
||||||
creator.setOrcid(zenodoAuthor.getOrcid());
|
creator.setOrcid(zenodoAuthor.getOrcid());
|
||||||
}
|
}
|
||||||
listOfCreators.add(creator);
|
listOfCreators.add(creator);
|
||||||
|
@ -605,22 +599,22 @@ public class ItemToZenodoConverter {
|
||||||
* @param zenodoContributors the zenodo contributors
|
* @param zenodoContributors the zenodo contributors
|
||||||
* @return the list
|
* @return the list
|
||||||
*/
|
*/
|
||||||
public static List<Contributor> toContributors(List<? extends ZenodoAuthor> zenodoContributors){
|
public static List<Contributor> toContributors(List<? extends ZenodoAuthor> zenodoContributors) {
|
||||||
|
|
||||||
if(zenodoContributors==null)
|
if (zenodoContributors == null)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
List<Contributor> listOfContributors = new ArrayList<Contributor>(zenodoContributors.size());
|
List<Contributor> listOfContributors = new ArrayList<Contributor>(zenodoContributors.size());
|
||||||
for (ZenodoAuthor zenodoAuthor : zenodoContributors) {
|
for (ZenodoAuthor zenodoAuthor : zenodoContributors) {
|
||||||
Contributor contributor = new Contributor();
|
Contributor contributor = new Contributor();
|
||||||
contributor.setName(zenodoAuthor.getName());
|
contributor.setName(zenodoAuthor.getName());
|
||||||
if(CkanToZenodoUtil.isNotEmpty(zenodoAuthor.getAffiliation())) {
|
if (CkanToZenodoUtil.isNotEmpty(zenodoAuthor.getAffiliation())) {
|
||||||
contributor.setAffiliation(zenodoAuthor.getAffiliation());
|
contributor.setAffiliation(zenodoAuthor.getAffiliation());
|
||||||
}
|
}
|
||||||
if(CkanToZenodoUtil.isNotEmpty(zenodoAuthor.getGnd())) {
|
if (CkanToZenodoUtil.isNotEmpty(zenodoAuthor.getGnd())) {
|
||||||
contributor.setGnd(zenodoAuthor.getGnd());
|
contributor.setGnd(zenodoAuthor.getGnd());
|
||||||
}
|
}
|
||||||
if(CkanToZenodoUtil.isNotEmpty(zenodoAuthor.getOrcid())) {
|
if (CkanToZenodoUtil.isNotEmpty(zenodoAuthor.getOrcid())) {
|
||||||
contributor.setOrcid(zenodoAuthor.getOrcid());
|
contributor.setOrcid(zenodoAuthor.getOrcid());
|
||||||
}
|
}
|
||||||
Type type = null;
|
Type type = null;
|
||||||
|
@ -628,8 +622,8 @@ public class ItemToZenodoConverter {
|
||||||
try {
|
try {
|
||||||
theType = zenodoAuthor.getType().getSelectedValues().get(0);
|
theType = zenodoAuthor.getType().getSelectedValues().get(0);
|
||||||
type = Type.valueOf(theType);
|
type = Type.valueOf(theType);
|
||||||
}catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LOG.error("I'm not able to convert "+theType + " as value of "+Type.class.getName());
|
LOG.error("I'm not able to convert " + theType + " as value of " + Type.class.getName());
|
||||||
}
|
}
|
||||||
contributor.setType(type);
|
contributor.setType(type);
|
||||||
listOfContributors.add(contributor);
|
listOfContributors.add(contributor);
|
||||||
|
@ -638,6 +632,4 @@ public class ItemToZenodoConverter {
|
||||||
return listOfContributors;
|
return listOfContributors;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,7 +32,7 @@ public class ItemTranslateError implements Serializable {
|
||||||
/**
|
/**
|
||||||
* Instantiates a new zenodo translate error.
|
* Instantiates a new zenodo translate error.
|
||||||
*/
|
*/
|
||||||
ItemTranslateError() {
|
public ItemTranslateError() {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1,34 +0,0 @@
|
||||||
package org.gcube.portlets.widgets.ckan2zenodopublisher.shared;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The Interface ZenodoLicense.
|
|
||||||
*
|
|
||||||
* @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
|
|
||||||
*
|
|
||||||
* Jan 21, 2020
|
|
||||||
*/
|
|
||||||
public interface ZenodoLicense {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the id.
|
|
||||||
*
|
|
||||||
* @return the id
|
|
||||||
*/
|
|
||||||
String getId();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the title.
|
|
||||||
*
|
|
||||||
* @return the title
|
|
||||||
*/
|
|
||||||
String getTitle();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the url.
|
|
||||||
*
|
|
||||||
* @return the url
|
|
||||||
*/
|
|
||||||
String getUrl();
|
|
||||||
|
|
||||||
}
|
|
|
@ -0,0 +1,92 @@
|
||||||
|
package org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The Class DOI_dv.
|
||||||
|
*
|
||||||
|
* @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
|
||||||
|
*
|
||||||
|
* Jul 28, 2023
|
||||||
|
*/
|
||||||
|
public class DOI_dv implements Serializable {
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
private String doi;
|
||||||
|
private String doi_url;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Instantiates a new DO I dv.
|
||||||
|
*/
|
||||||
|
public DOI_dv() {
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Instantiates a new DO I dv.
|
||||||
|
*
|
||||||
|
* @param doi the doi
|
||||||
|
* @param doi_url the doi url
|
||||||
|
*/
|
||||||
|
public DOI_dv(String doi, String doi_url) {
|
||||||
|
super();
|
||||||
|
this.doi = doi;
|
||||||
|
this.doi_url = doi_url;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the doi.
|
||||||
|
*
|
||||||
|
* @return the doi
|
||||||
|
*/
|
||||||
|
public String getDoi() {
|
||||||
|
return doi;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the doi url.
|
||||||
|
*
|
||||||
|
* @return the doi url
|
||||||
|
*/
|
||||||
|
public String getDoi_url() {
|
||||||
|
return doi_url;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the doi.
|
||||||
|
*
|
||||||
|
* @param doi the new doi
|
||||||
|
*/
|
||||||
|
public void setDoi(String doi) {
|
||||||
|
this.doi = doi;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the doi url.
|
||||||
|
*
|
||||||
|
* @param doi_url the new doi url
|
||||||
|
*/
|
||||||
|
public void setDoi_url(String doi_url) {
|
||||||
|
this.doi_url = doi_url;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* To string.
|
||||||
|
*
|
||||||
|
* @return the string
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
StringBuilder builder = new StringBuilder();
|
||||||
|
builder.append("DOI_dv [doi=");
|
||||||
|
builder.append(doi);
|
||||||
|
builder.append(", doi_url=");
|
||||||
|
builder.append(doi_url);
|
||||||
|
builder.append("]");
|
||||||
|
return builder.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -1,98 +0,0 @@
|
||||||
package org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped;
|
|
||||||
|
|
||||||
import java.io.Serializable;
|
|
||||||
|
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.ZenodoLicense;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A license bean like the ckan's one.
|
|
||||||
*
|
|
||||||
* @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
|
|
||||||
*
|
|
||||||
* Jan 13, 2020
|
|
||||||
*/
|
|
||||||
public class LicenseBean implements Serializable, ZenodoLicense{
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
private static final long serialVersionUID = 6618784269251750489L;
|
|
||||||
private String id;
|
|
||||||
private String title;
|
|
||||||
private String url;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Instantiates a new license bean.
|
|
||||||
*/
|
|
||||||
public LicenseBean() {
|
|
||||||
super();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Instantiates a new license bean.
|
|
||||||
*
|
|
||||||
* @param id the id
|
|
||||||
* @param title the title
|
|
||||||
* @param url the url
|
|
||||||
*/
|
|
||||||
public LicenseBean(String id, String title, String url) {
|
|
||||||
super();
|
|
||||||
this.id = id;
|
|
||||||
this.title = title;
|
|
||||||
this.url = url;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public String getTitle() {
|
|
||||||
return title;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public void setTitle(String title) {
|
|
||||||
this.title = title;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public String getUrl() {
|
|
||||||
return url;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public void setUrl(String url) {
|
|
||||||
this.url = url;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getId() {
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setId(String id) {
|
|
||||||
this.id = id;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see java.lang.Object#equals(java.lang.Object)
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public boolean equals(Object obj) {
|
|
||||||
return obj.getClass().equals(this.getClass()) && ((LicenseBean)obj).getTitle().equals(this.title);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
StringBuilder builder = new StringBuilder();
|
|
||||||
builder.append("LicenseBean [id=");
|
|
||||||
builder.append(id);
|
|
||||||
builder.append(", title=");
|
|
||||||
builder.append(title);
|
|
||||||
builder.append(", url=");
|
|
||||||
builder.append(url);
|
|
||||||
builder.append("]");
|
|
||||||
return builder.toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -0,0 +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();
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
//}
|
|
@ -1,5 +1,7 @@
|
||||||
package org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped;
|
package org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
|
||||||
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.SerializableEnum;
|
import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.SerializableEnum;
|
||||||
|
|
||||||
|
|
||||||
|
@ -10,7 +12,7 @@ import org.gcube.portlets.widgets.ckan2zenodopublisher.shared.SerializableEnum;
|
||||||
*
|
*
|
||||||
* Jan 15, 2020
|
* Jan 15, 2020
|
||||||
*/
|
*/
|
||||||
public class ZenodoContributor extends ZenodoCreator{
|
public class ZenodoContributor extends ZenodoCreator implements Serializable {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
|
|
@ -28,7 +28,7 @@ public class ZenodoDateInterval implements Serializable {
|
||||||
/**
|
/**
|
||||||
* Instantiates a new zenodo date interval.
|
* Instantiates a new zenodo date interval.
|
||||||
*/
|
*/
|
||||||
ZenodoDateInterval() {
|
public ZenodoDateInterval() {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -0,0 +1,34 @@
|
||||||
|
//package org.gcube.portlets.widgets.ckan2zenodopublisher.shared.wrapped;
|
||||||
|
//
|
||||||
|
//
|
||||||
|
///**
|
||||||
|
// * The Interface ZenodoLicense.
|
||||||
|
// *
|
||||||
|
// * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
|
||||||
|
// *
|
||||||
|
// * Jan 21, 2020
|
||||||
|
// */
|
||||||
|
//public interface ZenodoLicense {
|
||||||
|
//
|
||||||
|
// /**
|
||||||
|
// * Gets the id.
|
||||||
|
// *
|
||||||
|
// * @return the id
|
||||||
|
// */
|
||||||
|
// String getId();
|
||||||
|
//
|
||||||
|
// /**
|
||||||
|
// * Gets the title.
|
||||||
|
// *
|
||||||
|
// * @return the title
|
||||||
|
// */
|
||||||
|
// String getTitle();
|
||||||
|
//
|
||||||
|
// /**
|
||||||
|
// * Gets the url.
|
||||||
|
// *
|
||||||
|
// * @return the url
|
||||||
|
// */
|
||||||
|
// String getUrl();
|
||||||
|
//
|
||||||
|
//}
|
|
@ -77,7 +77,9 @@ public class ZenodoMetadata implements Serializable {
|
||||||
private List<ZenodoDateInterval> dates;
|
private List<ZenodoDateInterval> dates;
|
||||||
private String method; // TODO html
|
private String method; // TODO html
|
||||||
|
|
||||||
private SerializableEnum<LicenseBean> licenses;
|
// private SerializableEnum<String> licenseIDs;
|
||||||
|
|
||||||
|
private List<String> licenseIDs;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Instantiates a new zenodo metadata.
|
* Instantiates a new zenodo metadata.
|
||||||
|
@ -103,10 +105,20 @@ public class ZenodoMetadata implements Serializable {
|
||||||
this.upload_type = upload_type;
|
this.upload_type = upload_type;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the contributors types.
|
||||||
|
*
|
||||||
|
* @return the contributors types
|
||||||
|
*/
|
||||||
public SerializableEnum<String> getContributorsTypes() {
|
public SerializableEnum<String> getContributorsTypes() {
|
||||||
return contributorsTypes;
|
return contributorsTypes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the contributors types.
|
||||||
|
*
|
||||||
|
* @param contributorsTypes the new contributors types
|
||||||
|
*/
|
||||||
public void setContributorsTypes(SerializableEnum<String> contributorsTypes) {
|
public void setContributorsTypes(SerializableEnum<String> contributorsTypes) {
|
||||||
this.contributorsTypes = contributorsTypes;
|
this.contributorsTypes = contributorsTypes;
|
||||||
}
|
}
|
||||||
|
@ -868,23 +880,28 @@ public class ZenodoMetadata implements Serializable {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the licenses.
|
* Sets the license IDs.
|
||||||
*
|
*
|
||||||
* @param licenses the new licenses
|
* @param licensesIDs the new license IDs
|
||||||
*/
|
*/
|
||||||
public void setLicenses(SerializableEnum<LicenseBean> licenses) {
|
public void setLicenseIDs(List<String> licensesIDs) {
|
||||||
this.licenses = licenses;
|
this.licenseIDs = licensesIDs;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the licenses.
|
* Gets the license IDs.
|
||||||
*
|
*
|
||||||
* @return the licenses
|
* @return the license IDs
|
||||||
*/
|
*/
|
||||||
public SerializableEnum<LicenseBean> getLicenses() {
|
public List<String> getLicenseIDs() {
|
||||||
return licenses;
|
return licenseIDs;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* To string.
|
||||||
|
*
|
||||||
|
* @return the string
|
||||||
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
StringBuilder builder = new StringBuilder();
|
StringBuilder builder = new StringBuilder();
|
||||||
|
@ -974,8 +991,8 @@ public class ZenodoMetadata implements Serializable {
|
||||||
builder.append(dates);
|
builder.append(dates);
|
||||||
builder.append(", method=");
|
builder.append(", method=");
|
||||||
builder.append(method);
|
builder.append(method);
|
||||||
builder.append(", licenses=");
|
builder.append(", licenseIDs=");
|
||||||
builder.append(licenses);
|
builder.append(licenseIDs);
|
||||||
builder.append("]");
|
builder.append("]");
|
||||||
return builder.toString();
|
return builder.toString();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,19 +1,101 @@
|
||||||
package org.gcube.portlets.widgets.ckan2zenodopublisher.client;
|
package org.gcube.portlets.widgets.ckan2zenodopublisher.client;
|
||||||
|
|
||||||
import java.util.regex.Matcher;
|
import java.time.Instant;
|
||||||
import java.util.regex.Pattern;
|
import java.util.Date;
|
||||||
|
|
||||||
|
import javax.ws.rs.client.Entity;
|
||||||
|
|
||||||
|
import org.gcube.data.publishing.ckan2zenodo.Fixer;
|
||||||
|
import org.gcube.data.publishing.ckan2zenodo.model.faults.ZenodoException;
|
||||||
|
import org.gcube.data.publishing.ckan2zenodo.model.zenodo.DepositionMetadata;
|
||||||
|
import org.gcube.data.publishing.ckan2zenodo.model.zenodo.ZenodoDeposition;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonInclude.Include;
|
||||||
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
|
import com.fasterxml.jackson.databind.DeserializationFeature;
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
import com.fasterxml.jackson.databind.SerializationFeature;
|
||||||
|
|
||||||
public class Tester {
|
public class Tester {
|
||||||
|
|
||||||
public static String expression = "^\\/dataset(\\?([a-zA-Z0-9_.-]*.+))*";
|
public static String expression = "^\\/dataset(\\?([a-zA-Z0-9_.-]*.+))*";
|
||||||
public static String toMatch = "/dataset?systemtype=E39_Actor&groups=huma_num___nakala";
|
public static String toMatch = "/dataset?systemtype=E39_Actor&groups=huma_num___nakala";
|
||||||
|
|
||||||
public static void main(String[] args) {
|
private static ObjectMapper mapper = new ObjectMapper();
|
||||||
Pattern p = Pattern.compile(expression);
|
|
||||||
Matcher m = p.matcher(toMatch);
|
|
||||||
boolean b = m.matches();
|
|
||||||
|
|
||||||
System.out.println(b);
|
static {
|
||||||
|
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,false);
|
||||||
|
mapper.configure(SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, false);
|
||||||
|
mapper.setSerializationInclusion(Include.NON_NULL);
|
||||||
|
// mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
// public static void main(String[] args) {
|
||||||
|
// Pattern p = Pattern.compile(expression);
|
||||||
|
// Matcher m = p.matcher(toMatch);
|
||||||
|
// boolean b = m.matches();
|
||||||
|
//
|
||||||
|
// System.out.println(b);
|
||||||
|
//
|
||||||
|
// }
|
||||||
|
|
||||||
|
|
||||||
|
public static void main(String[] args) {
|
||||||
|
|
||||||
|
//ObjectMapper mapper = new ObjectMapper();
|
||||||
|
ZenodoDeposition zed = new ZenodoDeposition();
|
||||||
|
DepositionMetadata metadata = new DepositionMetadata();
|
||||||
|
metadata.setPublication_date(Date.from(Instant.now()));
|
||||||
|
//zed.setMetadata(metadata);
|
||||||
|
|
||||||
|
String serialized;
|
||||||
|
try {
|
||||||
|
System.out.println("init json: "+mapper.writeValueAsString(metadata));
|
||||||
|
|
||||||
|
serialized = "{\"metadata\":"+Fixer.fixIncoming(mapper.writeValueAsString(metadata))+"}";
|
||||||
|
System.out.println("serialized: "+serialized);
|
||||||
|
|
||||||
|
Entity<String> JSON = Entity.json(serialized);
|
||||||
|
System.out.println("JSON: "+JSON);
|
||||||
|
ZenodoDeposition object = mapper.readValue(Fixer.fixIncoming(serialized), ZenodoDeposition.class);
|
||||||
|
System.out.println("ZenodoDeposition: "+object);
|
||||||
|
} catch (Exception e) {
|
||||||
|
// TODO Auto-generated catch block
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
|
//System.out.println(metadata.getPublication_date());
|
||||||
|
|
||||||
|
// try {
|
||||||
|
// updateMetadata(metadata);
|
||||||
|
// } catch (ZenodoException e) {
|
||||||
|
// // TODO Auto-generated catch block
|
||||||
|
// e.printStackTrace();
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
|
||||||
|
private static ZenodoDeposition updateMetadata(DepositionMetadata meta) throws ZenodoException {
|
||||||
|
try{
|
||||||
|
String serialized="{\"metadata\":"+Fixer.fixIncoming(mapper.writeValueAsString(meta))+"}";
|
||||||
|
System.out.println("serialized: "+serialized);
|
||||||
|
try {
|
||||||
|
// Response resp = getWebClient().target(credentials.getBaseUrl()).
|
||||||
|
// path(DEPOSITION_BASE_URL).path(depositionId+"").
|
||||||
|
// queryParam(ACCESS_TOKEN, credentials.getKey()).request(CONTENT_TYPE)
|
||||||
|
// .put(Entity.json(serialized));
|
||||||
|
// return check(resp,ZenodoDeposition.class);
|
||||||
|
|
||||||
|
Entity<String> JSON = Entity.json(serialized);
|
||||||
|
System.out.println("JSON: "+JSON);
|
||||||
|
return mapper.readValue(Fixer.fixIncoming(serialized), ZenodoDeposition.class);
|
||||||
|
}catch(Throwable t) {
|
||||||
|
System.out.println("Error while tryin to update "+serialized);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}catch(JsonProcessingException e) {
|
||||||
|
System.out.println("Error while parsing "+meta + " " +e);
|
||||||
|
throw new ZenodoException("Internal error.",e);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue