From 902d05f54818259437dd9e84e7613258542ee2c1 Mon Sep 17 00:00:00 2001
From: Claudio Atzori <claudio.atzori@isti.cnr.it>
Date: Mon, 12 Apr 2021 17:31:40 +0200
Subject: [PATCH] [cleaning] avoiding NPEs handling null author PIDs

---
 .../java/eu/dnetlib/dhp/schema/oaf/CleaningFunctions.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/CleaningFunctions.java b/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/CleaningFunctions.java
index b9d89a82b..917733a14 100644
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/CleaningFunctions.java
+++ b/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/CleaningFunctions.java
@@ -58,9 +58,9 @@ public class CleaningFunctions {
 				}
 			}
 			if (Objects.nonNull(r.getAuthor())) {
-				r.getAuthor().forEach(a -> {
+				r.getAuthor().stream().filter(Objects::nonNull).forEach(a -> {
 					if (Objects.nonNull(a.getPid())) {
-						a.getPid().forEach(p -> {
+						a.getPid().stream().filter(Objects::nonNull).forEach(p -> {
 							fixVocabName(p.getQualifier(), ModelConstants.DNET_PID_TYPES);
 						});
 					}
@@ -218,6 +218,7 @@ public class CleaningFunctions {
 								a
 									.getPid()
 									.stream()
+									.filter(Objects::nonNull)
 									.filter(p -> Objects.nonNull(p.getQualifier()))
 									.filter(p -> StringUtils.isNotBlank(p.getValue()))
 									.map(p -> {