From 5a043e95ea0c1011f451b4e662edfc05f3f27637 Mon Sep 17 00:00:00 2001
From: Claudio Atzori <claudio.atzori@isti.cnr.it>
Date: Fri, 19 Mar 2021 11:37:27 +0100
Subject: [PATCH] code formatting

---
 .../graph/merge/MergeGraphTableSparkJob.java  | 118 +++++++++---------
 1 file changed, 59 insertions(+), 59 deletions(-)

diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/merge/MergeGraphTableSparkJob.java b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/merge/MergeGraphTableSparkJob.java
index 5f6550e10e..68623dd55b 100644
--- a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/merge/MergeGraphTableSparkJob.java
+++ b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/merge/MergeGraphTableSparkJob.java
@@ -53,22 +53,22 @@ public class MergeGraphTableSparkJob {
 	public static void main(String[] args) throws Exception {
 
 		String jsonConfiguration = IOUtils
-				.toString(
-						CleanGraphSparkJob.class
-								.getResourceAsStream(
-										"/eu/dnetlib/dhp/oa/graph/merge_graphs_parameters.json"));
+			.toString(
+				CleanGraphSparkJob.class
+					.getResourceAsStream(
+						"/eu/dnetlib/dhp/oa/graph/merge_graphs_parameters.json"));
 		final ArgumentApplicationParser parser = new ArgumentApplicationParser(jsonConfiguration);
 		parser.parseArgument(args);
 
 		String priority = Optional
-				.ofNullable(parser.get("priority"))
-				.orElse(PRIORITY_DEFAULT);
+			.ofNullable(parser.get("priority"))
+			.orElse(PRIORITY_DEFAULT);
 		log.info("priority: {}", priority);
 
 		Boolean isSparkSessionManaged = Optional
-				.ofNullable(parser.get("isSparkSessionManaged"))
-				.map(Boolean::valueOf)
-				.orElse(Boolean.TRUE);
+			.ofNullable(parser.get("isSparkSessionManaged"))
+			.map(Boolean::valueOf)
+			.orElse(Boolean.TRUE);
 		log.info("isSparkSessionManaged: {}", isSparkSessionManaged);
 
 		String betaInputPath = parser.get("betaInputPath");
@@ -90,55 +90,55 @@ public class MergeGraphTableSparkJob {
 		conf.registerKryoClasses(ModelSupport.getOafModelClasses());
 
 		runWithSparkSession(
-				conf,
-				isSparkSessionManaged,
-				spark -> {
-					removeOutputDir(spark, outputPath);
-					mergeGraphTable(spark, priority, betaInputPath, prodInputPath, entityClazz, entityClazz, outputPath);
-				});
+			conf,
+			isSparkSessionManaged,
+			spark -> {
+				removeOutputDir(spark, outputPath);
+				mergeGraphTable(spark, priority, betaInputPath, prodInputPath, entityClazz, entityClazz, outputPath);
+			});
 	}
 
 	private static <P extends Oaf, B extends Oaf> void mergeGraphTable(
-			SparkSession spark,
-			String priority,
-			String betaInputPath,
-			String prodInputPath,
-			Class<P> p_clazz,
-			Class<B> b_clazz,
-			String outputPath) {
+		SparkSession spark,
+		String priority,
+		String betaInputPath,
+		String prodInputPath,
+		Class<P> p_clazz,
+		Class<B> b_clazz,
+		String outputPath) {
 
 		Dataset<Tuple2<String, B>> beta = readTableFromPath(spark, betaInputPath, b_clazz);
 		Dataset<Tuple2<String, P>> prod = readTableFromPath(spark, prodInputPath, p_clazz);
 
 		prod
-				.joinWith(beta, prod.col("_1").equalTo(beta.col("_1")), "full_outer")
-				.map((MapFunction<Tuple2<Tuple2<String, P>, Tuple2<String, B>>, P>) value -> {
-					Optional<P> p = Optional.ofNullable(value._1()).map(Tuple2::_2);
-					Optional<B> b = Optional.ofNullable(value._2()).map(Tuple2::_2);
+			.joinWith(beta, prod.col("_1").equalTo(beta.col("_1")), "full_outer")
+			.map((MapFunction<Tuple2<Tuple2<String, P>, Tuple2<String, B>>, P>) value -> {
+				Optional<P> p = Optional.ofNullable(value._1()).map(Tuple2::_2);
+				Optional<B> b = Optional.ofNullable(value._2()).map(Tuple2::_2);
 
-					if (p.orElse((P) b.orElse((B) DATASOURCE)) instanceof Datasource) {
-						return mergeDatasource(p, b);
-					}
-					switch (priority) {
-						default:
-						case "BETA":
-							return mergeWithPriorityToBETA(p, b);
-						case "PROD":
-							return mergeWithPriorityToPROD(p, b);
-					}
-				}, Encoders.bean(p_clazz))
-				.filter((FilterFunction<P>) Objects::nonNull)
-				.filter((FilterFunction<P>) o -> {
-					HashSet<String> collectedFromNames = Optional
-							.ofNullable(o.getCollectedfrom())
-							.map(c -> c.stream().map(KeyValue::getValue).collect(Collectors.toCollection(HashSet::new)))
-							.orElse(new HashSet<String>());
-					return !collectedFromNames.contains("Datacite");
-				})
-				.write()
-				.mode(SaveMode.Overwrite)
-				.option("compression", "gzip")
-				.json(outputPath);
+				if (p.orElse((P) b.orElse((B) DATASOURCE)) instanceof Datasource) {
+					return mergeDatasource(p, b);
+				}
+				switch (priority) {
+					default:
+					case "BETA":
+						return mergeWithPriorityToBETA(p, b);
+					case "PROD":
+						return mergeWithPriorityToPROD(p, b);
+				}
+			}, Encoders.bean(p_clazz))
+			.filter((FilterFunction<P>) Objects::nonNull)
+			.filter((FilterFunction<P>) o -> {
+				HashSet<String> collectedFromNames = Optional
+					.ofNullable(o.getCollectedfrom())
+					.map(c -> c.stream().map(KeyValue::getValue).collect(Collectors.toCollection(HashSet::new)))
+					.orElse(new HashSet<String>());
+				return !collectedFromNames.contains("Datacite");
+			})
+			.write()
+			.mode(SaveMode.Overwrite)
+			.option("compression", "gzip")
+			.json(outputPath);
 	}
 
 	/**
@@ -192,19 +192,19 @@ public class MergeGraphTableSparkJob {
 	}
 
 	private static <T extends Oaf> Dataset<Tuple2<String, T>> readTableFromPath(
-			SparkSession spark, String inputEntityPath, Class<T> clazz) {
+		SparkSession spark, String inputEntityPath, Class<T> clazz) {
 
 		log.info("Reading Graph table from: {}", inputEntityPath);
 		return spark
-				.read()
-				.textFile(inputEntityPath)
-				.map(
-						(MapFunction<String, Tuple2<String, T>>) value -> {
-							final T t = OBJECT_MAPPER.readValue(value, clazz);
-							final String id = ModelSupport.idFn().apply(t);
-							return new Tuple2<>(id, t);
-						},
-						Encoders.tuple(Encoders.STRING(), Encoders.kryo(clazz)));
+			.read()
+			.textFile(inputEntityPath)
+			.map(
+				(MapFunction<String, Tuple2<String, T>>) value -> {
+					final T t = OBJECT_MAPPER.readValue(value, clazz);
+					final String id = ModelSupport.idFn().apply(t);
+					return new Tuple2<>(id, t);
+				},
+				Encoders.tuple(Encoders.STRING(), Encoders.kryo(clazz)));
 	}
 
 	private static void removeOutputDir(SparkSession spark, String path) {