From c6f3ff44621c1917a2918f5a723a712c7af6b0d7 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Wed, 29 Apr 2020 14:29:27 +0200 Subject: [PATCH 1/8] stats workflow content relocated into common package; added property definitions in stats workflow.xml --- .../graph/stats}/oozie_app/config-default.xml | 0 .../graph/stats}/oozie_app/scripts/step1.sql | 0 .../stats}/oozie_app/scripts/step10_1.sql | 0 .../stats}/oozie_app/scripts/step10_2.sql | 0 .../stats}/oozie_app/scripts/step10_3.sql | 0 .../graph/stats}/oozie_app/scripts/step11.sql | 0 .../stats}/oozie_app/scripts/step12_1.sql | 0 .../stats}/oozie_app/scripts/step12_2.sql | 0 .../stats}/oozie_app/scripts/step12_3.sql | 0 .../stats}/oozie_app/scripts/step12_4.sql | 0 .../stats}/oozie_app/scripts/step12_5.sql | 0 .../stats}/oozie_app/scripts/step12_6.sql | 0 .../stats}/oozie_app/scripts/step12_7.sql | 0 .../stats}/oozie_app/scripts/step12_8.sql | 0 .../graph/stats}/oozie_app/scripts/step13.sql | 0 .../graph/stats}/oozie_app/scripts/step14.sql | 0 .../stats}/oozie_app/scripts/step2_1.sql | 0 .../stats}/oozie_app/scripts/step2_2.sql | 0 .../stats}/oozie_app/scripts/step2_3.sql | 0 .../stats}/oozie_app/scripts/step2_4.sql | 0 .../stats}/oozie_app/scripts/step2_5.sql | 0 .../stats}/oozie_app/scripts/step2_6.sql | 0 .../stats}/oozie_app/scripts/step2_7.sql | 0 .../stats}/oozie_app/scripts/step2_8.sql | 0 .../stats}/oozie_app/scripts/step2_9.sql | 0 .../graph/stats}/oozie_app/scripts/step3.sql | 0 .../stats}/oozie_app/scripts/step4_1.sql | 0 .../stats}/oozie_app/scripts/step4_10.sql | 0 .../stats}/oozie_app/scripts/step4_2.sql | 0 .../stats}/oozie_app/scripts/step4_3.sql | 0 .../stats}/oozie_app/scripts/step4_4.sql | 0 .../stats}/oozie_app/scripts/step4_5.sql | 0 .../stats}/oozie_app/scripts/step4_6.sql | 0 .../stats}/oozie_app/scripts/step4_7.sql | 0 .../stats}/oozie_app/scripts/step4_8.sql | 0 .../stats}/oozie_app/scripts/step4_9.sql | 0 .../stats}/oozie_app/scripts/step5_1.sql | 0 .../stats}/oozie_app/scripts/step5_10.sql | 0 .../stats}/oozie_app/scripts/step5_2.sql | 0 .../stats}/oozie_app/scripts/step5_3.sql | 0 .../stats}/oozie_app/scripts/step5_4.sql | 0 .../stats}/oozie_app/scripts/step5_5.sql | 0 .../stats}/oozie_app/scripts/step5_6.sql | 0 .../stats}/oozie_app/scripts/step5_7.sql | 0 .../stats}/oozie_app/scripts/step5_8.sql | 0 .../stats}/oozie_app/scripts/step5_9.sql | 0 .../stats}/oozie_app/scripts/step6_1.sql | 0 .../stats}/oozie_app/scripts/step6_10.sql | 0 .../stats}/oozie_app/scripts/step6_2.sql | 0 .../stats}/oozie_app/scripts/step6_3.sql | 0 .../stats}/oozie_app/scripts/step6_4.sql | 0 .../stats}/oozie_app/scripts/step6_5.sql | 0 .../stats}/oozie_app/scripts/step6_6.sql | 0 .../stats}/oozie_app/scripts/step6_7.sql | 0 .../stats}/oozie_app/scripts/step6_8.sql | 0 .../stats}/oozie_app/scripts/step6_9.sql | 0 .../stats}/oozie_app/scripts/step7_1.sql | 0 .../stats}/oozie_app/scripts/step7_2.sql | 0 .../stats}/oozie_app/scripts/step7_3.sql | 0 .../stats}/oozie_app/scripts/step7_4.sql | 0 .../stats}/oozie_app/scripts/step7_5.sql | 0 .../stats}/oozie_app/scripts/step8_1.sql | 0 .../stats}/oozie_app/scripts/step8_10.sql | 0 .../stats}/oozie_app/scripts/step8_11.sql | 0 .../stats}/oozie_app/scripts/step8_2.sql | 0 .../stats}/oozie_app/scripts/step8_3.sql | 0 .../stats}/oozie_app/scripts/step8_4.sql | 0 .../stats}/oozie_app/scripts/step8_5.sql | 0 .../stats}/oozie_app/scripts/step8_6.sql | 0 .../stats}/oozie_app/scripts/step8_7.sql | 0 .../stats}/oozie_app/scripts/step8_8.sql | 0 .../stats}/oozie_app/scripts/step8_9.sql | 0 .../stats}/oozie_app/scripts/step9_1.sql | 0 .../stats}/oozie_app/scripts/step9_2.sql | 0 .../stats}/oozie_app/scripts/step9_3.sql | 0 .../stats}/oozie_app/scripts/step9_4.sql | 0 .../stats}/oozie_app/scripts/step9_5.sql | 0 .../stats}/oozie_app/scripts/step9_6.sql | 0 .../stats}/oozie_app/scripts/step9_7.sql | 0 .../stats}/oozie_app/scripts/step9_8.sql | 0 .../stats}/oozie_app/scripts/step9_9.sql | 0 .../oa/graph/stats}/oozie_app/workflow.xml | 733 +++--------------- 82 files changed, 89 insertions(+), 644 deletions(-) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/config-default.xml (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step1.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step10_1.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step10_2.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step10_3.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step11.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step12_1.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step12_2.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step12_3.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step12_4.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step12_5.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step12_6.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step12_7.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step12_8.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step13.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step14.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step2_1.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step2_2.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step2_3.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step2_4.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step2_5.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step2_6.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step2_7.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step2_8.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step2_9.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step3.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step4_1.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step4_10.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step4_2.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step4_3.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step4_4.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step4_5.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step4_6.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step4_7.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step4_8.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step4_9.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step5_1.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step5_10.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step5_2.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step5_3.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step5_4.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step5_5.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step5_6.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step5_7.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step5_8.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step5_9.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step6_1.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step6_10.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step6_2.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step6_3.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step6_4.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step6_5.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step6_6.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step6_7.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step6_8.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step6_9.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step7_1.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step7_2.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step7_3.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step7_4.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step7_5.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step8_1.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step8_10.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step8_11.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step8_2.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step8_3.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step8_4.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step8_5.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step8_6.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step8_7.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step8_8.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step8_9.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step9_1.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step9_2.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step9_3.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step9_4.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step9_5.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step9_6.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step9_7.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step9_8.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/scripts/step9_9.sql (100%) rename dhp-workflows/dhp-stats-update/src/main/resources/{graph => eu/dnetlib/dhp/oa/graph/stats}/oozie_app/workflow.xml (53%) diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/config-default.xml b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/config-default.xml similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/config-default.xml rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/config-default.xml diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step1.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step1.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step1.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step1.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step10_1.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step10_1.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step10_1.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step10_1.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step10_2.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step10_2.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step10_2.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step10_2.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step10_3.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step10_3.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step10_3.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step10_3.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step11.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step11.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step11.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step11.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step12_1.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step12_1.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step12_1.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step12_1.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step12_2.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step12_2.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step12_2.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step12_2.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step12_3.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step12_3.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step12_3.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step12_3.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step12_4.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step12_4.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step12_4.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step12_4.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step12_5.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step12_5.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step12_5.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step12_5.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step12_6.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step12_6.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step12_6.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step12_6.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step12_7.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step12_7.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step12_7.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step12_7.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step12_8.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step12_8.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step12_8.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step12_8.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step13.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step13.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step13.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step13.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step14.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step14.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step14.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step14.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step2_1.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step2_1.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step2_1.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step2_1.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step2_2.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step2_2.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step2_2.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step2_2.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step2_3.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step2_3.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step2_3.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step2_3.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step2_4.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step2_4.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step2_4.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step2_4.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step2_5.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step2_5.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step2_5.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step2_5.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step2_6.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step2_6.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step2_6.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step2_6.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step2_7.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step2_7.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step2_7.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step2_7.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step2_8.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step2_8.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step2_8.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step2_8.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step2_9.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step2_9.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step2_9.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step2_9.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step3.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step3.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step3.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step3.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step4_1.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step4_1.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step4_1.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step4_1.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step4_10.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step4_10.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step4_10.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step4_10.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step4_2.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step4_2.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step4_2.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step4_2.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step4_3.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step4_3.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step4_3.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step4_3.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step4_4.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step4_4.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step4_4.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step4_4.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step4_5.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step4_5.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step4_5.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step4_5.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step4_6.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step4_6.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step4_6.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step4_6.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step4_7.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step4_7.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step4_7.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step4_7.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step4_8.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step4_8.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step4_8.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step4_8.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step4_9.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step4_9.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step4_9.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step4_9.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step5_1.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step5_1.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step5_1.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step5_1.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step5_10.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step5_10.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step5_10.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step5_10.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step5_2.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step5_2.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step5_2.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step5_2.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step5_3.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step5_3.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step5_3.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step5_3.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step5_4.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step5_4.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step5_4.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step5_4.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step5_5.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step5_5.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step5_5.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step5_5.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step5_6.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step5_6.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step5_6.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step5_6.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step5_7.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step5_7.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step5_7.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step5_7.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step5_8.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step5_8.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step5_8.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step5_8.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step5_9.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step5_9.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step5_9.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step5_9.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step6_1.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step6_1.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step6_1.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step6_1.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step6_10.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step6_10.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step6_10.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step6_10.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step6_2.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step6_2.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step6_2.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step6_2.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step6_3.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step6_3.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step6_3.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step6_3.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step6_4.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step6_4.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step6_4.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step6_4.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step6_5.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step6_5.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step6_5.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step6_5.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step6_6.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step6_6.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step6_6.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step6_6.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step6_7.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step6_7.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step6_7.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step6_7.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step6_8.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step6_8.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step6_8.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step6_8.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step6_9.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step6_9.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step6_9.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step6_9.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step7_1.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step7_1.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step7_1.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step7_1.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step7_2.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step7_2.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step7_2.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step7_2.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step7_3.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step7_3.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step7_3.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step7_3.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step7_4.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step7_4.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step7_4.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step7_4.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step7_5.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step7_5.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step7_5.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step7_5.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step8_1.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step8_1.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step8_1.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step8_1.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step8_10.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step8_10.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step8_10.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step8_10.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step8_11.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step8_11.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step8_11.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step8_11.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step8_2.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step8_2.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step8_2.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step8_2.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step8_3.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step8_3.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step8_3.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step8_3.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step8_4.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step8_4.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step8_4.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step8_4.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step8_5.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step8_5.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step8_5.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step8_5.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step8_6.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step8_6.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step8_6.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step8_6.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step8_7.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step8_7.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step8_7.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step8_7.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step8_8.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step8_8.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step8_8.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step8_8.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step8_9.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step8_9.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step8_9.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step8_9.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step9_1.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step9_1.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step9_1.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step9_1.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step9_2.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step9_2.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step9_2.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step9_2.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step9_3.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step9_3.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step9_3.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step9_3.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step9_4.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step9_4.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step9_4.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step9_4.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step9_5.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step9_5.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step9_5.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step9_5.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step9_6.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step9_6.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step9_6.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step9_6.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step9_7.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step9_7.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step9_7.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step9_7.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step9_8.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step9_8.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step9_8.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step9_8.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step9_9.sql b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step9_9.sql similarity index 100% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/scripts/step9_9.sql rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/scripts/step9_9.sql diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/workflow.xml b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/workflow.xml similarity index 53% rename from dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/workflow.xml rename to dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/workflow.xml index 40f4b14ba1..1651410c2b 100644 --- a/dhp-workflows/dhp-stats-update/src/main/resources/graph/oozie_app/workflow.xml +++ b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/workflow.xml @@ -12,8 +12,27 @@ external_stats_db_name the external stats that should be added since they are not included in the graph database + + hive_metastore_uris + hive server metastore URIs + + + hive_jdbc_url + hive server jdbc url + + + ${jobTracker} + ${nameNode} + + + hive.metastore.uris + ${hive_metastore_uris} + + + + @@ -22,14 +41,6 @@ - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -41,14 +52,6 @@ - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -57,16 +60,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -75,16 +71,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -93,16 +82,9 @@ - + + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -111,16 +93,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -129,16 +104,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -147,16 +115,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -165,16 +126,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -183,16 +137,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -204,14 +151,6 @@ - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -223,14 +162,6 @@ - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -239,16 +170,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -257,16 +181,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -275,16 +192,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -293,16 +203,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -311,16 +214,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -329,16 +225,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -347,16 +236,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -365,16 +247,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -383,16 +258,9 @@ + - - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - + ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -404,14 +272,6 @@ - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -420,16 +280,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -438,16 +291,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -456,16 +302,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -474,16 +313,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -492,16 +324,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -510,16 +335,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -528,16 +346,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -546,16 +357,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -564,16 +368,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -585,14 +382,6 @@ - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -601,16 +390,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -619,16 +401,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -637,16 +412,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -655,16 +423,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -673,16 +434,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -691,16 +445,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -709,16 +456,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -727,16 +467,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -745,16 +478,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -766,14 +492,6 @@ - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -782,16 +500,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -800,16 +511,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -818,16 +522,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -836,16 +533,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -857,14 +547,6 @@ - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -873,16 +555,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -891,16 +566,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -909,16 +577,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -927,16 +588,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -945,16 +599,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -963,16 +610,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -981,16 +621,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -999,16 +632,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -1017,16 +643,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -1035,16 +654,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -1056,14 +668,6 @@ - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -1072,16 +676,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -1090,16 +687,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -1108,16 +698,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -1126,16 +709,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -1144,16 +720,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -1162,16 +731,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -1180,16 +742,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -1198,16 +753,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -1219,14 +767,6 @@ - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -1235,16 +775,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -1253,16 +786,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -1274,14 +800,6 @@ - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -1294,14 +812,6 @@ - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -1310,16 +820,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -1328,16 +831,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -1346,16 +842,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -1364,16 +853,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -1382,16 +864,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -1400,16 +875,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -1418,16 +886,9 @@ + - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -1438,15 +899,7 @@ - - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - + ${hive_jdbc_url} stats_db_name=${stats_db_name} @@ -1457,15 +910,7 @@ - - ${jobTracker} - ${nameNode} - - - hive.metastore.uris - ${hive_metastore_uris} - - + ${hive_jdbc_url} stats_db_name=${stats_db_name} From 8fd81e863d4ba47f29032aef5a50f55ca142f24f Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Wed, 29 Apr 2020 15:36:24 +0200 Subject: [PATCH 2/8] added default value for the external_stats_db_name --- .../eu/dnetlib/dhp/oa/graph/stats/oozie_app/workflow.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/workflow.xml b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/workflow.xml index 1651410c2b..19f3316d8a 100644 --- a/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/workflow.xml +++ b/dhp-workflows/dhp-stats-update/src/main/resources/eu/dnetlib/dhp/oa/graph/stats/oozie_app/workflow.xml @@ -10,6 +10,7 @@ external_stats_db_name + stats_ext the external stats that should be added since they are not included in the graph database From 0ab13b703bd6ff62ff98333a1207f3fe09337400 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Wed, 29 Apr 2020 16:11:17 +0200 Subject: [PATCH 3/8] added LICENSE file - AGPL-3.0 --- LICENSE | 661 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 661 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000..2def0e8831 --- /dev/null +++ b/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. \ No newline at end of file From fe81f674ecd09e3221dd3a3d06c0197ef8d8aa5b Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Wed, 29 Apr 2020 16:19:57 +0200 Subject: [PATCH 4/8] updated maven-javadoc-plugin to v3.2.0, disabled doclint to avoid compilation to fail in case of incomplete javadoc tags --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bb48c04a1e..3466dc7834 100644 --- a/pom.xml +++ b/pom.xml @@ -449,9 +449,10 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.4 + 3.2.0 true + none From 64d790a266e678dbf06505398959385263be3505 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Wed, 29 Apr 2020 16:56:18 +0200 Subject: [PATCH 5/8] updated maven plugin dependencies --- dhp-build/dhp-build-properties-maven-plugin/pom.xml | 13 ++++++++++--- .../WritePredefinedProjectProperties.java | 2 +- pom.xml | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dhp-build/dhp-build-properties-maven-plugin/pom.xml b/dhp-build/dhp-build-properties-maven-plugin/pom.xml index df5045fcb6..82228fe07b 100644 --- a/dhp-build/dhp-build-properties-maven-plugin/pom.xml +++ b/dhp-build/dhp-build-properties-maven-plugin/pom.xml @@ -17,17 +17,23 @@ org.apache.maven maven-plugin-api - 2.0 + 3.6.3 org.apache.maven maven-project - 2.0 + 2.2.1 + + org.apache.maven + maven-artifact + 2.2.1 + + org.kuali.maven.plugins properties-maven-plugin - 1.3.2 + 2.0.1 com.google.code.findbugs @@ -73,6 +79,7 @@ maven-javadoc-plugin true + none diff --git a/dhp-build/dhp-build-properties-maven-plugin/src/main/java/eu/dnetlib/maven/plugin/properties/WritePredefinedProjectProperties.java b/dhp-build/dhp-build-properties-maven-plugin/src/main/java/eu/dnetlib/maven/plugin/properties/WritePredefinedProjectProperties.java index c1c567f954..d195ca86e4 100644 --- a/dhp-build/dhp-build-properties-maven-plugin/src/main/java/eu/dnetlib/maven/plugin/properties/WritePredefinedProjectProperties.java +++ b/dhp-build/dhp-build-properties-maven-plugin/src/main/java/eu/dnetlib/maven/plugin/properties/WritePredefinedProjectProperties.java @@ -40,7 +40,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** * Writes project properties for the keys listed in specified properties files. Based on: - * http://site.kuali.org/maven/plugins/properties-maven-plugin/1.3.2/write-project-properties-mojo.html + * http://site.kuali.org/maven/plugins/properties-maven-plugin/2.0.1/write-project-properties-mojo.html * * @author mhorst * @goal write-project-properties diff --git a/pom.xml b/pom.xml index 3466dc7834..0bc01177ef 100644 --- a/pom.xml +++ b/pom.xml @@ -570,9 +570,9 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.4 true + none From 77ac995770c518f803ce391e4eb7b3a1d9b8049e Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Wed, 29 Apr 2020 18:44:17 +0200 Subject: [PATCH 6/8] cleaned up poms, added descriptions --- .../dhp-build-assembly-resources/pom.xml | 2 + .../dhp-build-properties-maven-plugin/pom.xml | 38 +-------- dhp-build/dhp-code-style/pom.xml | 32 +++++++ dhp-build/pom.xml | 3 + dhp-common/pom.xml | 2 + dhp-schemas/pom.xml | 2 +- .../dnetlib/dhp/oa/dedup/SparkDedupTest.java | 1 + .../raw/MigrateDbEntitiesApplication.java | 84 ++++++++++++------- dhp-workflows/dhp-stats-update/pom.xml | 1 + dhp-workflows/dhp-worfklow-profiles/pom.xml | 16 +++- dhp-workflows/pom.xml | 60 +------------ pom.xml | 33 ++++++-- 12 files changed, 145 insertions(+), 129 deletions(-) diff --git a/dhp-build/dhp-build-assembly-resources/pom.xml b/dhp-build/dhp-build-assembly-resources/pom.xml index c837cd5386..9b03536ddd 100644 --- a/dhp-build/dhp-build-assembly-resources/pom.xml +++ b/dhp-build/dhp-build-assembly-resources/pom.xml @@ -12,6 +12,8 @@ dhp-build-assembly-resources jar + This module contains a set of scripts supporting the build lifecycle for the dnet-hadoop project + diff --git a/dhp-build/dhp-build-properties-maven-plugin/pom.xml b/dhp-build/dhp-build-properties-maven-plugin/pom.xml index 82228fe07b..4d40edd997 100644 --- a/dhp-build/dhp-build-properties-maven-plugin/pom.xml +++ b/dhp-build/dhp-build-properties-maven-plugin/pom.xml @@ -12,6 +12,7 @@ dhp-build-properties-maven-plugin maven-plugin + This module is a maven plugin implementing custom properties substitutions in the build lifecycle @@ -33,7 +34,7 @@ org.kuali.maven.plugins properties-maven-plugin - 2.0.1 + ${properties.maven.plugin.version} com.google.code.findbugs @@ -83,41 +84,6 @@ - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.apache.maven.plugins - - - maven-plugin-plugin - - - [3.2,) - - - descriptor - - - - - - - - - - - - diff --git a/dhp-build/dhp-code-style/pom.xml b/dhp-build/dhp-code-style/pom.xml index 830723c9f6..5e896e7a5c 100644 --- a/dhp-build/dhp-code-style/pom.xml +++ b/dhp-build/dhp-code-style/pom.xml @@ -11,6 +11,38 @@ jar + This module contains resources supporting common code style conventions + + + + dnet45-snapshots + DNet45 Snapshots + http://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-snapshots + default + + + dnet45-releases + http://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-releases + + + + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 3.0.0 + + + org.apache.maven.plugins + maven-site-plugin + 3.7.1 + + + + + UTF-8 diff --git a/dhp-build/pom.xml b/dhp-build/pom.xml index ff6a858bba..041641fcfb 100644 --- a/dhp-build/pom.xml +++ b/dhp-build/pom.xml @@ -8,6 +8,9 @@ dhp-build pom + + This module is a container for the build tools used in dnet-hadoop + dhp-code-style dhp-build-assembly-resources diff --git a/dhp-common/pom.xml b/dhp-common/pom.xml index 7b073397f0..51af8d954b 100644 --- a/dhp-common/pom.xml +++ b/dhp-common/pom.xml @@ -12,6 +12,8 @@ dhp-common jar + This module contains common utilities meant to be used across the dnet-hadoop submodules + diff --git a/dhp-schemas/pom.xml b/dhp-schemas/pom.xml index 8deb2eab23..4a123cedad 100644 --- a/dhp-schemas/pom.xml +++ b/dhp-schemas/pom.xml @@ -12,7 +12,7 @@ dhp-schemas jar - + This module contains common schema classes meant to be used across the dnet-hadoop submodules diff --git a/dhp-workflows/dhp-dedup-openaire/src/test/java/eu/dnetlib/dhp/oa/dedup/SparkDedupTest.java b/dhp-workflows/dhp-dedup-openaire/src/test/java/eu/dnetlib/dhp/oa/dedup/SparkDedupTest.java index 23b30cc7d5..a0ae7bc3c8 100644 --- a/dhp-workflows/dhp-dedup-openaire/src/test/java/eu/dnetlib/dhp/oa/dedup/SparkDedupTest.java +++ b/dhp-workflows/dhp-dedup-openaire/src/test/java/eu/dnetlib/dhp/oa/dedup/SparkDedupTest.java @@ -1,3 +1,4 @@ + package eu.dnetlib.dhp.oa.dedup; import static java.nio.file.Files.createTempDirectory; diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MigrateDbEntitiesApplication.java b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MigrateDbEntitiesApplication.java index d88325c9b8..c0469735c7 100644 --- a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MigrateDbEntitiesApplication.java +++ b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MigrateDbEntitiesApplication.java @@ -51,7 +51,7 @@ import eu.dnetlib.dhp.schema.oaf.Software; import eu.dnetlib.dhp.schema.oaf.StructuredProperty; public class MigrateDbEntitiesApplication extends AbstractMigrationApplication - implements Closeable { + implements Closeable { private static final Log log = LogFactory.getLog(MigrateDbEntitiesApplication.class); @@ -61,9 +61,10 @@ public class MigrateDbEntitiesApplication extends AbstractMigrationApplication public static void main(final String[] args) throws Exception { final ArgumentApplicationParser parser = new ArgumentApplicationParser( - IOUtils - .toString(MigrateDbEntitiesApplication.class - .getResourceAsStream("/eu/dnetlib/dhp/oa/graph/migrate_db_entities_parameters.json"))); + IOUtils + .toString( + MigrateDbEntitiesApplication.class + .getResourceAsStream("/eu/dnetlib/dhp/oa/graph/migrate_db_entities_parameters.json"))); parser.parseArgument(args); @@ -76,7 +77,7 @@ public class MigrateDbEntitiesApplication extends AbstractMigrationApplication final boolean processClaims = parser.get("action") != null && parser.get("action").equalsIgnoreCase("claims"); try (final MigrateDbEntitiesApplication smdbe = new MigrateDbEntitiesApplication(hdfsPath, dbUrl, dbUser, - dbPassword)) { + dbPassword)) { if (processClaims) { log.info("Processing claims..."); smdbe.execute("queryClaims.sql", smdbe::processClaims); @@ -107,15 +108,15 @@ public class MigrateDbEntitiesApplication extends AbstractMigrationApplication } public MigrateDbEntitiesApplication( - final String hdfsPath, final String dbUrl, final String dbUser, final String dbPassword) - throws Exception { + final String hdfsPath, final String dbUrl, final String dbUser, final String dbPassword) + throws Exception { super(hdfsPath); this.dbClient = new DbClient(dbUrl, dbUser, dbPassword); this.lastUpdateTimestamp = new Date().getTime(); } public void execute(final String sqlFile, final Function> producer) - throws Exception { + throws Exception { final String sql = IOUtils.toString(getClass().getResourceAsStream("/eu/dnetlib/dhp/oa/graph/sql/" + sqlFile)); final Consumer consumer = rs -> producer.apply(rs).forEach(oaf -> emitOaf(oaf)); @@ -134,7 +135,10 @@ public class MigrateDbEntitiesApplication extends AbstractMigrationApplication ds.setId(createOpenaireId(10, rs.getString("datasourceid"), true)); ds.setOriginalId(Arrays.asList(rs.getString("datasourceid"))); ds - .setCollectedfrom(listKeyValues(createOpenaireId(10, rs.getString("collectedfromid"), true), rs.getString("collectedfromname"))); + .setCollectedfrom( + listKeyValues( + createOpenaireId(10, rs.getString("collectedfromid"), true), + rs.getString("collectedfromname"))); ds.setPid(new ArrayList<>()); ds.setDateofcollection(asString(rs.getDate("dateofcollection"))); ds.setDateoftransformation(null); // Value not returned by the SQL query @@ -175,7 +179,7 @@ public class MigrateDbEntitiesApplication extends AbstractMigrationApplication ds.setCertificates(field(rs.getString("certificates"), info)); ds.setPolicies(new ArrayList<>()); // The sql query returns an empty array ds - .setJournal(prepareJournal(rs.getString("officialname"), rs.getString("journal"), info)); // Journal + .setJournal(prepareJournal(rs.getString("officialname"), rs.getString("journal"), info)); // Journal ds.setDataInfo(info); ds.setLastupdatetimestamp(lastUpdateTimestamp); @@ -195,7 +199,10 @@ public class MigrateDbEntitiesApplication extends AbstractMigrationApplication p.setId(createOpenaireId(40, rs.getString("projectid"), true)); p.setOriginalId(Arrays.asList(rs.getString("projectid"))); p - .setCollectedfrom(listKeyValues(createOpenaireId(10, rs.getString("collectedfromid"), true), rs.getString("collectedfromname"))); + .setCollectedfrom( + listKeyValues( + createOpenaireId(10, rs.getString("collectedfromid"), true), + rs.getString("collectedfromname"))); p.setPid(new ArrayList<>()); p.setDateofcollection(asString(rs.getDate("dateofcollection"))); p.setDateoftransformation(asString(rs.getDate("dateoftransformation"))); @@ -212,7 +219,7 @@ public class MigrateDbEntitiesApplication extends AbstractMigrationApplication p.setDuration(field(Integer.toString(rs.getInt("duration")), info)); p.setEcsc39(field(Boolean.toString(rs.getBoolean("ecsc39")), info)); p - .setOamandatepublications(field(Boolean.toString(rs.getBoolean("oamandatepublications")), info)); + .setOamandatepublications(field(Boolean.toString(rs.getBoolean("oamandatepublications")), info)); p.setEcarticle29_3(field(Boolean.toString(rs.getBoolean("ecarticle29_3")), info)); p.setSubjects(prepareListOfStructProps(rs.getArray("subjects"), info)); p.setFundingtree(prepareListFields(rs.getArray("fundingtree"), info)); @@ -249,7 +256,10 @@ public class MigrateDbEntitiesApplication extends AbstractMigrationApplication o.setId(createOpenaireId(20, rs.getString("organizationid"), true)); o.setOriginalId(Arrays.asList(rs.getString("organizationid"))); o - .setCollectedfrom(listKeyValues(createOpenaireId(10, rs.getString("collectedfromid"), true), rs.getString("collectedfromname"))); + .setCollectedfrom( + listKeyValues( + createOpenaireId(10, rs.getString("collectedfromid"), true), + rs.getString("collectedfromname"))); o.setPid(new ArrayList<>()); o.setDateofcollection(asString(rs.getDate("dateofcollection"))); o.setDateoftransformation(asString(rs.getDate("dateoftransformation"))); @@ -264,12 +274,14 @@ public class MigrateDbEntitiesApplication extends AbstractMigrationApplication o.setEclegalperson(field(Boolean.toString(rs.getBoolean("eclegalperson")), info)); o.setEcnonprofit(field(Boolean.toString(rs.getBoolean("ecnonprofit")), info)); o - .setEcresearchorganization(field(Boolean.toString(rs.getBoolean("ecresearchorganization")), info)); + .setEcresearchorganization(field(Boolean.toString(rs.getBoolean("ecresearchorganization")), info)); o.setEchighereducation(field(Boolean.toString(rs.getBoolean("echighereducation")), info)); o - .setEcinternationalorganizationeurinterests(field(Boolean.toString(rs.getBoolean("ecinternationalorganizationeurinterests")), info)); + .setEcinternationalorganizationeurinterests( + field(Boolean.toString(rs.getBoolean("ecinternationalorganizationeurinterests")), info)); o - .setEcinternationalorganization(field(Boolean.toString(rs.getBoolean("ecinternationalorganization")), info)); + .setEcinternationalorganization( + field(Boolean.toString(rs.getBoolean("ecinternationalorganization")), info)); o.setEcenterprise(field(Boolean.toString(rs.getBoolean("ecenterprise")), info)); o.setEcsmevalidated(field(Boolean.toString(rs.getBoolean("ecsmevalidated")), info)); o.setEcnutscode(field(Boolean.toString(rs.getBoolean("ecnutscode")), info)); @@ -288,7 +300,8 @@ public class MigrateDbEntitiesApplication extends AbstractMigrationApplication final DataInfo info = prepareDataInfo(rs); final String orgId = createOpenaireId(20, rs.getString("organization"), true); final String dsId = createOpenaireId(10, rs.getString("datasource"), true); - final List collectedFrom = listKeyValues(createOpenaireId(10, rs.getString("collectedfromid"), true), rs.getString("collectedfromname")); + final List collectedFrom = listKeyValues( + createOpenaireId(10, rs.getString("collectedfromid"), true), rs.getString("collectedfromname")); final Relation r1 = new Relation(); r1.setRelType("datasourceOrganization"); @@ -321,7 +334,8 @@ public class MigrateDbEntitiesApplication extends AbstractMigrationApplication final DataInfo info = prepareDataInfo(rs); final String orgId = createOpenaireId(20, rs.getString("resporganization"), true); final String projectId = createOpenaireId(40, rs.getString("project"), true); - final List collectedFrom = listKeyValues(createOpenaireId(10, rs.getString("collectedfromid"), true), rs.getString("collectedfromname")); + final List collectedFrom = listKeyValues( + createOpenaireId(10, rs.getString("collectedfromid"), true), rs.getString("collectedfromname")); final Relation r1 = new Relation(); r1.setRelType("projectOrganization"); @@ -351,10 +365,12 @@ public class MigrateDbEntitiesApplication extends AbstractMigrationApplication public List processClaims(final ResultSet rs) { - final DataInfo info = - dataInfo(false, null, false, false, qualifier("user:claim", "user:claim", "dnet:provenanceActions", "dnet:provenanceActions"), "0.9"); + final DataInfo info = dataInfo( + false, null, false, false, + qualifier("user:claim", "user:claim", "dnet:provenanceActions", "dnet:provenanceActions"), "0.9"); - final List collectedFrom = listKeyValues(createOpenaireId(10, "infrastruct_::openaire", true), "OpenAIRE"); + final List collectedFrom = listKeyValues( + createOpenaireId(10, "infrastruct_::openaire", true), "OpenAIRE"); try { @@ -440,11 +456,15 @@ public class MigrateDbEntitiesApplication extends AbstractMigrationApplication final String inferenceprovenance = rs.getString("inferenceprovenance"); final Boolean inferred = rs.getBoolean("inferred"); final String trust = rs.getString("trust"); - return dataInfo(deletedbyinference, inferenceprovenance, inferred, false, MigrationConstants.ENTITYREGISTRY_PROVENANCE_ACTION, trust); + return dataInfo( + deletedbyinference, inferenceprovenance, inferred, false, + MigrationConstants.ENTITYREGISTRY_PROVENANCE_ACTION, trust); } private Qualifier prepareQualifierSplitting(final String s) { - if (StringUtils.isBlank(s)) { return null; } + if (StringUtils.isBlank(s)) { + return null; + } final String[] arr = s.split("@@@"); return arr.length == 4 ? qualifier(arr[0], arr[1], arr[2], arr[3]) : null; } @@ -458,19 +478,23 @@ public class MigrateDbEntitiesApplication extends AbstractMigrationApplication } private StructuredProperty prepareStructProp(final String s, final DataInfo dataInfo) { - if (StringUtils.isBlank(s)) { return null; } + if (StringUtils.isBlank(s)) { + return null; + } final String[] parts = s.split("###"); if (parts.length == 2) { final String value = parts[0]; final String[] arr = parts[1].split("@@@"); - if (arr.length == 4) { return structuredProperty(value, arr[0], arr[1], arr[2], arr[3], dataInfo); } + if (arr.length == 4) { + return structuredProperty(value, arr[0], arr[1], arr[2], arr[3], dataInfo); + } } return null; } private List prepareListOfStructProps( - final Array array, - final DataInfo dataInfo) throws SQLException { + final Array array, + final DataInfo dataInfo) throws SQLException { final List res = new ArrayList<>(); if (array != null) { for (final String s : (String[]) array.getArray()) { @@ -489,8 +513,10 @@ public class MigrateDbEntitiesApplication extends AbstractMigrationApplication final String[] arr = sj.split("@@@"); if (arr.length == 3) { final String issn = StringUtils.isNotBlank(arr[0]) ? arr[0] : null; - final String eissn = StringUtils.isNotBlank(arr[1]) ? arr[1] : null;; - final String lissn = StringUtils.isNotBlank(arr[2]) ? arr[2] : null;; + final String eissn = StringUtils.isNotBlank(arr[1]) ? arr[1] : null; + ; + final String lissn = StringUtils.isNotBlank(arr[2]) ? arr[2] : null; + ; if (issn != null || eissn != null || lissn != null) { return journal(name, issn, eissn, eissn, null, null, null, null, null, null, null, info); } diff --git a/dhp-workflows/dhp-stats-update/pom.xml b/dhp-workflows/dhp-stats-update/pom.xml index 4d6318c3e1..0f5e180824 100644 --- a/dhp-workflows/dhp-stats-update/pom.xml +++ b/dhp-workflows/dhp-stats-update/pom.xml @@ -22,6 +22,7 @@ pl.project13.maven git-commit-id-plugin + 2.1.11 false diff --git a/dhp-workflows/dhp-worfklow-profiles/pom.xml b/dhp-workflows/dhp-worfklow-profiles/pom.xml index df90014ba7..bad72a9ef0 100644 --- a/dhp-workflows/dhp-worfklow-profiles/pom.xml +++ b/dhp-workflows/dhp-worfklow-profiles/pom.xml @@ -3,13 +3,27 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - dhp + dhp-workflows eu.dnetlib.dhp 1.1.7-SNAPSHOT 4.0.0 dhp-worfklow-profiles + jar + \ No newline at end of file diff --git a/dhp-workflows/pom.xml b/dhp-workflows/pom.xml index cd5784c09d..1645129b10 100644 --- a/dhp-workflows/pom.xml +++ b/dhp-workflows/pom.xml @@ -13,6 +13,8 @@ dhp-workflows pom + This module is the container for the oozie workflow definitions in dnet-hadoop project + dhp-worfklow-profiles dhp-aggregation @@ -182,7 +184,7 @@ org.kuali.maven.plugins properties-maven-plugin - 1.3.2 + ${properties.maven.plugin.version} eu.dnetlib.dhp @@ -562,60 +564,4 @@ - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.kuali.maven.plugins - - - properties-maven-plugin - - - [1.3.2,) - - - - read-project-properties - - - write-project-properties - - - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - [1.0.0,) - - copy-dependencies - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index 0bc01177ef..4838732190 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ 1.1.7-SNAPSHOT pom - http://www.d-net.research-infrastructures.eu - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + GNU Affero General Public License v3.0 or later + https://spdx.org/licenses/AGPL-3.0-or-later.html#licenseText repo - A business-friendly OSS license + This program is free software: you can redistribute it and/or modify it under the terms of the + GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. @@ -41,6 +41,8 @@ HEAD + This module is the root descriptor for the dnet-hadoop project + @@ -406,6 +408,18 @@ target/test-classes + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 3.0.0 + + + org.apache.maven.plugins + maven-site-plugin + 3.7.1 + + org.apache.maven.plugins maven-compiler-plugin @@ -476,6 +490,14 @@ + + org.apache.maven.plugins + maven-site-plugin + + + org.apache.maven.plugins + maven-project-info-reports-plugin + net.revelc.code.formatter formatter-maven-plugin @@ -583,6 +605,7 @@ UTF-8 3.6.0 2.22.2 + 2.0.1 cdh5.9.2 2.6.0-${dhp.cdh.version} 4.1.0-${dhp.cdh.version} From 439c6255a2ef0b18dac635c8bc8bcc60fa262a33 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Wed, 29 Apr 2020 19:09:07 +0200 Subject: [PATCH 7/8] cleanup --- .../GenerateOoziePropertiesMojoTest.java | 2 +- .../WritePredefinedProjectPropertiesTest.java | 2 +- .../main/java/eu/dnetlib/dhp/utils/DHPUtils.java | 2 +- .../eu/dnetlib/dhp/utils/saxon/NormalizeDate.java | 2 +- .../java/eu/dnetlib/message/MessageManager.java | 2 +- .../schema/action/AtomicActionDeserializer.java | 2 +- .../dnetlib/dhp/schema/common/ModelSupport.java | 2 +- .../eu/dnetlib/dhp/actionmanager/ISClient.java | 2 +- .../promote/PromoteActionPayloadFunctions.java | 8 ++++---- .../worker/DnetCollectorWorkerApplication.java | 2 +- .../worker/utils/CollectorPluginErrorLogList.java | 2 +- .../dhp/collection/worker/utils/XmlCleaner.java | 10 +++++----- .../DnetCollectorWorkerApplicationTests.java | 4 ++-- .../eu/dnetlib/dhp/oa/dedup/DedupUtility.java | 3 ++- .../eu/dnetlib/dhp/oa/dedup/SparkReporter.java | 2 +- .../main/java/eu/dnetlib/dedup/DedupUtility.java | 2 +- .../oa/graph/raw/AbstractMdRecordToOafMapper.java | 4 ---- .../graph/raw/MigrateDbEntitiesApplication.java | 2 -- .../dnetlib/dhp/oa/graph/raw/common/DbClient.java | 2 +- .../dhp/oa/graph/raw/common/PacePerson.java | 3 ++- .../graph/parser/AbstractScholexplorerParser.java | 2 +- .../dhp/provision/update/CrossRefParserJSON.java | 2 +- .../dhp/provision/update/DataciteClient.java | 2 +- .../oa/provision/utils/RelationPartitioner.java | 2 +- .../utils/StreamingInputDocumentFactory.java | 15 +++++++++------ .../dhp/oa/provision/utils/TemplateFactory.java | 2 +- .../dhp/oa/provision/utils/TemplateResources.java | 12 ++++++------ .../dhp/oa/provision/utils/XmlRecordFactory.java | 8 ++++---- .../oa/provision/utils/XmlSerializationUtils.java | 2 +- .../dnetlib/dhp/oa/provision/GraphJoinerTest.java | 2 +- 30 files changed, 54 insertions(+), 55 deletions(-) diff --git a/dhp-build/dhp-build-properties-maven-plugin/src/test/java/eu/dnetlib/maven/plugin/properties/GenerateOoziePropertiesMojoTest.java b/dhp-build/dhp-build-properties-maven-plugin/src/test/java/eu/dnetlib/maven/plugin/properties/GenerateOoziePropertiesMojoTest.java index b8075ba5dd..4bfcd3b33e 100644 --- a/dhp-build/dhp-build-properties-maven-plugin/src/test/java/eu/dnetlib/maven/plugin/properties/GenerateOoziePropertiesMojoTest.java +++ b/dhp-build/dhp-build-properties-maven-plugin/src/test/java/eu/dnetlib/maven/plugin/properties/GenerateOoziePropertiesMojoTest.java @@ -11,7 +11,7 @@ import org.junit.jupiter.api.Test; /** @author mhorst, claudio.atzori */ public class GenerateOoziePropertiesMojoTest { - private GenerateOoziePropertiesMojo mojo = new GenerateOoziePropertiesMojo(); + private final GenerateOoziePropertiesMojo mojo = new GenerateOoziePropertiesMojo(); @BeforeEach public void clearSystemProperties() { diff --git a/dhp-build/dhp-build-properties-maven-plugin/src/test/java/eu/dnetlib/maven/plugin/properties/WritePredefinedProjectPropertiesTest.java b/dhp-build/dhp-build-properties-maven-plugin/src/test/java/eu/dnetlib/maven/plugin/properties/WritePredefinedProjectPropertiesTest.java index e0b2eff37b..0b3ea9653b 100644 --- a/dhp-build/dhp-build-properties-maven-plugin/src/test/java/eu/dnetlib/maven/plugin/properties/WritePredefinedProjectPropertiesTest.java +++ b/dhp-build/dhp-build-properties-maven-plugin/src/test/java/eu/dnetlib/maven/plugin/properties/WritePredefinedProjectPropertiesTest.java @@ -366,7 +366,7 @@ public class WritePredefinedProjectPropertiesTest { } private Properties getStoredProperties(File testFolder) - throws FileNotFoundException, IOException { + throws IOException { Properties properties = new Properties(); properties.load(new FileInputStream(getPropertiesFileLocation(testFolder))); return properties; diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/utils/DHPUtils.java b/dhp-common/src/main/java/eu/dnetlib/dhp/utils/DHPUtils.java index 18e489a21c..dfbaf3a6ca 100644 --- a/dhp-common/src/main/java/eu/dnetlib/dhp/utils/DHPUtils.java +++ b/dhp-common/src/main/java/eu/dnetlib/dhp/utils/DHPUtils.java @@ -21,7 +21,7 @@ public class DHPUtils { public static String md5(final String s) { try { final MessageDigest md = MessageDigest.getInstance("MD5"); - md.update(s.getBytes("UTF-8")); + md.update(s.getBytes(StandardCharsets.UTF_8)); return new String(Hex.encodeHex(md.digest())); } catch (final Exception e) { System.err.println("Error creating id"); diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/NormalizeDate.java b/dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/NormalizeDate.java index 4a719909a5..9fb60e1452 100644 --- a/dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/NormalizeDate.java +++ b/dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/NormalizeDate.java @@ -17,7 +17,7 @@ public class NormalizeDate extends AbstractExtensionFunction { "yyyy-MM-dd'T'hh:mm:ss", "yyyy-MM-dd", "yyyy/MM/dd", "yyyy" }; - private static final String normalizeOutFormat = new String("yyyy-MM-dd'T'hh:mm:ss'Z'"); + private static final String normalizeOutFormat = "yyyy-MM-dd'T'hh:mm:ss'Z'"; @Override public String getName() { diff --git a/dhp-common/src/main/java/eu/dnetlib/message/MessageManager.java b/dhp-common/src/main/java/eu/dnetlib/message/MessageManager.java index 4c5c48c559..5ca79f3cc6 100644 --- a/dhp-common/src/main/java/eu/dnetlib/message/MessageManager.java +++ b/dhp-common/src/main/java/eu/dnetlib/message/MessageManager.java @@ -21,7 +21,7 @@ public class MessageManager { private Connection connection; - private Map channels = new HashMap<>(); + private final Map channels = new HashMap<>(); private boolean durable; diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/action/AtomicActionDeserializer.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/action/AtomicActionDeserializer.java index a9543d27a1..7b88e9c7eb 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/action/AtomicActionDeserializer.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/action/AtomicActionDeserializer.java @@ -16,7 +16,7 @@ public class AtomicActionDeserializer extends JsonDeserializer { @Override public Object deserialize(JsonParser jp, DeserializationContext ctxt) - throws IOException, JsonProcessingException { + throws IOException { JsonNode node = jp.getCodec().readTree(jp); String classTag = node.get("clazz").asText(); JsonNode payload = node.get("payload"); diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/ModelSupport.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/ModelSupport.java index 6f93371ec7..cdde37fd4a 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/ModelSupport.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/ModelSupport.java @@ -13,7 +13,7 @@ import eu.dnetlib.dhp.schema.oaf.*; public class ModelSupport { /** Defines the mapping between the actual entity type and the main entity type */ - private static Map entityMapping = Maps.newHashMap(); + private static final Map entityMapping = Maps.newHashMap(); static { entityMapping.put(EntityType.publication, MainEntityType.result); diff --git a/dhp-workflows/dhp-actionmanager/src/main/java/eu/dnetlib/dhp/actionmanager/ISClient.java b/dhp-workflows/dhp-actionmanager/src/main/java/eu/dnetlib/dhp/actionmanager/ISClient.java index 0914381954..0f0d21e11f 100644 --- a/dhp-workflows/dhp-actionmanager/src/main/java/eu/dnetlib/dhp/actionmanager/ISClient.java +++ b/dhp-workflows/dhp-actionmanager/src/main/java/eu/dnetlib/dhp/actionmanager/ISClient.java @@ -32,7 +32,7 @@ public class ISClient implements Serializable { private static final String INPUT_ACTION_SET_ID_SEPARATOR = ","; - private ISLookUpService isLookup; + private final ISLookUpService isLookup; public ISClient(String isLookupUrl) { isLookup = ISLookupClientFactory.getLookUpService(isLookupUrl); diff --git a/dhp-workflows/dhp-actionmanager/src/main/java/eu/dnetlib/dhp/actionmanager/promote/PromoteActionPayloadFunctions.java b/dhp-workflows/dhp-actionmanager/src/main/java/eu/dnetlib/dhp/actionmanager/promote/PromoteActionPayloadFunctions.java index ffde658bd4..56c8dd05a1 100644 --- a/dhp-workflows/dhp-actionmanager/src/main/java/eu/dnetlib/dhp/actionmanager/promote/PromoteActionPayloadFunctions.java +++ b/dhp-workflows/dhp-actionmanager/src/main/java/eu/dnetlib/dhp/actionmanager/promote/PromoteActionPayloadFunctions.java @@ -123,10 +123,10 @@ public class PromoteActionPayloadFunctions { * @param Type of graph table row */ public static class TableAggregator extends Aggregator { - private SerializableSupplier zeroFn; - private SerializableSupplier> mergeAndGetFn; - private SerializableSupplier> isNotZeroFn; - private Class rowClazz; + private final SerializableSupplier zeroFn; + private final SerializableSupplier> mergeAndGetFn; + private final SerializableSupplier> isNotZeroFn; + private final Class rowClazz; public TableAggregator( SerializableSupplier zeroFn, diff --git a/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/worker/DnetCollectorWorkerApplication.java b/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/worker/DnetCollectorWorkerApplication.java index cda07d1515..da30e87937 100644 --- a/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/worker/DnetCollectorWorkerApplication.java +++ b/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/worker/DnetCollectorWorkerApplication.java @@ -20,7 +20,7 @@ public class DnetCollectorWorkerApplication { private static final Logger log = LoggerFactory.getLogger(DnetCollectorWorkerApplication.class); - private static CollectorPluginFactory collectorPluginFactory = new CollectorPluginFactory(); + private static final CollectorPluginFactory collectorPluginFactory = new CollectorPluginFactory(); private static ArgumentApplicationParser argumentParser; diff --git a/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/worker/utils/CollectorPluginErrorLogList.java b/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/worker/utils/CollectorPluginErrorLogList.java index 6ee8a8b496..dcaf0ea562 100644 --- a/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/worker/utils/CollectorPluginErrorLogList.java +++ b/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/worker/utils/CollectorPluginErrorLogList.java @@ -9,7 +9,7 @@ public class CollectorPluginErrorLogList extends LinkedList { @Override public String toString() { - String log = new String(); + String log = ""; int index = 0; for (final String errorMessage : this) { log += String.format("Retry #%s: %s / ", index++, errorMessage); diff --git a/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/worker/utils/XmlCleaner.java b/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/worker/utils/XmlCleaner.java index 32eeeab4b8..44aeb4d029 100644 --- a/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/worker/utils/XmlCleaner.java +++ b/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/worker/utils/XmlCleaner.java @@ -11,22 +11,22 @@ import java.util.regex.Pattern; public class XmlCleaner { /** Pattern for numeric entities. */ - private static Pattern validCharacterEntityPattern = Pattern.compile("^&#x?\\d{2,4};"); // $NON-NLS-1$ + private static final Pattern validCharacterEntityPattern = Pattern.compile("^&#x?\\d{2,4};"); // $NON-NLS-1$ // private static Pattern validCharacterEntityPattern = Pattern.compile("^&#?\\d{2,4};"); // //$NON-NLS-1$ // see https://www.w3.org/TR/REC-xml/#charsets , not only limited to - private static Pattern invalidControlCharPattern = Pattern.compile("&#x?1[0-9a-fA-F];"); + private static final Pattern invalidControlCharPattern = Pattern.compile("&#x?1[0-9a-fA-F];"); /** * Pattern that negates the allowable XML 4 byte unicode characters. Valid are: #x9 | #xA | #xD | [#x20-#xD7FF] | * [#xE000-#xFFFD] | [#x10000-#x10FFFF] */ - private static Pattern invalidCharacterPattern = Pattern.compile("[^\t\r\n\u0020-\uD7FF\uE000-\uFFFD]"); // $NON-NLS-1$ + private static final Pattern invalidCharacterPattern = Pattern.compile("[^\t\r\n\u0020-\uD7FF\uE000-\uFFFD]"); // $NON-NLS-1$ // Map entities to their unicode equivalent - private static Set goodEntities = new HashSet<>(); - private static Map badEntities = new HashMap<>(); + private static final Set goodEntities = new HashSet<>(); + private static final Map badEntities = new HashMap<>(); static { // pre-defined XML entities diff --git a/dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/collector/worker/DnetCollectorWorkerApplicationTests.java b/dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/collector/worker/DnetCollectorWorkerApplicationTests.java index 1a4fafb66c..87bd3be3d8 100644 --- a/dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/collector/worker/DnetCollectorWorkerApplicationTests.java +++ b/dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/collector/worker/DnetCollectorWorkerApplicationTests.java @@ -21,8 +21,8 @@ import eu.dnetlib.message.MessageManager; public class DnetCollectorWorkerApplicationTests { - private ArgumentApplicationParser argumentParser = mock(ArgumentApplicationParser.class); - private MessageManager messageManager = mock(MessageManager.class); + private final ArgumentApplicationParser argumentParser = mock(ArgumentApplicationParser.class); + private final MessageManager messageManager = mock(MessageManager.class); private DnetCollectorWorker worker; diff --git a/dhp-workflows/dhp-dedup-openaire/src/main/java/eu/dnetlib/dhp/oa/dedup/DedupUtility.java b/dhp-workflows/dhp-dedup-openaire/src/main/java/eu/dnetlib/dhp/oa/dedup/DedupUtility.java index 4f797f7f77..d3ae8ee4f9 100644 --- a/dhp-workflows/dhp-dedup-openaire/src/main/java/eu/dnetlib/dhp/oa/dedup/DedupUtility.java +++ b/dhp-workflows/dhp-dedup-openaire/src/main/java/eu/dnetlib/dhp/oa/dedup/DedupUtility.java @@ -2,6 +2,7 @@ package eu.dnetlib.dhp.oa.dedup; import java.io.StringReader; +import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.text.Normalizer; import java.util.*; @@ -73,7 +74,7 @@ public class DedupUtility { public static String md5(final String s) { try { final MessageDigest md = MessageDigest.getInstance("MD5"); - md.update(s.getBytes("UTF-8")); + md.update(s.getBytes(StandardCharsets.UTF_8)); return new String(Hex.encodeHex(md.digest())); } catch (final Exception e) { System.err.println("Error creating id"); diff --git a/dhp-workflows/dhp-dedup-openaire/src/main/java/eu/dnetlib/dhp/oa/dedup/SparkReporter.java b/dhp-workflows/dhp-dedup-openaire/src/main/java/eu/dnetlib/dhp/oa/dedup/SparkReporter.java index 7100c90372..005e65ddf0 100644 --- a/dhp-workflows/dhp-dedup-openaire/src/main/java/eu/dnetlib/dhp/oa/dedup/SparkReporter.java +++ b/dhp-workflows/dhp-dedup-openaire/src/main/java/eu/dnetlib/dhp/oa/dedup/SparkReporter.java @@ -15,7 +15,7 @@ public class SparkReporter implements Serializable, Reporter { private final List> relations = new ArrayList<>(); - private Map accumulators; + private final Map accumulators; public SparkReporter(Map accumulators) { this.accumulators = accumulators; diff --git a/dhp-workflows/dhp-dedup-scholexplorer/src/main/java/eu/dnetlib/dedup/DedupUtility.java b/dhp-workflows/dhp-dedup-scholexplorer/src/main/java/eu/dnetlib/dedup/DedupUtility.java index 70a2e35917..364b49c16e 100644 --- a/dhp-workflows/dhp-dedup-scholexplorer/src/main/java/eu/dnetlib/dedup/DedupUtility.java +++ b/dhp-workflows/dhp-dedup-scholexplorer/src/main/java/eu/dnetlib/dedup/DedupUtility.java @@ -106,7 +106,7 @@ public class DedupUtility { public static String md5(final String s) { try { final MessageDigest md = MessageDigest.getInstance("MD5"); - md.update(s.getBytes("UTF-8")); + md.update(s.getBytes(StandardCharsets.UTF_8)); return new String(Hex.encodeHex(md.digest())); } catch (final Exception e) { System.err.println("Error creating id"); diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/AbstractMdRecordToOafMapper.java b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/AbstractMdRecordToOafMapper.java index e20d1eb796..82f5cbfd0d 100644 --- a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/AbstractMdRecordToOafMapper.java +++ b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/AbstractMdRecordToOafMapper.java @@ -410,14 +410,10 @@ public abstract class AbstractMdRecordToOafMapper { final String identifier = n.valueOf("./*[local-name()='identifier']"); final String baseURL = n.valueOf("./*[local-name()='baseURL']"); - ; final String metadataNamespace = n.valueOf("./*[local-name()='metadataNamespace']"); - ; final boolean altered = n.valueOf("@altered").equalsIgnoreCase("true"); final String datestamp = n.valueOf("./*[local-name()='datestamp']"); - ; final String harvestDate = n.valueOf("@harvestDate"); - ; return oaiIProvenance(identifier, baseURL, metadataNamespace, altered, datestamp, harvestDate); } diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MigrateDbEntitiesApplication.java b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MigrateDbEntitiesApplication.java index c0469735c7..d74c524a9e 100644 --- a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MigrateDbEntitiesApplication.java +++ b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MigrateDbEntitiesApplication.java @@ -514,9 +514,7 @@ public class MigrateDbEntitiesApplication extends AbstractMigrationApplication if (arr.length == 3) { final String issn = StringUtils.isNotBlank(arr[0]) ? arr[0] : null; final String eissn = StringUtils.isNotBlank(arr[1]) ? arr[1] : null; - ; final String lissn = StringUtils.isNotBlank(arr[2]) ? arr[2] : null; - ; if (issn != null || eissn != null || lissn != null) { return journal(name, issn, eissn, eissn, null, null, null, null, null, null, null, info); } diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/common/DbClient.java b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/common/DbClient.java index 121df81316..94f17aad52 100644 --- a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/common/DbClient.java +++ b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/common/DbClient.java @@ -14,7 +14,7 @@ public class DbClient implements Closeable { private static final Log log = LogFactory.getLog(DbClient.class); - private Connection connection; + private final Connection connection; public DbClient(final String address, final String login, final String password) { diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/common/PacePerson.java b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/common/PacePerson.java index 8adcd565b7..d1c615dcdd 100644 --- a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/common/PacePerson.java +++ b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/common/PacePerson.java @@ -2,6 +2,7 @@ package eu.dnetlib.dhp.oa.graph.raw.common; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.text.Normalizer; import java.util.HashSet; import java.util.List; @@ -141,7 +142,7 @@ public class PacePerson { public String hash() { return Hashing .murmur3_128() - .hashString(getNormalisedFullname(), Charset.forName(UTF8)) + .hashString(getNormalisedFullname(), StandardCharsets.UTF_8) .toString(); } diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/sx/graph/parser/AbstractScholexplorerParser.java b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/sx/graph/parser/AbstractScholexplorerParser.java index c97753fdc7..0db2b26884 100644 --- a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/sx/graph/parser/AbstractScholexplorerParser.java +++ b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/sx/graph/parser/AbstractScholexplorerParser.java @@ -25,7 +25,7 @@ public abstract class AbstractScholexplorerParser { protected static final Log log = LogFactory.getLog(AbstractScholexplorerParser.class); static final Pattern pattern = Pattern.compile("10\\.\\d{4,9}/[-._;()/:A-Z0-9]+$", Pattern.CASE_INSENSITIVE); - private List datasetSubTypes = Arrays + private final List datasetSubTypes = Arrays .asList( "dataset", "software", diff --git a/dhp-workflows/dhp-graph-provision-scholexplorer/src/main/java/eu/dnetlib/dhp/provision/update/CrossRefParserJSON.java b/dhp-workflows/dhp-graph-provision-scholexplorer/src/main/java/eu/dnetlib/dhp/provision/update/CrossRefParserJSON.java index bc9562e08b..a172ef698c 100644 --- a/dhp-workflows/dhp-graph-provision-scholexplorer/src/main/java/eu/dnetlib/dhp/provision/update/CrossRefParserJSON.java +++ b/dhp-workflows/dhp-graph-provision-scholexplorer/src/main/java/eu/dnetlib/dhp/provision/update/CrossRefParserJSON.java @@ -18,7 +18,7 @@ import eu.dnetlib.dhp.utils.DHPUtils; public class CrossRefParserJSON { - private static List collectedFrom = generateCrossrefCollectedFrom("complete"); + private static final List collectedFrom = generateCrossrefCollectedFrom("complete"); public static ScholixResource parseRecord(final String record) { if (record == null) diff --git a/dhp-workflows/dhp-graph-provision-scholexplorer/src/main/java/eu/dnetlib/dhp/provision/update/DataciteClient.java b/dhp-workflows/dhp-graph-provision-scholexplorer/src/main/java/eu/dnetlib/dhp/provision/update/DataciteClient.java index e84ec4376e..9e9f0d5c99 100644 --- a/dhp-workflows/dhp-graph-provision-scholexplorer/src/main/java/eu/dnetlib/dhp/provision/update/DataciteClient.java +++ b/dhp-workflows/dhp-graph-provision-scholexplorer/src/main/java/eu/dnetlib/dhp/provision/update/DataciteClient.java @@ -16,7 +16,7 @@ public class DataciteClient { private String host; private String index = "datacite"; private String indexType = "dump"; - private Datacite2Scholix d2s; + private final Datacite2Scholix d2s; public DataciteClient(String host) { this.host = host; diff --git a/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/RelationPartitioner.java b/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/RelationPartitioner.java index bac2278e6a..a09a278372 100644 --- a/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/RelationPartitioner.java +++ b/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/RelationPartitioner.java @@ -12,7 +12,7 @@ import eu.dnetlib.dhp.oa.provision.model.SortableRelation; */ public class RelationPartitioner extends Partitioner { - private int numPartitions; + private final int numPartitions; public RelationPartitioner(int numPartitions) { this.numPartitions = numPartitions; diff --git a/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/StreamingInputDocumentFactory.java b/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/StreamingInputDocumentFactory.java index de221b2ee3..3e8abbd9f1 100644 --- a/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/StreamingInputDocumentFactory.java +++ b/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/StreamingInputDocumentFactory.java @@ -46,7 +46,7 @@ public class StreamingInputDocumentFactory { private static final String INDEX_RECORD_ID = INDEX_FIELD_PREFIX + "indexrecordidentifier"; - private static final String outFormat = new String("yyyy-MM-dd'T'hh:mm:ss'Z'"); + private static final String outFormat = "yyyy-MM-dd'T'hh:mm:ss'Z'"; private static final List dateFormats = Arrays .asList("yyyy-MM-dd'T'hh:mm:ss", "yyyy-MM-dd", "dd-MM-yyyy", "dd/MM/yyyy", "yyyy"); @@ -61,15 +61,18 @@ public class StreamingInputDocumentFactory { private static final int MAX_FIELD_LENGTH = 25000; - private ThreadLocal inputFactory = ThreadLocal.withInitial(() -> XMLInputFactory.newInstance()); + private final ThreadLocal inputFactory = ThreadLocal + .withInitial(() -> XMLInputFactory.newInstance()); - private ThreadLocal outputFactory = ThreadLocal.withInitial(() -> XMLOutputFactory.newInstance()); + private final ThreadLocal outputFactory = ThreadLocal + .withInitial(() -> XMLOutputFactory.newInstance()); - private ThreadLocal eventFactory = ThreadLocal.withInitial(() -> XMLEventFactory.newInstance()); + private final ThreadLocal eventFactory = ThreadLocal + .withInitial(() -> XMLEventFactory.newInstance()); - private String version; + private final String version; - private String dsId; + private final String dsId; private String resultName = DEFAULTDNETRESULT; diff --git a/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/TemplateFactory.java b/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/TemplateFactory.java index 3d9cf1ae78..6cb025b4fd 100644 --- a/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/TemplateFactory.java +++ b/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/TemplateFactory.java @@ -17,7 +17,7 @@ import eu.dnetlib.dhp.schema.oaf.OafEntity; public class TemplateFactory { - private TemplateResources resources; + private final TemplateResources resources; private static final char DELIMITER = '$'; diff --git a/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/TemplateResources.java b/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/TemplateResources.java index 746f8ebe68..878a582bff 100644 --- a/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/TemplateResources.java +++ b/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/TemplateResources.java @@ -8,17 +8,17 @@ import com.google.common.io.Resources; public class TemplateResources { - private String record = read("eu/dnetlib/dhp/oa/provision/template/record.st"); + private final String record = read("eu/dnetlib/dhp/oa/provision/template/record.st"); - private String instance = read("eu/dnetlib/dhp/oa/provision/template/instance.st"); + private final String instance = read("eu/dnetlib/dhp/oa/provision/template/instance.st"); - private String rel = read("eu/dnetlib/dhp/oa/provision/template/rel.st"); + private final String rel = read("eu/dnetlib/dhp/oa/provision/template/rel.st"); - private String webresource = read("eu/dnetlib/dhp/oa/provision/template/webresource.st"); + private final String webresource = read("eu/dnetlib/dhp/oa/provision/template/webresource.st"); - private String child = read("eu/dnetlib/dhp/oa/provision/template/child.st"); + private final String child = read("eu/dnetlib/dhp/oa/provision/template/child.st"); - private String entity = read("eu/dnetlib/dhp/oa/provision/template/entity.st"); + private final String entity = read("eu/dnetlib/dhp/oa/provision/template/entity.st"); private static String read(final String classpathResource) throws IOException { return Resources.toString(Resources.getResource(classpathResource), StandardCharsets.UTF_8); diff --git a/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/XmlRecordFactory.java b/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/XmlRecordFactory.java index f667d9f3cb..2cff2124e1 100644 --- a/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/XmlRecordFactory.java +++ b/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/XmlRecordFactory.java @@ -48,13 +48,13 @@ import eu.dnetlib.dhp.schema.oaf.Result; public class XmlRecordFactory implements Serializable { public static final String REL_SUBTYPE_DEDUP = "dedup"; - private Map accumulators; + private final Map accumulators; - private Set specialDatasourceTypes; + private final Set specialDatasourceTypes; - private ContextMapper contextMapper; + private final ContextMapper contextMapper; - private String schemaLocation; + private final String schemaLocation; private boolean indent = false; diff --git a/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/XmlSerializationUtils.java b/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/XmlSerializationUtils.java index bc3b3107d8..8195467b16 100644 --- a/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/XmlSerializationUtils.java +++ b/dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/XmlSerializationUtils.java @@ -41,7 +41,7 @@ public class XmlSerializationUtils { public static String mapStructuredProperty(String name, StructuredProperty t) { return asXmlElement( - name, t.getValue(), t.getQualifier(), t.getDataInfo() != null ? t.getDataInfo() : null); + name, t.getValue(), t.getQualifier(), t.getDataInfo()); } public static String mapQualifier(String name, Qualifier q) { diff --git a/dhp-workflows/dhp-graph-provision/src/test/java/eu/dnetlib/dhp/oa/provision/GraphJoinerTest.java b/dhp-workflows/dhp-graph-provision/src/test/java/eu/dnetlib/dhp/oa/provision/GraphJoinerTest.java index 8afe03d6d2..1336a1cf7c 100644 --- a/dhp-workflows/dhp-graph-provision/src/test/java/eu/dnetlib/dhp/oa/provision/GraphJoinerTest.java +++ b/dhp-workflows/dhp-graph-provision/src/test/java/eu/dnetlib/dhp/oa/provision/GraphJoinerTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.BeforeEach; public class GraphJoinerTest { - private ClassLoader cl = getClass().getClassLoader(); + private final ClassLoader cl = getClass().getClassLoader(); private Path workingDir; private Path inputDir; private Path outputDir; From a0a6109bbc06a75620f5e556f0d13e9cb93d8bf0 Mon Sep 17 00:00:00 2001 From: "michele.artini" Date: Thu, 30 Apr 2020 11:03:46 +0200 Subject: [PATCH 8/8] fixed a problem with journals --- .../dhp/oa/graph/raw/MigrateDbEntitiesApplication.java | 6 +++--- .../eu/dnetlib/dhp/oa/graph/sql/queryDatasources.sql | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MigrateDbEntitiesApplication.java b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MigrateDbEntitiesApplication.java index d88325c9b8..58339fdc5e 100644 --- a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MigrateDbEntitiesApplication.java +++ b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MigrateDbEntitiesApplication.java @@ -488,9 +488,9 @@ public class MigrateDbEntitiesApplication extends AbstractMigrationApplication if (StringUtils.isNotBlank(sj)) { final String[] arr = sj.split("@@@"); if (arr.length == 3) { - final String issn = StringUtils.isNotBlank(arr[0]) ? arr[0] : null; - final String eissn = StringUtils.isNotBlank(arr[1]) ? arr[1] : null;; - final String lissn = StringUtils.isNotBlank(arr[2]) ? arr[2] : null;; + final String issn = StringUtils.isNotBlank(arr[0]) ? arr[0].trim() : null; + final String eissn = StringUtils.isNotBlank(arr[1]) ? arr[1].trim() : null;; + final String lissn = StringUtils.isNotBlank(arr[2]) ? arr[2].trim() : null;; if (issn != null || eissn != null || lissn != null) { return journal(name, issn, eissn, eissn, null, null, null, null, null, null, null, info); } diff --git a/dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/sql/queryDatasources.sql b/dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/sql/queryDatasources.sql index 9a0a45f78c..ff1178c711 100644 --- a/dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/sql/queryDatasources.sql +++ b/dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/sql/queryDatasources.sql @@ -108,7 +108,7 @@ SELECT ELSE 'Other' END || '@@@dnet:datasource_typologies@@@dnet:datasource_typologies' AS datasourcetype, 'sysimport:crosswalk:entityregistry@@@sysimport:crosswalk:entityregistry@@@dnet:provenance_actions@@@dnet:provenance_actions' AS provenanceaction, - CONCAT(d.issn, '@@@', d.eissn, '@@@', d.lissn) AS journal + CONCAT(d.issn, ' @@@ ', d.eissn, ' @@@ ', d.lissn) AS journal FROM dsm_datasources d