Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/main/java/com/beust/jcommander/JCommander.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

import com.beust.jcommander.parser.DefaultParameterizedParser;
import com.beust.jcommander.FuzzyMap.IKey;
import com.beust.jcommander.StringKey;
import com.beust.jcommander.converters.*;
import com.beust.jcommander.internal.*;

Expand Down Expand Up @@ -315,7 +314,7 @@ public synchronized Console getConsole() {
*/
// declared final since this is invoked from constructors
public final void addObject(Object object) {
if (object instanceof Iterable i) {
if (object instanceof Iterable<?> i) {
// Iterable
i.forEach(objects::add);
} else if (object.getClass().isArray()) {
Expand Down Expand Up @@ -1016,7 +1015,7 @@ private void initMainParameterValue(String arg) {

// If it's a List<String>, we might need to create that list and then add the value to it.
if (List.class.isAssignableFrom(type)) {
List result;
List<Object> result;
if (object == null) {
result = Lists.newArrayList();
} else {
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/beust/jcommander/Strings.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.beust.jcommander;

import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;

public class Strings {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ public void appendAllParametersDetails(StringBuilder out, int indentCount, Strin
Class<?> type = pd.getParameterized().getType();

if (type.isEnum()) {
@SuppressWarnings("unchecked")
String valueList = EnumSet.allOf((Class<? extends Enum>) type).toString();

// Prevent duplicate values list, since it is set as 'Options: [values]' if the description
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/beust/jcommander/WrappedParameter.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ public class WrappedParameter {
private Parameter parameter;
private DynamicParameter dynamicParameter;

public WrappedParameter(Parameter p) {
parameter = p;
public WrappedParameter(Parameter parameter) {
this.parameter = parameter;
}

public WrappedParameter(DynamicParameter p) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Set;

public class DefaultProviderTest {
Expand Down
5 changes: 4 additions & 1 deletion src/test/java/com/beust/jcommander/MethodSetterTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,18 @@ class ArgsArityStringSetter {
public void setPairs(List<String> pairs) {
this.pairs = pairs;
}

public List<String> getPairs() {
return this.pairs;
}

public List<String> pairs;

@Parameter(description = "Rest")
public void setRest(List<String> rest) {
this.rest = rest;
}

public List<String> rest;
}
ArgsArityStringSetter args = new ArgsArityStringSetter();
Expand All @@ -49,7 +52,7 @@ public void setHost(String host) {
boolean passed = false;
try {
JCommander.newBuilder().addObject(new Arg()).build().parse("--host", "host");
} catch(ParameterException ex) {
} catch (ParameterException ex) {
Assert.assertEquals(ex.getCause(), null);
passed = true;
}
Expand Down
Loading