Repository: incubator-gobblin Updated Branches: refs/heads/master cbb894327 -> 578b4f950
[GOBBLIN-633] Provide HOCON support for flow requests to GaaS. Closes #2503 from sv2000/hoconFlowSpec Project: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/commit/578b4f95 Tree: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/tree/578b4f95 Diff: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/diff/578b4f95 Branch: refs/heads/master Commit: 578b4f9504cf322c7efb9e36b551c52b5ba1155b Parents: cbb8943 Author: suvasude <[email protected]> Authored: Tue Nov 20 13:26:02 2018 -0800 Committer: Hung Tran <[email protected]> Committed: Tue Nov 20 13:26:02 2018 -0800 ---------------------------------------------------------------------- .../apache/gobblin/service/FlowConfigResourceLocalHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/578b4f95/gobblin-restli/gobblin-flow-config-service/gobblin-flow-config-service-server/src/main/java/org/apache/gobblin/service/FlowConfigResourceLocalHandler.java ---------------------------------------------------------------------- diff --git a/gobblin-restli/gobblin-flow-config-service/gobblin-flow-config-service-server/src/main/java/org/apache/gobblin/service/FlowConfigResourceLocalHandler.java b/gobblin-restli/gobblin-flow-config-service/gobblin-flow-config-service-server/src/main/java/org/apache/gobblin/service/FlowConfigResourceLocalHandler.java index 05a1054..580ab95 100644 --- a/gobblin-restli/gobblin-flow-config-service/gobblin-flow-config-service-server/src/main/java/org/apache/gobblin/service/FlowConfigResourceLocalHandler.java +++ b/gobblin-restli/gobblin-flow-config-service/gobblin-flow-config-service-server/src/main/java/org/apache/gobblin/service/FlowConfigResourceLocalHandler.java @@ -205,8 +205,9 @@ public class FlowConfigResourceLocalHandler implements FlowConfigsResourceHandle } Config config = configBuilder.build(); - Config configWithFallback = config.withFallback(ConfigFactory.parseMap(flowConfig.getProperties())); - + //We allow for flowConfig to be in HOCON format. We first convert the StringMap object to a String object and + // then use ConfigFactory#parseString() to parse the HOCON string. + Config configWithFallback = config.withFallback(ConfigFactory.parseString(flowConfig.getProperties().toString()).resolve()); try { URI templateURI = new URI(flowConfig.getTemplateUris()); return FlowSpec.builder().withConfig(configWithFallback).withTemplate(templateURI).build();
