antonis.lempesis
/
dnet-hadoop
forked from D-Net/dnet-hadoop
1
1
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

fixed NPE

This commit is contained in:
Sandro La Bruzzo 2020-02-26 14:31:34 +01:00
parent bc342bf73a
commit 5d0f46651b
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/provision/scholix/ScholixResource.java
View File

@ -34,7 +34,9 @@ public class ScholixResource implements Serializable {
resource.setObjectType(summary.getTypology().toString()); resource.setObjectType(summary.getTypology().toString());
resource.setTitle(summary.getTitle().stream().findAny().orElse(null));
if (summary.getTitle() != null)
resource.setTitle(summary.getTitle().stream().findAny().orElse(null));
if (summary.getAuthor() != null) if (summary.getAuthor() != null)
resource.setCreator(summary.getAuthor().stream() resource.setCreator(summary.getAuthor().stream()
@ -53,8 +55,8 @@ public class ScholixResource implements Serializable {
resource.setCollectedFrom(summary.getDatasources().stream() resource.setCollectedFrom(summary.getDatasources().stream()
.map(d -> .map(d ->
new ScholixCollectedFrom(new ScholixEntityId(d.getDatasourceName(), new ScholixCollectedFrom(new ScholixEntityId(d.getDatasourceName(),
Collections.singletonList(new ScholixIdentifier(d.getDatasourceId(), "dnet_identifier")) Collections.singletonList(new ScholixIdentifier(d.getDatasourceId(), "dnet_identifier"))
), "collected", d.getCompletionStatus())) ), "collected", d.getCompletionStatus()))
.collect(Collectors.toList())); .collect(Collectors.toList()));
return resource; return resource;

4
dhp-workflows/dhp-graph-provision/src/main/resources/eu/dnetlib/dhp/graph/Application/provision/oozie_app/workflow.xml
View File

@ -27,7 +27,7 @@
</parameters> </parameters>
<start to="generateSummary"/> <start to="generateScholix"/>
<kill name="Kill"> <kill name="Kill">
<message>Action failed, error message[${wf:errorMessage(wf:lastErrorNode())}]</message> <message>Action failed, error message[${wf:errorMessage(wf:lastErrorNode())}]</message>
@ -73,7 +73,7 @@
<arg>--workingDirPath</arg><arg>${workingDirPath}</arg> <arg>--workingDirPath</arg><arg>${workingDirPath}</arg>
<arg>--graphPath</arg><arg>${graphPath}</arg> <arg>--graphPath</arg><arg>${graphPath}</arg>
</spark> </spark>
<ok to="generateScholix"/> <ok to="indexSummary"/>
<error to="Kill"/> <error to="Kill"/>
</action> </action>