diff --git a/dhp-workflows/dhp-bulktag/src/main/java/eu/dnetlib/dhp/bulktag/SparkBulkTagJob2.java b/dhp-workflows/dhp-bulktag/src/main/java/eu/dnetlib/dhp/bulktag/SparkBulkTagJob2.java index 7a8ae0bd0..a6e49e93b 100644 --- a/dhp-workflows/dhp-bulktag/src/main/java/eu/dnetlib/dhp/bulktag/SparkBulkTagJob2.java +++ b/dhp-workflows/dhp-bulktag/src/main/java/eu/dnetlib/dhp/bulktag/SparkBulkTagJob2.java @@ -57,9 +57,9 @@ public class SparkBulkTagJob2 { final String outputPath = parser.get("outputPath"); log.info("outputPath: {}", outputPath); - ProtoMap protoMappingParams = new Gson().fromJson(parser.get("protoMap"), ProtoMap.class); + ProtoMap protoMappingParams = new Gson().fromJson(parser.get("pathMap"), ProtoMap.class); ; - log.info("protoMap: {}", new Gson().toJson(protoMappingParams)); + log.info("pathMap: {}", new Gson().toJson(protoMappingParams)); final String resultClassName = parser.get("resultTableName"); log.info("resultTableName: {}", resultClassName); @@ -80,7 +80,7 @@ public class SparkBulkTagJob2 { if (isTest) { cc = CommunityConfigurationFactory.newInstance(taggingConf); } else { - cc = QueryInformationSystem.getCommunityConfiguration(parser.get("isLookupUrl")); + cc = QueryInformationSystem.getCommunityConfiguration(parser.get("isLookUpUrl")); } runWithSparkSession( diff --git a/dhp-workflows/dhp-bulktag/src/main/resources/eu/dnetlib/dhp/bulktag/input_bulkTag_parameters.json b/dhp-workflows/dhp-bulktag/src/main/resources/eu/dnetlib/dhp/bulktag/input_bulkTag_parameters.json index b370467ae..a37d7d168 100644 --- a/dhp-workflows/dhp-bulktag/src/main/resources/eu/dnetlib/dhp/bulktag/input_bulkTag_parameters.json +++ b/dhp-workflows/dhp-bulktag/src/main/resources/eu/dnetlib/dhp/bulktag/input_bulkTag_parameters.json @@ -1,7 +1,7 @@ [ { "paramName":"is", - "paramLongName":"isLookupUrl", + "paramLongName":"isLookUpUrl", "paramDescription": "URL of the isLookUp Service", "paramRequired": true }, @@ -13,7 +13,7 @@ }, { "paramName": "pm", - "paramLongName":"protoMap", + "paramLongName":"pathMap", "paramDescription": "the json path associated to each selection field", "paramRequired": true }, diff --git a/dhp-workflows/dhp-bulktag/src/main/resources/eu/dnetlib/dhp/bulktag/oozie_app/workflow.xml b/dhp-workflows/dhp-bulktag/src/main/resources/eu/dnetlib/dhp/bulktag/oozie_app/workflow.xml index fe8f706e7..718ad40ec 100644 --- a/dhp-workflows/dhp-bulktag/src/main/resources/eu/dnetlib/dhp/bulktag/oozie_app/workflow.xml +++ b/dhp-workflows/dhp-bulktag/src/main/resources/eu/dnetlib/dhp/bulktag/oozie_app/workflow.xml @@ -5,11 +5,11 @@ the source path - isLookupUrl + isLookUpUrl the isLookup service endpoint - protoMap + pathMap the json path associated to each selection field @@ -121,8 +121,8 @@ --sourcePath${sourcePath}/publication --resultTableNameeu.dnetlib.dhp.schema.oaf.Publication --outputPath${outputPath}/publication - --protoMap${protoMap} - --isLookupUrl${isLookupUrl} + --pathMap${pathMap} + --isLookUpUrl${isLookUpUrl} @@ -149,8 +149,8 @@ --sourcePath${sourcePath}/dataset --resultTableNameeu.dnetlib.dhp.schema.oaf.Dataset --outputPath${outputPath}/dataset - --protoMap${protoMap} - --isLookupUrl${isLookupUrl} + --pathMap${pathMap} + --isLookUpUrl${isLookUpUrl} @@ -177,8 +177,8 @@ --sourcePath${sourcePath}/otherresearchproduct --resultTableNameeu.dnetlib.dhp.schema.oaf.OtherResearchProduct --outputPath${outputPath}/otherresearchproduct - --protoMap${protoMap} - --isLookupUrl${isLookupUrl} + --pathMap${pathMap} + --isLookUpUrl${isLookUpUrl} @@ -205,8 +205,8 @@ --sourcePath${sourcePath}/software --resultTableNameeu.dnetlib.dhp.schema.oaf.Software --outputPath${outputPath}/software - --protoMap${protoMap} - --isLookupUrl${isLookupUrl} + --pathMap${pathMap} + --isLookUpUrl${isLookUpUrl} diff --git a/dhp-workflows/dhp-bulktag/src/test/java/eu/dnetlib/dhp/BulkTagJobTest.java b/dhp-workflows/dhp-bulktag/src/test/java/eu/dnetlib/dhp/BulkTagJobTest.java index 6873f2df9..cb5015ba1 100644 --- a/dhp-workflows/dhp-bulktag/src/test/java/eu/dnetlib/dhp/BulkTagJobTest.java +++ b/dhp-workflows/dhp-bulktag/src/test/java/eu/dnetlib/dhp/BulkTagJobTest.java @@ -99,9 +99,9 @@ public class BulkTagJobTest { "eu.dnetlib.dhp.schema.oaf.Dataset", "-outputPath", workingDir.toString() + "/dataset", - "-isLookupUrl", + "-isLookUpUrl", "http://beta.services.openaire.eu:8280/is/services/isLookUp", - "-protoMap", + "-pathMap", "{ \"author\" : \"$['author'][*]['fullname']\"," + " \"title\" : \"$['title'][*]['value']\"," + " \"orcid\" : \"$['author'][*]['pid'][*][?(@['key']=='ORCID')]['value']\"," @@ -151,9 +151,9 @@ public class BulkTagJobTest { "eu.dnetlib.dhp.schema.oaf.Dataset", "-outputPath", workingDir.toString() + "/dataset", - "-isLookupUrl", + "-isLookUpUrl", "http://beta.services.openaire.eu:8280/is/services/isLookUp", - "-protoMap", + "-pathMap", "{ \"author\" : \"$['author'][*]['fullname']\"," + " \"title\" : \"$['title'][*]['value']\"," + " \"orcid\" : \"$['author'][*]['pid'][*][?(@['key']=='ORCID')]['value']\"," @@ -258,9 +258,9 @@ public class BulkTagJobTest { "eu.dnetlib.dhp.schema.oaf.Dataset", "-outputPath", workingDir.toString() + "/dataset", - "-isLookupUrl", + "-isLookUpUrl", "http://beta.services.openaire.eu:8280/is/services/isLookUp", - "-protoMap", + "-pathMap", "{ \"author\" : \"$['author'][*]['fullname']\"," + " \"title\" : \"$['title'][*]['value']\"," + " \"orcid\" : \"$['author'][*]['pid'][*][?(@['key']=='ORCID')]['value']\"," @@ -349,9 +349,9 @@ public class BulkTagJobTest { "eu.dnetlib.dhp.schema.oaf.Publication", "-outputPath", workingDir.toString() + "/publication", - "-isLookupUrl", + "-isLookUpUrl", "http://beta.services.openaire.eu:8280/is/services/isLookUp", - "-protoMap", + "-pathMap", "{ \"author\" : \"$['author'][*]['fullname']\"," + " \"title\" : \"$['title'][*]['value']\"," + " \"orcid\" : \"$['author'][*]['pid'][*][?(@['key']=='ORCID')]['value']\"," @@ -433,9 +433,9 @@ public class BulkTagJobTest { "eu.dnetlib.dhp.schema.oaf.OtherResearchProduct", "-outputPath", workingDir.toString() + "/orp", - "-isLookupUrl", + "-isLookUpUrl", "http://beta.services.openaire.eu:8280/is/services/isLookUp", - "-protoMap", + "-pathMap", "{ \"author\" : \"$['author'][*]['fullname']\"," + " \"title\" : \"$['title'][*]['value']\"," + " \"orcid\" : \"$['author'][*]['pid'][*][?(@['key']=='ORCID')]['value']\"," @@ -565,9 +565,9 @@ public class BulkTagJobTest { "eu.dnetlib.dhp.schema.oaf.Dataset", "-outputPath", workingDir.toString() + "/dataset", - "-isLookupUrl", + "-isLookUpUrl", "http://beta.services.openaire.eu:8280/is/services/isLookUp", - "-protoMap", + "-pathMap", "{ \"author\" : \"$['author'][*]['fullname']\"," + " \"title\" : \"$['title'][*]['value']\"," + " \"orcid\" : \"$['author'][*]['pid'][*][?(@['key']=='ORCID')]['value']\"," @@ -703,9 +703,9 @@ public class BulkTagJobTest { "eu.dnetlib.dhp.schema.oaf.Software", "-outputPath", workingDir.toString() + "/software", - "-isLookupUrl", + "-isLookUpUrl", "http://beta.services.openaire.eu:8280/is/services/isLookUp", - "-protoMap", + "-pathMap", "{ \"author\" : \"$['author'][*]['fullname']\"," + " \"title\" : \"$['title'][*]['value']\"," + " \"orcid\" : \"$['author'][*]['pid'][*][?(@['key']=='ORCID')]['value']\"," @@ -814,9 +814,9 @@ public class BulkTagJobTest { "eu.dnetlib.dhp.schema.oaf.Dataset", "-outputPath", workingDir.toString() + "/dataset", - "-isLookupUrl", + "-isLookUpUrl", "http://beta.services.openaire.eu:8280/is/services/isLookUp", - "-protoMap", + "-pathMap", "{ \"author\" : \"$['author'][*]['fullname']\"," + " \"title\" : \"$['title'][*]['value']\"," + " \"orcid\" : \"$['author'][*]['pid'][*][?(@['key']=='ORCID')]['value']\","