From 3256b9c836542f90959630be1b6580598dde8827 Mon Sep 17 00:00:00 2001
From: Claudio Atzori <claudio.atzori@isti.cnr.it>
Date: Fri, 19 Mar 2021 09:36:12 +0100
Subject: [PATCH] code formatting

---
 .../dhp/schema/oaf/CleaningFunctions.java     | 29 ++++++++++---------
 .../schema/oaf/utils/IdentifierFactory.java   |  4 +--
 2 files changed, 18 insertions(+), 15 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 19b4c7618..1cee3058e 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
@@ -5,13 +5,13 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import com.google.common.collect.Sets;
-import eu.dnetlib.dhp.schema.oaf.utils.PidBlacklistProvider;
 import org.apache.commons.lang3.StringUtils;
 
 import com.clearspring.analytics.util.Lists;
+import com.google.common.collect.Sets;
 
 import eu.dnetlib.dhp.schema.common.ModelConstants;
+import eu.dnetlib.dhp.schema.oaf.utils.PidBlacklistProvider;
 
 public class CleaningFunctions {
 
@@ -148,16 +148,18 @@ public class CleaningFunctions {
 			}
 			if (Objects.nonNull(r.getInstance())) {
 
-
-
 				for (Instance i : r.getInstance()) {
 					final Set<StructuredProperty> pids = Sets.newHashSet(i.getPid());
-					i.setAlternateIdentifier(
-							Optional.ofNullable(i.getAlternateIdentifier())
-							.map(altId -> altId.stream()
-									.filter(p -> !pids.contains(p))
-									.collect(Collectors.toList()))
-							.orElse(Lists.newArrayList()));
+					i
+						.setAlternateIdentifier(
+							Optional
+								.ofNullable(i.getAlternateIdentifier())
+								.map(
+									altId -> altId
+										.stream()
+										.filter(p -> !pids.contains(p))
+										.collect(Collectors.toList()))
+								.orElse(Lists.newArrayList()));
 
 					if (Objects.isNull(i.getAccessright()) || StringUtils.isBlank(i.getAccessright().getClassid())) {
 						i
@@ -236,7 +238,8 @@ public class CleaningFunctions {
 	}
 
 	private static List<StructuredProperty> processPidCleaning(List<StructuredProperty> pids) {
-		return pids.stream()
+		return pids
+			.stream()
 			.filter(Objects::nonNull)
 			.filter(sp -> StringUtils.isNotBlank(StringUtils.trim(sp.getValue())))
 			.filter(sp -> !PID_BLACKLIST.contains(sp.getValue().trim().toLowerCase()))
@@ -286,8 +289,8 @@ public class CleaningFunctions {
 	public static boolean pidFilter(StructuredProperty s) {
 		final String pidValue = s.getValue();
 		if (Objects.isNull(s.getQualifier()) ||
-				StringUtils.isBlank(pidValue) ||
-				StringUtils.isBlank(pidValue.replaceAll("(?:\\n|\\r|\\t|\\s)", ""))) {
+			StringUtils.isBlank(pidValue) ||
+			StringUtils.isBlank(pidValue.replaceAll("(?:\\n|\\r|\\t|\\s)", ""))) {
 			return false;
 		}
 		if (CleaningFunctions.PID_BLACKLIST.contains(pidValue)) {
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactory.java b/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactory.java
index 31f60636a..fe4642ee9 100644
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactory.java
+++ b/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactory.java
@@ -71,7 +71,7 @@ public class IdentifierFactory implements Serializable {
 				.stream()
 				.filter(Objects::nonNull)
 				.filter(s -> s.getQualifier() != null && "doi".equalsIgnoreCase(s.getQualifier().getClassid()))
-				.filter(IdentifierFactory::pidFilter)
+				.filter(CleaningFunctions::pidFilter)
 				.findAny()
 				.orElse(null);
 		} else {
@@ -81,7 +81,7 @@ public class IdentifierFactory implements Serializable {
 					.stream()
 					.filter(i -> i.getPid() != null)
 					.flatMap(i -> i.getPid().stream())
-					.filter(IdentifierFactory::pidFilter)
+					.filter(CleaningFunctions::pidFilter)
 					.findAny()
 					.orElse(null);
 			}