From a562080b0b92e6e30d3410024be136aa9906c142 Mon Sep 17 00:00:00 2001
From: "miriam.baglioni" <miriam.baglioni@isti.cnr.it>
Date: Sat, 11 Apr 2020 16:39:17 +0200
Subject: [PATCH] parameters to be used in the prepared Job and in the actual
 country propagation job

---
 .../input_countrypropagation_parameters.json  | 14 ++++----
 .../input_prepareassoc_parameters.json        | 32 +------------------
 2 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/countrypropagation/input_countrypropagation_parameters.json b/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/countrypropagation/input_countrypropagation_parameters.json
index 829c96420..8884c74c2 100644
--- a/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/countrypropagation/input_countrypropagation_parameters.json
+++ b/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/countrypropagation/input_countrypropagation_parameters.json
@@ -1,10 +1,4 @@
 [
-  {
-    "paramName":"mt",
-    "paramLongName":"master",
-    "paramDescription": "should be local or yarn",
-    "paramRequired": true
-  },
   {
     "paramName":"s",
     "paramLongName":"sourcePath",
@@ -20,7 +14,7 @@
   {
     "paramName":"wu",
     "paramLongName":"writeUpdate",
-    "paramDescription": "true if the update must be writte. No double check if information is already present",
+    "paramDescription": "true if the update must be written. No double check if information is already present",
     "paramRequired": true
   },
   {
@@ -46,5 +40,11 @@
     "paramLongName": "preparedInfoPath",
     "paramDescription": "the path where prepared info have been stored",
     "paramRequired": true
+  },
+  {
+    "paramName": "ssm",
+    "paramLongName": "isSparkSessionManaged",
+    "paramDescription": "the path where prepared info have been stored",
+    "paramRequired": false
   }
 ]
\ No newline at end of file
diff --git a/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/countrypropagation/input_prepareassoc_parameters.json b/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/countrypropagation/input_prepareassoc_parameters.json
index 5d66e4edb..208c0ac44 100644
--- a/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/countrypropagation/input_prepareassoc_parameters.json
+++ b/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/countrypropagation/input_prepareassoc_parameters.json
@@ -1,10 +1,4 @@
 [
-  {
-  "paramName":"mt",
-  "paramLongName":"master",
-  "paramDescription": "should be local or yarn",
-  "paramRequired": true
-  },
   {
     "paramName":"s",
     "paramLongName":"sourcePath",
@@ -17,35 +11,11 @@
     "paramDescription": "the hive metastore uris",
     "paramRequired": true
   },
-  {
-    "paramName":"wu",
-    "paramLongName":"writeUpdate",
-    "paramDescription": "true if the update must be written. No double check if information is already present",
-    "paramRequired": false
-  },
-  {
-    "paramName":"sg",
-    "paramLongName":"saveGraph",
-    "paramDescription": "true if the new version of the graph must be saved",
-    "paramRequired": false
-  },
-  {
-    "paramName":"tn",
-    "paramLongName":"resultTableName",
-    "paramDescription": "the name of the result table we are currently working on",
-    "paramRequired": false
-  },
   {
     "paramName": "out",
     "paramLongName": "outputPath",
     "paramDescription": "the path used to store temporary output files",
-    "paramRequired": false
-  },
-  {
-    "paramName": "p",
-    "paramLongName": "preparedInfoPath",
-    "paramDescription": "the path where prepared info have been stored",
-    "paramRequired": false
+    "paramRequired": true
   },
   {
     "paramName": "w",