Author: chetanm
Date: Mon May 15 08:35:32 2017
New Revision: 1795148
URL: http://svn.apache.org/viewvc?rev=1795148&view=rev
Log:
OAK-6210 - Provide a consistent and extensible way to handle oak-run options
while creating NodeStore
Rely on Options to implicitly handle the help and validation
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/console/Console.java
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/console/Console.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/console/Console.java?rev=1795148&r1=1795147&r2=1795148&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/console/Console.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/console/Console.java
Mon May 15 08:35:32 2017
@@ -43,21 +43,12 @@ public class Console {
Options opts = new Options();
OptionSet options = opts.parseAndConfigure(parser, args);
- if (opts.getCommonOpts().isHelpRequested()) {
- parser.printHelpOn(System.out);
- System.exit(0);
- }
-
- List<String> nonOptions = opts.getCommonOpts().getNonOptions();
- if (nonOptions.isEmpty()) {
- parser.printHelpOn(System.err);
- System.exit(1);
- }
NodeStoreFixture fixture = NodeStoreFixtureProvider.create(opts);
+ List<String> nonOptions = opts.getCommonOpts().getNonOptions();
List<String> scriptArgs = nonOptions.size() > 1 ?
- opts.getCommonOpts().getNonOptions().subList(1,
nonOptions.size()) : Collections.<String>emptyList();
+ nonOptions.subList(1, nonOptions.size()) :
Collections.emptyList();
IO io = new IO();
if(options.has(quiet)){
