Repository: apex-core Updated Branches: refs/heads/master c97dd7ccc -> d514859a8
APEXCORE-405 Make getDAG/prepareDAG available through EmbeddedAppLauncher. Project: http://git-wip-us.apache.org/repos/asf/apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/apex-core/commit/d514859a Tree: http://git-wip-us.apache.org/repos/asf/apex-core/tree/d514859a Diff: http://git-wip-us.apache.org/repos/asf/apex-core/diff/d514859a Branch: refs/heads/master Commit: d514859a8d51464a8a849286444ea9863ea7077f Parents: c97dd7c Author: Thomas Weise <[email protected]> Authored: Sun Dec 4 22:03:25 2016 -0800 Committer: Thomas Weise <[email protected]> Committed: Mon Dec 5 13:51:15 2016 -0800 ---------------------------------------------------------------------- .../java/com/datatorrent/api/LocalMode.java | 37 -------------------- .../apache/apex/api/EmbeddedAppLauncher.java | 36 +++++++++++++++++++ 2 files changed, 36 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/apex-core/blob/d514859a/api/src/main/java/com/datatorrent/api/LocalMode.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/com/datatorrent/api/LocalMode.java b/api/src/main/java/com/datatorrent/api/LocalMode.java index 7d6f1ee..0387506 100644 --- a/api/src/main/java/com/datatorrent/api/LocalMode.java +++ b/api/src/main/java/com/datatorrent/api/LocalMode.java @@ -19,7 +19,6 @@ package com.datatorrent.api; import org.apache.apex.api.EmbeddedAppLauncher; -import org.apache.hadoop.conf.Configuration; /** * Local mode execution for single application @@ -30,42 +29,6 @@ import org.apache.hadoop.conf.Configuration; @Deprecated public abstract class LocalMode<H extends EmbeddedAppLauncher.EmbeddedAppHandle> extends EmbeddedAppLauncher<H> { - - /** - * <p> - * getDAG.</p> - * - * @return - */ - public abstract DAG getDAG(); - - /** - * <p> - * cloneDAG.</p> - * - * @return - * @throws java.lang.Exception - */ - public abstract DAG cloneDAG() throws Exception; - - /** - * Build the logical plan through the given streaming application instance and/or from configuration. - * <p> - * The plan will be constructed through {@link StreamingApplication#populateDAG}. If configuration properties are - * specified, they function as override, as would be the case when launching an application through CLI. - * <p> - * This method can also be used to construct the plan declaratively from configuration only, by passing null for the - * application. In this case the configuration contains all operators and streams. - * <p> - * - * @param app - * @param conf - * @return - * @throws Exception - * @since 0.3.5 - */ - public abstract DAG prepareDAG(StreamingApplication app, Configuration conf) throws Exception; - /** * <p> * getController.</p> http://git-wip-us.apache.org/repos/asf/apex-core/blob/d514859a/api/src/main/java/org/apache/apex/api/EmbeddedAppLauncher.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/apex/api/EmbeddedAppLauncher.java b/api/src/main/java/org/apache/apex/api/EmbeddedAppLauncher.java index 4ff705b..860926c 100644 --- a/api/src/main/java/org/apache/apex/api/EmbeddedAppLauncher.java +++ b/api/src/main/java/org/apache/apex/api/EmbeddedAppLauncher.java @@ -21,6 +21,7 @@ package org.apache.apex.api; import org.apache.hadoop.conf.Configuration; import com.datatorrent.api.Attribute; +import com.datatorrent.api.DAG; import com.datatorrent.api.StreamingApplication; /** @@ -65,6 +66,41 @@ public abstract class EmbeddedAppLauncher<H extends EmbeddedAppLauncher.Embedded public interface EmbeddedAppHandle extends AppHandle {} /** + * <p> + * getDAG.</p> + * + * @return + */ + public abstract DAG getDAG(); + + /** + * <p> + * cloneDAG.</p> + * + * @return + * @throws java.lang.Exception + */ + public abstract DAG cloneDAG() throws Exception; + + /** + * Build the logical plan through the given streaming application instance and/or from configuration. + * <p> + * The plan will be constructed through {@link StreamingApplication#populateDAG}. If configuration properties are + * specified, they function as override, as would be the case when launching an application through CLI. + * <p> + * This method can also be used to construct the plan declaratively from configuration only, by passing null for the + * application. In this case the configuration contains all operators and streams. + * <p> + * + * @param app + * @param conf + * @return + * @throws Exception + * @since 0.3.5 + */ + public abstract DAG prepareDAG(StreamingApplication app, Configuration conf) throws Exception; + + /** * Shortcut to run an application. Used for testing. * * @param app
