From a82aaf57b219faa880817cf18213b22944cb730b Mon Sep 17 00:00:00 2001
From: Serafeim Chatzopoulos <s.chatzopoulos@gmail.com>
Date: Wed, 25 Oct 2023 12:05:02 -0700
Subject: [PATCH] Renaming input param for crossref input path

---
 .../bipaffiliations/PrepareAffiliationRelations.java      | 8 ++++----
 .../bipaffiliations/input_actionset_parameter.json        | 4 ++--
 .../dhp/actionmanager/bipaffiliations/job.properties      | 4 ++--
 .../actionmanager/bipaffiliations/oozie_app/workflow.xml  | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/bipaffiliations/PrepareAffiliationRelations.java b/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/bipaffiliations/PrepareAffiliationRelations.java
index 18d98be54..1bdb06ecc 100644
--- a/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/bipaffiliations/PrepareAffiliationRelations.java
+++ b/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/bipaffiliations/PrepareAffiliationRelations.java
@@ -58,8 +58,8 @@ public class PrepareAffiliationRelations implements Serializable {
 		Boolean isSparkSessionManaged = Constants.isSparkSessionManaged(parser);
 		log.info("isSparkSessionManaged: {}", isSparkSessionManaged);
 
-		final String inputPath = parser.get("inputPath");
-		log.info("inputPath: {}", inputPath);
+		final String crossrefInputPath = parser.get("crossrefInputPath");
+		log.info("crossrefInputPath: {}", crossrefInputPath);
 
 		final String pubmedInputPath = parser.get("pubmedInputPath");
 		log.info("pubmedInputPath: {}", pubmedInputPath);
@@ -78,12 +78,12 @@ public class PrepareAffiliationRelations implements Serializable {
 				List<KeyValue> collectedFromCrossref = OafMapperUtils
 					.listKeyValues(ModelConstants.CROSSREF_ID, "Crossref");
 				JavaPairRDD<Text, Text> crossrefRelations = prepareAffiliationRelations(
-					spark, inputPath, collectedFromCrossref);
+					spark, crossrefInputPath, collectedFromCrossref);
 
 				List<KeyValue> collectedFromPubmed = OafMapperUtils
 					.listKeyValues(ModelConstants.PUBMED_CENTRAL_ID, "Pubmed");
 				JavaPairRDD<Text, Text> pubmedRelations = prepareAffiliationRelations(
-					spark, inputPath, collectedFromPubmed);
+					spark, pubmedInputPath, collectedFromPubmed);
 
 				crossrefRelations
 					.union(pubmedRelations)
diff --git a/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/actionmanager/bipaffiliations/input_actionset_parameter.json b/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/actionmanager/bipaffiliations/input_actionset_parameter.json
index 96dcc3b32..c6f905199 100644
--- a/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/actionmanager/bipaffiliations/input_actionset_parameter.json
+++ b/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/actionmanager/bipaffiliations/input_actionset_parameter.json
@@ -6,8 +6,8 @@
     "paramRequired": false
   },
   {
-    "paramName": "ip",
-    "paramLongName": "inputPath",
+    "paramName": "cip",
+    "paramLongName": "crossrefInputPath",
     "paramDescription": "the path to get the input data from Crossref",
     "paramRequired": true
   },
diff --git a/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/actionmanager/bipaffiliations/job.properties b/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/actionmanager/bipaffiliations/job.properties
index fe3cbb633..a3d55ff0c 100644
--- a/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/actionmanager/bipaffiliations/job.properties
+++ b/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/actionmanager/bipaffiliations/job.properties
@@ -31,6 +31,6 @@ spark2SqlQueryExecutionListeners=com.cloudera.spark.lineage.NavigatorQueryListen
 # The following is needed as a property of a workflow
 oozie.wf.application.path=${oozieTopWfApplicationPath}
 
-inputPath=/data/bip-affiliations/data.json
-pubmedInputPath=/data/bip-affiiations/pubmed-data.json
+crossrefInputPath=/data/bip-affiliations/data.json
+pubmedInputPath=/data/bip-affiliations/pubmed-data.json
 outputPath=/tmp/crossref-affiliations-output-v5
diff --git a/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/actionmanager/bipaffiliations/oozie_app/workflow.xml b/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/actionmanager/bipaffiliations/oozie_app/workflow.xml
index e3fdddfd6..c5ac6f884 100644
--- a/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/actionmanager/bipaffiliations/oozie_app/workflow.xml
+++ b/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/actionmanager/bipaffiliations/oozie_app/workflow.xml
@@ -2,7 +2,7 @@
     <parameters>
 
         <property>
-            <name>inputPath</name>
+            <name>crossrefInputPath</name>
             <description>the path where to find the inferred affiliation relations from Crossref</description>
         </property>
         <property>
@@ -100,7 +100,7 @@
                 --conf spark.eventLog.dir=${nameNode}${spark2EventLogDir}
                 --conf spark.sql.warehouse.dir=${sparkSqlWarehouseDir}
             </spark-opts>
-            <arg>--inputPath</arg><arg>${inputPath}</arg>
+            <arg>--crossrefInputPath</arg><arg>${crossrefInputPath}</arg>
             <arg>--pubmedInputPath</arg><arg>${pubmedInputPath}</arg>
             <arg>--outputPath</arg><arg>${outputPath}</arg>
         </spark>