From 5b3f8a0e909e020d5fe0b7aba89c798cc22854c8 Mon Sep 17 00:00:00 2001
From: Claudio Atzori <claudio.atzori@isti.cnr.it>
Date: Thu, 7 May 2020 11:41:41 +0200
Subject: [PATCH 1/2] using Encoders.bean instead of kryo

---
 .../SparkCountryPropagationJob3.java          | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/dhp-workflows/dhp-propagation/src/main/java/eu/dnetlib/dhp/countrypropagation/SparkCountryPropagationJob3.java b/dhp-workflows/dhp-propagation/src/main/java/eu/dnetlib/dhp/countrypropagation/SparkCountryPropagationJob3.java
index 3d526ec695..4d1dcfbd5a 100644
--- a/dhp-workflows/dhp-propagation/src/main/java/eu/dnetlib/dhp/countrypropagation/SparkCountryPropagationJob3.java
+++ b/dhp-workflows/dhp-propagation/src/main/java/eu/dnetlib/dhp/countrypropagation/SparkCountryPropagationJob3.java
@@ -71,20 +71,15 @@ public class SparkCountryPropagationJob3 {
 		Class<? extends Result> resultClazz = (Class<? extends Result>) Class.forName(resultClassName);
 
 		SparkConf conf = new SparkConf();
-		conf.registerKryoClasses(ModelSupport.getOafModelClasses());
-
 		runWithSparkSession(
 			conf,
 			isSparkSessionManaged,
-			spark -> {
-
-				execPropagation(
-					spark,
-					inputPath,
-					outputPath,
-					resultClazz,
-					saveGraph);
-			});
+			spark -> execPropagation(
+				spark,
+				inputPath,
+				outputPath,
+				resultClazz,
+				saveGraph));
 	}
 
 	private static <R extends Result> void execPropagation(
@@ -101,7 +96,7 @@ public class SparkCountryPropagationJob3 {
 			spark
 				.read()
 				.json(inputPath)
-				.as(Encoders.kryo(resultClazz))
+				.as(Encoders.bean(resultClazz))
 				.groupByKey((MapFunction<R, String>) result1 -> result1.getId(), Encoders.STRING())
 				.mapGroups(getCountryMergeFn(resultClazz), Encoders.bean(resultClazz))
 				.write()

From e07feb4c5f230bc7e1a130c691afa5935ffa607e Mon Sep 17 00:00:00 2001
From: Claudio Atzori <claudio.atzori@isti.cnr.it>
Date: Thu, 7 May 2020 11:42:46 +0200
Subject: [PATCH 2/2] removed spurious file

---
 : | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 :

diff --git a/: b/:
deleted file mode 100644
index 7768c15276..0000000000
--- a/:
+++ /dev/null
@@ -1,7 +0,0 @@
-Merge remote-tracking branch 'upstream/master'
-
-# Please enter a commit message to explain why this merge is necessary,
-# especially if it merges an updated upstream into a topic branch.
-#
-# Lines starting with '#' will be ignored, and an empty message aborts
-# the commit.