You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by vr...@apache.org on 2017/02/13 05:43:02 UTC
[1/2] apex-core git commit: APEXCORE-644 get-app-package-operators
with parent option does not work
Repository: apex-core
Updated Branches:
refs/heads/master 4302929e0 -> 74f732a79
APEXCORE-644 get-app-package-operators with parent option does not work
There are two apex command line operators that have the option "-parent" (get-app-package-operators and get-jar-operator-classes). And both of them have the mandatory argument <full name of the parent class>.
The implementation of the class GetOperatorClassesCommandLineOptions that builds command line parser options created the descriptor of the option "-parent" without an argument. And as the result, the argument of the option was ignored and it was moved to the list of the regular command line parameters.
The bug fix is trivial. It defines the option "-parent" as an option with an argument.
The new unit test ApexCliTest.testGetOperatorClassesCommandLineInfo() has been added too.
Project: http://git-wip-us.apache.org/repos/asf/apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/apex-core/commit/d18dae02
Tree: http://git-wip-us.apache.org/repos/asf/apex-core/tree/d18dae02
Diff: http://git-wip-us.apache.org/repos/asf/apex-core/diff/d18dae02
Branch: refs/heads/master
Commit: d18dae02811f1b02b5320fb4614f6636407dce8b
Parents: f9101d9
Author: Sergey Golovko <se...@datatorrent.com>
Authored: Thu Feb 9 13:53:38 2017 -0800
Committer: Sergey Golovko <se...@datatorrent.com>
Committed: Fri Feb 10 11:29:10 2017 -0800
----------------------------------------------------------------------
.../main/java/com/datatorrent/stram/cli/ApexCli.java | 6 +++---
.../java/com/datatorrent/stram/cli/ApexCliTest.java | 14 ++++++++++++++
2 files changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/apex-core/blob/d18dae02/engine/src/main/java/com/datatorrent/stram/cli/ApexCli.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/cli/ApexCli.java b/engine/src/main/java/com/datatorrent/stram/cli/ApexCli.java
index 10b294f..28ac3df 100644
--- a/engine/src/main/java/com/datatorrent/stram/cli/ApexCli.java
+++ b/engine/src/main/java/com/datatorrent/stram/cli/ApexCli.java
@@ -2998,7 +2998,7 @@ public class ApexCli
public static class GetOperatorClassesCommandLineOptions
{
final Options options = new Options();
- final Option parent = add(new Option("parent", "Specify the parent class for the operators"));
+ final Option parent = add(new Option("parent", true, "Specify the parent class for the operators"));
private Option add(Option opt)
{
@@ -3010,13 +3010,13 @@ public class ApexCli
private static GetOperatorClassesCommandLineOptions GET_OPERATOR_CLASSES_OPTIONS = new GetOperatorClassesCommandLineOptions();
- private static class GetOperatorClassesCommandLineInfo
+ static class GetOperatorClassesCommandLineInfo
{
String parent;
String[] args;
}
- private static GetOperatorClassesCommandLineInfo getGetOperatorClassesCommandLineInfo(String[] args) throws ParseException
+ static GetOperatorClassesCommandLineInfo getGetOperatorClassesCommandLineInfo(String[] args) throws ParseException
{
CommandLineParser parser = new PosixParser();
GetOperatorClassesCommandLineInfo result = new GetOperatorClassesCommandLineInfo();
http://git-wip-us.apache.org/repos/asf/apex-core/blob/d18dae02/engine/src/test/java/com/datatorrent/stram/cli/ApexCliTest.java
----------------------------------------------------------------------
diff --git a/engine/src/test/java/com/datatorrent/stram/cli/ApexCliTest.java b/engine/src/test/java/com/datatorrent/stram/cli/ApexCliTest.java
index 52e737a..2ac1c50 100644
--- a/engine/src/test/java/com/datatorrent/stram/cli/ApexCliTest.java
+++ b/engine/src/test/java/com/datatorrent/stram/cli/ApexCliTest.java
@@ -258,4 +258,18 @@ public class ApexCliTest
Assert.fail("Cli failed throw multiple apps exception.");
}
+
+ @Test
+ public void testGetOperatorClassesCommandLineInfo() throws Exception
+ {
+ String arg2 = "option value";
+ String arg3 = "regular parameter";
+
+ ApexCli.GetOperatorClassesCommandLineInfo commandLineOptions =
+ ApexCli.getGetOperatorClassesCommandLineInfo(new String[] {"-parent", arg2, arg3});
+
+ Assert.assertEquals(commandLineOptions.parent, arg2);
+ Assert.assertEquals(commandLineOptions.args.length, 1);
+ Assert.assertEquals(commandLineOptions.args[0], arg3);
+ }
}
[2/2] apex-core git commit: Merge branch 'APEXCORE-644' of
https://github.com/sgolovko/apex-core into APEXCORE-644
Posted by vr...@apache.org.
Merge branch 'APEXCORE-644' of https://github.com/sgolovko/apex-core into APEXCORE-644
Project: http://git-wip-us.apache.org/repos/asf/apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/apex-core/commit/74f732a7
Tree: http://git-wip-us.apache.org/repos/asf/apex-core/tree/74f732a7
Diff: http://git-wip-us.apache.org/repos/asf/apex-core/diff/74f732a7
Branch: refs/heads/master
Commit: 74f732a79d7e271af0820b3071a9619be97ddf39
Parents: 4302929 d18dae0
Author: Vlad Rozov <v....@datatorrent.com>
Authored: Sun Feb 12 21:39:05 2017 -0800
Committer: Vlad Rozov <v....@datatorrent.com>
Committed: Sun Feb 12 21:39:05 2017 -0800
----------------------------------------------------------------------
.../main/java/com/datatorrent/stram/cli/ApexCli.java | 6 +++---
.../java/com/datatorrent/stram/cli/ApexCliTest.java | 14 ++++++++++++++
2 files changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------