From 0da1d2c0c9b50aa90e43ada87d3b2f0d64a887e2 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Tue, 4 Aug 2020 12:25:31 +0200 Subject: [PATCH] introduced GraphFormat.DEFAULT, indicating a common value to be used across the workflows --- .../eu/dnetlib/dhp/oa/graph/raw/MergeClaimsApplication.java | 2 +- .../src/main/java/eu/dnetlib/dhp/common/GraphFormat.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MergeClaimsApplication.java b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MergeClaimsApplication.java index 635402a72..901252878 100644 --- a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MergeClaimsApplication.java +++ b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MergeClaimsApplication.java @@ -54,7 +54,7 @@ public class MergeClaimsApplication { final GraphFormat format = Optional .ofNullable(parser.get("format")) .map(GraphFormat::valueOf) - .orElse(GraphFormat.JSON); + .orElse(GraphFormat.DEFAULT); log.info("graphFormat: {}", format); String graphTableClassName = parser.get("graphTableClassName"); diff --git a/dhp-workflows/dhp-workflows-common/src/main/java/eu/dnetlib/dhp/common/GraphFormat.java b/dhp-workflows/dhp-workflows-common/src/main/java/eu/dnetlib/dhp/common/GraphFormat.java index 865f4a590..76a42fb5a 100644 --- a/dhp-workflows/dhp-workflows-common/src/main/java/eu/dnetlib/dhp/common/GraphFormat.java +++ b/dhp-workflows/dhp-workflows-common/src/main/java/eu/dnetlib/dhp/common/GraphFormat.java @@ -3,6 +3,8 @@ package eu.dnetlib.dhp.common; public enum GraphFormat { - JSON, HIVE + JSON, HIVE; + + public static GraphFormat DEFAULT = JSON; }