From 67afd06cd182b46ff4a0ae3036209dadccf533db Mon Sep 17 00:00:00 2001
From: Claudio Atzori <claudio.atzori@isti.cnr.it>
Date: Thu, 24 Jun 2021 12:10:17 +0200
Subject: [PATCH] [cleaning] cleaning instance.pid and
 instance.alternateidentifier using the same procedure used to clean
 result.pid

---
 .../oaf/utils/GraphCleaningFunctions.java     | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/GraphCleaningFunctions.java b/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/GraphCleaningFunctions.java
index 7088e56e1b..a75cc52e6a 100644
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/GraphCleaningFunctions.java
+++ b/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/GraphCleaningFunctions.java
@@ -224,24 +224,20 @@ public class GraphCleaningFunctions extends CleaningFunctions {
 			if (Objects.nonNull(r.getInstance())) {
 
 				for (Instance i : r.getInstance()) {
+					if (Objects.nonNull(i.getPid())) {
+						i.setPid(processPidCleaning(i.getPid()));
+					}
+					if (Objects.nonNull(i.getAlternateIdentifier())) {
+						i.setAlternateIdentifier(processPidCleaning(i.getAlternateIdentifier()));
+					}
 					Optional
 						.ofNullable(i.getPid())
 						.ifPresent(pid -> {
-							final Set<StructuredProperty> pids = pid
-								.stream()
-								.filter(Objects::nonNull)
-								.filter(p -> StringUtils.isNotBlank(p.getValue()))
-								.collect(Collectors.toCollection(HashSet::new));
-
+							final Set<StructuredProperty> pids = Sets.newHashSet(pid);
 							Optional
 								.ofNullable(i.getAlternateIdentifier())
 								.ifPresent(altId -> {
-									final Set<StructuredProperty> altIds = altId
-										.stream()
-										.filter(Objects::nonNull)
-										.filter(p -> StringUtils.isNotBlank(p.getValue()))
-										.collect(Collectors.toCollection(HashSet::new));
-
+									final Set<StructuredProperty> altIds = Sets.newHashSet(altId);
 									i.setAlternateIdentifier(Lists.newArrayList(Sets.difference(altIds, pids)));
 								});
 						});