Merge branch 'feature/AMATERASU-51' of github.com:ebarten/incubator-amaterasu into...
authorYaniv Rodenski <roadan@gmail.com>
Sun, 25 Nov 2018 04:21:32 +0000 (15:21 +1100)
committerYaniv Rodenski <roadan@gmail.com>
Sun, 25 Nov 2018 04:21:32 +0000 (15:21 +1100)
1  2 
common/src/main/kotlin/org/apache/amaterasu/common/dataobjects/ActionData.kt
leader-common/src/main/kotlin/org/apache/amaterasu/leader/common/dsl/JobParser.kt
leader/src/test/scala/org/apache/amaterasu/common/execution/JobParserTests.scala

@@@ -126,13 -125,14 +126,14 @@@ object JobParser 
  
      @JvmStatic
      fun parseSequentialAction(action: JsonNode,
 -    jobId: String,
 -    actionsQueue: BlockingQueue<ActionData>,
 -    client: CuratorFramework,
 -    attempts: Int): SequentialAction {
 +                              jobId: String,
 +                              actionsQueue: BlockingQueue<ActionData>,
 +                              client: CuratorFramework,
 +                              attempts: Int): SequentialAction {
  
 -        return  SequentialAction(action.path("name").asText(),
 +        return SequentialAction(action.path("name").asText(),
                  action.path("file").asText(),
+                 action.path("config").asText(),
                  action.path("runner").path("group").asText(),
                  action.path("runner").path("type").asText(),
                  action.path("exports").fields().asSequence().map { it.key to it.value.asText() }.toMap(),