8000 implemented the parser factory, added new unit tests for the GnuParse… · OSS-Security-Assessments/apache__commons-cli@66d0ae6 · GitHub
Skip to content
< 8000 link rel="preload" as="image" href="https://github.githubassets.com/images/gravatars/gravatar-user-420.png?size=40"/>

Commit 66d0ae6

Browse files
author
John Keyes
committed
implemented the parser factory, added new unit tests for the GnuParser, a good deal of refactoring for both parsers
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/cli/trunk@129778 13f79535-47bb-0310-9956-ffa450edef68
1 parent bb7fb06 commit 66d0ae6

14 files changed

Lines changed: 814 additions & 624 deletions

‎src/java/org/apache/commons/cli/CommandLineParser.java‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
2-
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//cli/src/java/org/apache/commons/cli/CommandLineParser.java,v 1.1 2002/06/16 23:00:57 jkeyes Exp $
3-
* $Revision: 1.1 $
4-
* $Date: 2002/06/16 23:00:57 $
2+
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//cli/src/java/org/apache/commons/cli/CommandLineParser.java,v 1.2 2002/07/04 22:32:12 jkeyes Exp $
3+
* $Revision: 1.2 $
4+
* $Date: 2002/07/04 22:32:12 $
55
*
66
* ====================================================================
77
*
@@ -60,28 +60,34 @@
6060
*/
6161
package org.apache.commons.cli;
6262

63-
import java.util.List;
64-
6563
/**
6664
* @author John Keyes (jbjk at mac.com)
6765
*/
6866
public interface CommandLineParser {
6967

7068
/**
7169
* Parse the arguments according to the specified options.
70+
*
7271
* @param options the specified Options
7372
* @param arguments the command line arguments
7473
* @return the list of atomic option and value tokens
74+
* @throws ParseException if there are any problems encountered
75+
* while parsing the command line tokens.
7576
*/
76-
public List parse( Options options, List arguments );
77-
77+
public CommandLine parse( Options options, String[] arguments )
78+
throws ParseException;
79+
7880
/**
7981
* Parse the arguments according to the specified options.
82+
*
8083
* @param options the specified Options
8184
* @param arguments the command line arguments
8285
* @param stopAtNonOption specifies whether to continue parsing the
8386
* arguments if a non option is encountered.
8487
* @return the list of atomic option and value tokens
88+
* @throws ParseException if there are any problems encountered
89+
* while parsing the command line tokens.
8590
*/
86-
public List parse( Options options, List arguments, boolean stopAtNonOption );
91+
public CommandLine parse( Options options, String[] arguments, boolean stopAtNonOption )
92+
throws ParseException;
8793
}

‎src/java/org/apache/commons/cli/CommandLineParserFactory.java‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
/*
2+
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//cli/src/java/org/apache/commons/cli/Attic/CommandLineParserFactory.java,v 1.1 2002/07/04 22:32:12 jkeyes Exp $
3+
* $Revision: 1.1 $
4+
* $Date: 2002/07/04 22:32:12 $
5+
*
6+
* ====================================================================
7+
*
8+
* The Apache Software License, Version 1.1
9+
*
10+
* Copyright (c) 1999-2001 The Apache Software Foundation. All rights
11+
* reserved.
12+
*
13+
* Redistribution and use in source and binary forms, with or without
14+
* modification, are permitted provided that the following conditions
15+
* are met:
16+
*
17+
* 1. Redistributions of source code must retain the above copyright
18+
* notice, this list of conditions and the following disclaimer.
19+
*
20+
* 2. Redistributions in binary form must reproduce the above copyright
21+
* notice, this list of conditions and the following disclaimer in
22+
* the documentation and/or other materials provided with the
23+
* distribution.
24+
*
25+
* 3. The end-user documentation included with the redistribution, if
26+
* any, must include the following acknowlegement:
27+
* "This product includes software developed by the
28+
* Apache Software Foundation (http://www.apache.org/)."
29+
* Alternately, this acknowlegement may appear in the software itself,
30+
* if and wherever such third-party acknowlegements normally appear.
31+
*
32+
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
33+
* Foundation" must not be used to endorse or promote products derived
34+
* from this software without prior written permission. For written
35+
* permission, please contact apache@apache.org.
36+
*
37+
* 5. Products derived from this software may not be called "Apache"
38+
* nor may "Apache" appear in their names without prior written
39+
* permission of the Apache Group.
40+
*
41+
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
42+
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
43+
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
44+
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
45+
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
46+
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
47+
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
48+
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
49+
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
50+
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
51+
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
52+
* SUCH DAMAGE.
53+
* ====================================================================
54+
*
55+
* This software consists of voluntary contributions made by many
56+
* individuals on behalf of the Apache Software Foundation. For more
57+
* information on the Apache Software Foundation, please see
58+
* <http://www.apache.org/>.
59+
*
60+
*/
61+
package org.apache.commons.cli;
62+
63+
/**
64+
* Constructs CommandLineParser instances. The implementation class
65+
* is specified by the <code>org.apache.commons.cli.parser</code>
66+
* system property.
67+
*
68+
* @author John Keyes (jbjk at mac.com)
69+
*/
70+
public class CommandLineParserFactory {
71+
72+
/** The PosixParser is the default parser implementation */
73+
private static String DEFAULT_PARSER = "org.apache.commons.cli.PosixParser";
74+
75+
/**
76+
* @return the CommandLineParser
77+
*/
78+
public static CommandLineParser newParser() {
79+
String parserImpl = System.getProperty( "org.apache.commons.cli.parser" );
80+
try {
81+
return (CommandLineParser)Class.forName( parserImpl ).newInstance();
82+
}
83+
catch( Exception exp ) {
84+
// could not create according to parserImpl so default to
85+
// PosixParser
86+
try {
87+
return (CommandLineParser)Class.forName( DEFAULT_PARSER ).newInstance();
88+
}
89+
catch( Exception exp2 ) {
90+
// this will not happen ?
91+
}
92+
}
93+
return null;
94+
}
95+
}

0 commit comments

Comments
 (0)