You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2020/05/24 15:49:08 UTC
[commons-cli] branch master updated: Use final.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-cli.git
The following commit(s) were added to refs/heads/master by this push:
new bf19d99 Use final.
bf19d99 is described below
commit bf19d994c6414de253734f69a769e419758e43b0
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun May 24 11:49:03 2020 -0400
Use final.
---
src/main/java/org/apache/commons/cli/DefaultParser.java | 6 +++---
src/main/java/org/apache/commons/cli/TypeHandler.java | 2 +-
.../org/apache/commons/cli/DisablePartialMatchingTest.java | 4 ++--
src/test/java/org/apache/commons/cli/TypeHandlerTest.java | 12 ++++++------
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/apache/commons/cli/DefaultParser.java b/src/main/java/org/apache/commons/cli/DefaultParser.java
index eb34bf8..d5c3ed7 100644
--- a/src/main/java/org/apache/commons/cli/DefaultParser.java
+++ b/src/main/java/org/apache/commons/cli/DefaultParser.java
@@ -55,7 +55,7 @@ public class DefaultParser implements CommandLineParser
protected List expectedOpts;
/** Flag indicating if partial matching of long options is supported. */
- private boolean allowPartialMatching;
+ private final boolean allowPartialMatching;
/**
* Creates a new DefaultParser instance with partial matching enabled.
@@ -718,10 +718,10 @@ public class DefaultParser implements CommandLineParser
}
else
{
- List<String> matches = new ArrayList<>(1);
+ final List<String> matches = new ArrayList<>(1);
if (options.hasLongOption(token))
{
- Option option = options.getOption(token);
+ final Option option = options.getOption(token);
matches.add(option.getLongOpt());
}
diff --git a/src/main/java/org/apache/commons/cli/TypeHandler.java b/src/main/java/org/apache/commons/cli/TypeHandler.java
index 3afdc3b..ff04610 100644
--- a/src/main/java/org/apache/commons/cli/TypeHandler.java
+++ b/src/main/java/org/apache/commons/cli/TypeHandler.java
@@ -231,7 +231,7 @@ public class TypeHandler
* @return The file input stream represented by <code>str</code>.
* @throws ParseException if the file is not exist or not readable
*/
- public static FileInputStream openFile(String str) throws ParseException
+ public static FileInputStream openFile(final String str) throws ParseException
{
try
{
diff --git a/src/test/java/org/apache/commons/cli/DisablePartialMatchingTest.java b/src/test/java/org/apache/commons/cli/DisablePartialMatchingTest.java
index b9cb79e..8aa6b88 100644
--- a/src/test/java/org/apache/commons/cli/DisablePartialMatchingTest.java
+++ b/src/test/java/org/apache/commons/cli/DisablePartialMatchingTest.java
@@ -27,7 +27,7 @@ public class DisablePartialMatchingTest
@Test
public void testDisablePartialMatching() throws Exception
{
- CommandLineParser parser = new DefaultParser(false);
+ final CommandLineParser parser = new DefaultParser(false);
final Options options = new Options();
@@ -35,7 +35,7 @@ public class DisablePartialMatchingTest
options.addOption(new Option("e", "extract", false, "Turn on extract."));
options.addOption(new Option("o", "option", true, "Turn on option with argument."));
- CommandLine line = parser.parse(options, new String[]{"-de", "--option=foobar"});
+ final CommandLine line = parser.parse(options, new String[]{"-de", "--option=foobar"});
assertTrue("There should be an option debug in any case...", line.hasOption("debug"));
assertTrue("There should be an extract option because partial matching is off", line.hasOption("extract"));
diff --git a/src/test/java/org/apache/commons/cli/TypeHandlerTest.java b/src/test/java/org/apache/commons/cli/TypeHandlerTest.java
index c7c9cb9..0d3639a 100644
--- a/src/test/java/org/apache/commons/cli/TypeHandlerTest.java
+++ b/src/test/java/org/apache/commons/cli/TypeHandlerTest.java
@@ -55,7 +55,7 @@ public class TypeHandlerTest
public void testCreateValueObject_InstantiableClass()
throws Exception
{
- Object result = TypeHandler.createValue(Instantiable.class.getName(), PatternOptionBuilder.OBJECT_VALUE);
+ final Object result = TypeHandler.createValue(Instantiable.class.getName(), PatternOptionBuilder.OBJECT_VALUE);
assertTrue(result instanceof Instantiable);
}
@@ -98,7 +98,7 @@ public class TypeHandlerTest
public void testCreateValueClass()
throws Exception
{
- Object clazz = TypeHandler.createValue(Instantiable.class.getName(), PatternOptionBuilder.CLASS_VALUE);
+ final Object clazz = TypeHandler.createValue(Instantiable.class.getName(), PatternOptionBuilder.CLASS_VALUE);
assertEquals(Instantiable.class, clazz);
}
@@ -106,7 +106,7 @@ public class TypeHandlerTest
public void testCreateValueFile()
throws Exception
{
- File result = TypeHandler.createValue("some-file.txt", PatternOptionBuilder.FILE_VALUE);
+ final File result = TypeHandler.createValue("some-file.txt", PatternOptionBuilder.FILE_VALUE);
assertEquals("some-file.txt", result.getName());
}
@@ -114,7 +114,7 @@ public class TypeHandlerTest
public void testCreateValueExistingFile()
throws Exception
{
- FileInputStream result = TypeHandler.createValue("src/test/resources/org/apache/commons/cli/existing-readable.file", PatternOptionBuilder.EXISTING_FILE_VALUE);
+ final FileInputStream result = TypeHandler.createValue("src/test/resources/org/apache/commons/cli/existing-readable.file", PatternOptionBuilder.EXISTING_FILE_VALUE);
assertNotNull(result);
}
@@ -136,8 +136,8 @@ public class TypeHandlerTest
public void testCreateValueURL()
throws Exception
{
- String urlString = "https://commons.apache.org";
- URL result = TypeHandler.createValue(urlString, PatternOptionBuilder.URL_VALUE);
+ final String urlString = "https://commons.apache.org";
+ final URL result = TypeHandler.createValue(urlString, PatternOptionBuilder.URL_VALUE);
assertEquals(urlString, result.toString());
}