From 3c5ce1dadaed252293a8687acba3210500200ed0 Mon Sep 17 00:00:00 2001
From: Claudio Atzori <claudio.atzori@isti.cnr.it>
Date: Wed, 9 Dec 2020 17:07:20 +0100
Subject: [PATCH] code formatting

---
 .../dhp/schema/oaf/CleaningFunctions.java     |  6 ++---
 .../schema/oaf/utils/IdentifierFactory.java   | 13 +++++-----
 .../PromoteActionPayloadForGraphTableJob.java | 24 +++++++++----------
 3 files changed, 22 insertions(+), 21 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 8ce4285d6..da4ed63a9 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
@@ -261,9 +261,9 @@ public class CleaningFunctions {
 	 */
 	private static boolean filterPid(StructuredProperty pid) {
 		String value = Optional
-				.ofNullable(pid.getValue())
-				.map(s -> StringUtils.replaceAll(s, "\\s", ""))
-				.orElse("");
+			.ofNullable(pid.getValue())
+			.map(s -> StringUtils.replaceAll(s, "\\s", ""))
+			.orElse("");
 		if (StringUtils.isBlank(value)) {
 			return false;
 		}
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 9978194ac..fd90ee126 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
@@ -1,12 +1,6 @@
 
 package eu.dnetlib.dhp.schema.oaf.utils;
 
-import eu.dnetlib.dhp.schema.oaf.CleaningFunctions;
-import eu.dnetlib.dhp.schema.oaf.OafEntity;
-import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
-import eu.dnetlib.dhp.utils.DHPUtils;
-import org.apache.commons.lang3.StringUtils;
-
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
@@ -14,6 +8,13 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.StringUtils;
+
+import eu.dnetlib.dhp.schema.oaf.CleaningFunctions;
+import eu.dnetlib.dhp.schema.oaf.OafEntity;
+import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
+import eu.dnetlib.dhp.utils.DHPUtils;
+
 /**
  * Factory class for OpenAIRE identifiers in the Graph
  */
diff --git a/dhp-workflows/dhp-actionmanager/src/main/java/eu/dnetlib/dhp/actionmanager/promote/PromoteActionPayloadForGraphTableJob.java b/dhp-workflows/dhp-actionmanager/src/main/java/eu/dnetlib/dhp/actionmanager/promote/PromoteActionPayloadForGraphTableJob.java
index be775f358..bab4377bd 100644
--- a/dhp-workflows/dhp-actionmanager/src/main/java/eu/dnetlib/dhp/actionmanager/promote/PromoteActionPayloadForGraphTableJob.java
+++ b/dhp-workflows/dhp-actionmanager/src/main/java/eu/dnetlib/dhp/actionmanager/promote/PromoteActionPayloadForGraphTableJob.java
@@ -69,9 +69,9 @@ public class PromoteActionPayloadForGraphTableJob {
 		logger.info("strategy: {}", strategy);
 
 		Boolean shouldGroupById = Optional
-				.ofNullable(parser.get("shouldGroupById"))
-				.map(Boolean::valueOf)
-				.orElse(true);
+			.ofNullable(parser.get("shouldGroupById"))
+			.map(Boolean::valueOf)
+			.orElse(true);
 		logger.info("shouldGroupById: {}", shouldGroupById);
 
 		Class<? extends Oaf> rowClazz = (Class<? extends Oaf>) Class.forName(graphTableClassName);
@@ -116,13 +116,13 @@ public class PromoteActionPayloadForGraphTableJob {
 	}
 
 	private static <G extends Oaf, A extends Oaf> void promoteActionPayloadForGraphTable(
-			SparkSession spark,
-			String inputGraphTablePath,
-			String inputActionPayloadPath,
-			String outputGraphTablePath,
-			MergeAndGet.Strategy strategy,
-			Class<G> rowClazz,
-			Class<A> actionPayloadClazz, Boolean shouldGroupById) {
+		SparkSession spark,
+		String inputGraphTablePath,
+		String inputActionPayloadPath,
+		String outputGraphTablePath,
+		MergeAndGet.Strategy strategy,
+		Class<G> rowClazz,
+		Class<A> actionPayloadClazz, Boolean shouldGroupById) {
 		Dataset<G> rowDS = readGraphTable(spark, inputGraphTablePath, rowClazz);
 		Dataset<A> actionPayloadDS = readActionPayload(spark, inputActionPayloadPath, actionPayloadClazz);
 
@@ -208,8 +208,8 @@ public class PromoteActionPayloadForGraphTableJob {
 
 		if (shouldGroupById) {
 			return PromoteActionPayloadFunctions
-					.groupGraphTableByIdAndMerge(
-							joinedAndMerged, rowIdFn, mergeRowsAndGetFn, zeroFn, isNotZeroFn, rowClazz);
+				.groupGraphTableByIdAndMerge(
+					joinedAndMerged, rowIdFn, mergeRowsAndGetFn, zeroFn, isNotZeroFn, rowClazz);
 		} else {
 			return joinedAndMerged;
 		}