diff --git a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/utils/ZeppelinClient.java b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/utils/ZeppelinClient.java index bf273265..a6763772 100644 --- a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/utils/ZeppelinClient.java +++ b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/utils/ZeppelinClient.java @@ -140,7 +140,7 @@ public class ZeppelinClient { private Paragraph confParagraph(final MDStoreWithInfo mdstore, final String currentVersionPath) throws MDStoreManagerException { try { - final String code = IOUtils.toString(getClass().getResourceAsStream("/zeppelin/conf.tmpl.py"), StandardCharsets.UTF_8) + final String code = IOUtils.toString(getClass().getResourceAsStream("/zeppelin/paragraph_conf.tmpl"), StandardCharsets.UTF_8) .replaceAll("__DS_NAME__", StringEscapeUtils.escapeJava(mdstore.getDatasourceName())) .replaceAll("__DS_ID__", StringEscapeUtils.escapeJava(mdstore.getDatasourceId())) .replaceAll("__API_ID__", StringEscapeUtils.escapeJava(mdstore.getApiId())) diff --git a/apps/dhp-mdstore-manager/src/main/resources/zeppelin/conf.tmpl.py b/apps/dhp-mdstore-manager/src/main/resources/zeppelin/conf.tmpl.py deleted file mode 100644 index 6907e5ab..00000000 --- a/apps/dhp-mdstore-manager/src/main/resources/zeppelin/conf.tmpl.py +++ /dev/null @@ -1,15 +0,0 @@ -%pyspark - -dsName = "__DS_NAME__" -dsId = "__DS_ID__" -apiId = "__API_ID__" -mdId = "__MDSTORE_ID__" -mdVersion = "__VERSION__" -path = "__PATH__" - -print "Datasource Name:", dsName -print "Datasource ID:", dsId -print "Api ID:", apiId -print "MdStore ID:", mdId -print "Version ID:", mdVersion -print "Version Data Path:", path diff --git a/apps/dhp-mdstore-manager/src/main/resources/zeppelin/paragraph_conf.tmpl b/apps/dhp-mdstore-manager/src/main/resources/zeppelin/paragraph_conf.tmpl new file mode 100644 index 00000000..666809f2 --- /dev/null +++ b/apps/dhp-mdstore-manager/src/main/resources/zeppelin/paragraph_conf.tmpl @@ -0,0 +1,8 @@ +%spark + +val dsName = "__DS_NAME__" +val dsId = "__DS_ID__" +val apiId = "__API_ID__" +val mdId = "__MDSTORE_ID__" +val mdVersion = "__VERSION__" +val path = "__PATH__"