From 5e2fa996aa76b13b08d08127a4abdb25edb1e25a Mon Sep 17 00:00:00 2001
From: sandro <sandro.labruzzo@isti.cnr.it>
Date: Fri, 17 Apr 2020 12:11:51 +0200
Subject: [PATCH] fixed problem with conversion of long into string

---
 .../dhp/schema/oaf/StructuredProperty.java    |  2 +-
 .../provision/update/Datacite2Scholix.java    | 10 ++++++++--
 .../dhp/sx/synch/oozie_app/config-default.xml |  4 ++++
 .../dhp/provision/DataciteClientTest.java     | 19 ++++++++++++++-----
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/StructuredProperty.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/StructuredProperty.java
index f6c6b7335..5df6b80f3 100644
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/StructuredProperty.java
+++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/StructuredProperty.java
@@ -2,7 +2,7 @@ package eu.dnetlib.dhp.schema.oaf;
 
 import java.io.Serializable;
 
-public class StructuredProperty implements Serializable {
+public class    StructuredProperty implements Serializable {
 
     private String value;
 
diff --git a/dhp-workflows/dhp-graph-provision-scholexplorer/src/main/java/eu/dnetlib/dhp/provision/update/Datacite2Scholix.java b/dhp-workflows/dhp-graph-provision-scholexplorer/src/main/java/eu/dnetlib/dhp/provision/update/Datacite2Scholix.java
index ac05a8350..fd2e37837 100644
--- a/dhp-workflows/dhp-graph-provision-scholexplorer/src/main/java/eu/dnetlib/dhp/provision/update/Datacite2Scholix.java
+++ b/dhp-workflows/dhp-graph-provision-scholexplorer/src/main/java/eu/dnetlib/dhp/provision/update/Datacite2Scholix.java
@@ -34,8 +34,13 @@ public class Datacite2Scholix {
         ScholixResource resource = generateDataciteScholixResource(dJson);
 
         return relIds.stream().flatMap(s-> {
-            final List<Scholix> result = generateScholix(resource, s.get("relatedIdentifier"), s.get("relatedIdentifierType"), s.get("relationType"), updated);
-            return result.stream();
+            try {
+                final List<Scholix> result = generateScholix(resource, ""+s.get("relatedIdentifier"), s.get("relatedIdentifierType"), s.get("relationType"), updated);
+                return result.stream();
+            } catch (Throwable e)
+            {
+                return new ArrayList<Scholix>().stream();
+            }
         }).collect(Collectors.toList());
     }
 
@@ -48,6 +53,7 @@ public class Datacite2Scholix {
     }
 
     private List<Scholix> generateScholix(ScholixResource source, final String pid, final String pidtype, final String relType, final String updated) {
+
         if ("doi".equalsIgnoreCase(pidtype)) {
             ScholixResource target = new ScholixResource();
             target.setIdentifier(Collections.singletonList(new ScholixIdentifier(pid, pidtype)));
diff --git a/dhp-workflows/dhp-graph-provision-scholexplorer/src/main/resources/eu/dnetlib/dhp/sx/synch/oozie_app/config-default.xml b/dhp-workflows/dhp-graph-provision-scholexplorer/src/main/resources/eu/dnetlib/dhp/sx/synch/oozie_app/config-default.xml
index 6fb2a1253..7c1a43e51 100644
--- a/dhp-workflows/dhp-graph-provision-scholexplorer/src/main/resources/eu/dnetlib/dhp/sx/synch/oozie_app/config-default.xml
+++ b/dhp-workflows/dhp-graph-provision-scholexplorer/src/main/resources/eu/dnetlib/dhp/sx/synch/oozie_app/config-default.xml
@@ -7,4 +7,8 @@
         <name>oozie.action.sharelib.for.spark</name>
         <value>spark2</value>
     </property>
+    <property>
+        <name>oozie.launcher.mapreduce.user.classpath.first</name>
+        <value>true</value>
+    </property>
 </configuration>
\ No newline at end of file
diff --git a/dhp-workflows/dhp-graph-provision-scholexplorer/src/test/java/eu/dnetlib/dhp/provision/DataciteClientTest.java b/dhp-workflows/dhp-graph-provision-scholexplorer/src/test/java/eu/dnetlib/dhp/provision/DataciteClientTest.java
index f4a480163..cc4b0047a 100644
--- a/dhp-workflows/dhp-graph-provision-scholexplorer/src/test/java/eu/dnetlib/dhp/provision/DataciteClientTest.java
+++ b/dhp-workflows/dhp-graph-provision-scholexplorer/src/test/java/eu/dnetlib/dhp/provision/DataciteClientTest.java
@@ -3,16 +3,12 @@ package eu.dnetlib.dhp.provision;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import eu.dnetlib.dhp.provision.scholix.Scholix;
 import eu.dnetlib.dhp.provision.scholix.ScholixResource;
-import eu.dnetlib.dhp.provision.update.CrossrefClient;
-import eu.dnetlib.dhp.provision.update.Datacite2Scholix;
-import eu.dnetlib.dhp.provision.update.DataciteClient;
-import eu.dnetlib.dhp.provision.update.DataciteClientIterator;
+import eu.dnetlib.dhp.provision.update.*;
 import eu.dnetlib.scholexplorer.relation.RelationMapper;
 import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
 import java.util.List;
 
 
@@ -27,6 +23,19 @@ public class DataciteClientTest {
         System.out.println(new ObjectMapper().writeValueAsString(s));
     }
 
+
+//    public void  testS() throws Exception {
+//        RetrieveUpdateFromDatacite.main(new String[]{
+//                "-n", "file:///data/new_s2.txt",
+//                "-t", "/data/new_s2.txt",
+//                "-ts", "1586974078",
+//                "-ih", "ip-90-147-167-25.ct1.garrservices.it",
+//                "-in", "datacite",
+//        });
+//
+//    }
+
+
     public void testResolveDataset() throws Exception {
         DataciteClient dc = new DataciteClient("ip-90-147-167-25.ct1.garrservices.it");
         ScholixResource datasetByDOI = dc.getDatasetByDOI("10.17182/hepdata.15392.v1/t5");