Repository: incubator-apex-core Updated Branches: refs/heads/master b12e8b01c -> ae46b47cd
APEXCORE-463 : fixed condtion to include modules without input port Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/ae46b47c Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/ae46b47c Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/ae46b47c Branch: refs/heads/master Commit: ae46b47cdfcd839cce69f01681af56764e16b2ca Parents: b12e8b0 Author: shubham <[email protected]> Authored: Thu May 19 19:05:22 2016 +0530 Committer: shubham <[email protected]> Committed: Fri Jun 3 11:12:30 2016 +0530 ---------------------------------------------------------------------- .../com/datatorrent/stram/webapp/OperatorDiscoverer.java | 8 ++++---- .../main/java/com/datatorrent/stram/webapp/TypeGraph.java | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/ae46b47c/engine/src/main/java/com/datatorrent/stram/webapp/OperatorDiscoverer.java ---------------------------------------------------------------------- diff --git a/engine/src/main/java/com/datatorrent/stram/webapp/OperatorDiscoverer.java b/engine/src/main/java/com/datatorrent/stram/webapp/OperatorDiscoverer.java index c388a19..64d0b33 100644 --- a/engine/src/main/java/com/datatorrent/stram/webapp/OperatorDiscoverer.java +++ b/engine/src/main/java/com/datatorrent/stram/webapp/OperatorDiscoverer.java @@ -309,10 +309,10 @@ public class OperatorDiscoverer classLoader = new URLClassLoader(urls, ClassLoader.getSystemClassLoader()); } - private void loadOperatorClass() + private void loadGenericOperatorClasses() { buildTypeGraph(); - operatorClassNames = typeGraph.getAllDTInstantiableOperators(); + operatorClassNames = typeGraph.getAllDTInstantiableGenericOperators(); } @SuppressWarnings("unchecked") @@ -420,7 +420,7 @@ public class OperatorDiscoverer public Set<String> getOperatorClasses(String parent, String searchTerm) throws ClassNotFoundException { if (CollectionUtils.isEmpty(operatorClassNames)) { - loadOperatorClass(); + loadGenericOperatorClasses(); } if (parent == null) { parent = GenericOperator.class.getName(); @@ -481,7 +481,7 @@ public class OperatorDiscoverer public Class<? extends Operator> getOperatorClass(String className) throws ClassNotFoundException { if (CollectionUtils.isEmpty(operatorClassNames)) { - loadOperatorClass(); + loadGenericOperatorClasses(); } Class<?> clazz = classLoader.loadClass(className); http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/ae46b47c/engine/src/main/java/com/datatorrent/stram/webapp/TypeGraph.java ---------------------------------------------------------------------- diff --git a/engine/src/main/java/com/datatorrent/stram/webapp/TypeGraph.java b/engine/src/main/java/com/datatorrent/stram/webapp/TypeGraph.java index 434943d..557d685 100644 --- a/engine/src/main/java/com/datatorrent/stram/webapp/TypeGraph.java +++ b/engine/src/main/java/com/datatorrent/stram/webapp/TypeGraph.java @@ -66,6 +66,7 @@ import com.google.common.primitives.Primitives; import com.datatorrent.api.Component; import com.datatorrent.api.DAG.GenericOperator; import com.datatorrent.api.InputOperator; +import com.datatorrent.api.Module; import com.datatorrent.api.Operator; import com.datatorrent.common.util.BaseOperator; import com.datatorrent.stram.webapp.asm.ClassNodeType; @@ -347,7 +348,7 @@ public class TypeGraph return typeGraph.size(); } - public Set<String> getAllDTInstantiableOperators() + public Set<String> getAllDTInstantiableGenericOperators() { TypeGraphVertex tgv = typeGraph.get(GenericOperator.class.getName()); if (tgv == null) { @@ -355,7 +356,8 @@ public class TypeGraph } Set<String> result = new TreeSet<>(); for (TypeGraphVertex node : tgv.allInstantiableDescendants) { - if ((isAncestor(InputOperator.class.getName(), node.typeName) || !getAllInputPorts(node).isEmpty())) { + if ((isAncestor(InputOperator.class.getName(), node.typeName) || isAncestor(Module.class.getName(), node.typeName) + || !getAllInputPorts(node).isEmpty())) { result.add(node.typeName); } }
