Repository: logging-log4j2 Updated Branches: refs/heads/master fef375e89 -> f5a4130e6
Add missing '@Override' annotations. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f5a4130e Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f5a4130e Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f5a4130e Branch: refs/heads/master Commit: f5a4130e6af2dd3ab5a13e63d8fe1bb471cab148 Parents: fef375e Author: Gary Gregory <[email protected]> Authored: Thu Jan 4 12:24:20 2018 -0700 Committer: Gary Gregory <[email protected]> Committed: Thu Jan 4 12:24:20 2018 -0700 ---------------------------------------------------------------------- .../java/org/apache/log4j/AppenderSkeleton.java | 12 +++++ .../logging/log4j/util/ProviderUtilTest.java | 1 + .../logging/log4j/core/layout/JsonLayout.java | 2 + .../log4j/core/tools/picocli/CommandLine.java | 51 ++++++++++++++++++++ .../log4j/core/async/QueueFullAbstractTest.java | 1 + .../core/tools/picocli/CommandLineTest.java | 37 +++++++++++--- .../core/tools/picocli/CustomLayoutDemo.java | 1 + .../logging/log4j/core/tools/picocli/Demo.java | 1 + 8 files changed, 98 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f5a4130e/log4j-1.2-api/src/main/java/org/apache/log4j/AppenderSkeleton.java ---------------------------------------------------------------------- diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/AppenderSkeleton.java b/log4j-1.2-api/src/main/java/org/apache/log4j/AppenderSkeleton.java index 340c23c..a4c5231 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/AppenderSkeleton.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/AppenderSkeleton.java @@ -51,9 +51,11 @@ public abstract class AppenderSkeleton implements Appender, OptionHandler { super(); } + @Override public void activateOptions() { } + @Override public void addFilter(Filter newFilter) { if(headFilter == null) { headFilter = tailFilter = newFilter; @@ -65,17 +67,21 @@ public abstract class AppenderSkeleton implements Appender, OptionHandler { protected abstract void append(LoggingEvent event); + @Override public void clearFilters() { headFilter = tailFilter = null; } + @Override public void finalize() { } + @Override public ErrorHandler getErrorHandler() { return this.errorHandler; } + @Override public Filter getFilter() { return headFilter; } @@ -84,10 +90,12 @@ public abstract class AppenderSkeleton implements Appender, OptionHandler { return headFilter; } + @Override public Layout getLayout() { return layout; } + @Override public final String getName() { return this.name; } @@ -104,6 +112,7 @@ public abstract class AppenderSkeleton implements Appender, OptionHandler { * This method is never going to be called in Log4j 2 so there isn't much point in having any code in it. * @param event The LoggingEvent. */ + @Override public void doAppend(LoggingEvent event) { } @@ -112,16 +121,19 @@ public abstract class AppenderSkeleton implements Appender, OptionHandler { * * @since 0.9.0 */ + @Override public synchronized void setErrorHandler(ErrorHandler eh) { if (eh != null) { this.errorHandler = eh; } } + @Override public void setLayout(Layout layout) { this.layout = layout; } + @Override public void setName(String name) { this.name = name; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f5a4130e/log4j-api/src/test/java/org/apache/logging/log4j/util/ProviderUtilTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/ProviderUtilTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/ProviderUtilTest.java index 60a0f53..ce4236a 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/util/ProviderUtilTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/ProviderUtilTest.java @@ -43,6 +43,7 @@ public class ProviderUtilTest { private class Worker extends Thread { LoggerContext context = null; + @Override public void run() { context = LogManager.getContext(false); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f5a4130e/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java index 6a576c0..e604468 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java @@ -108,10 +108,12 @@ public final class JsonLayout extends AbstractJacksonLayout { return asBuilder(); } + @Override public KeyValuePair[] getAdditionalFields() { return additionalFields; } + @Override public B setAdditionalFields(KeyValuePair[] additionalFields) { this.additionalFields = additionalFields; return asBuilder(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f5a4130e/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java index b8a19ab..f73b2aa 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java @@ -481,6 +481,7 @@ public class CommandLine { * @throws ExecutionException if a problem occurred while processing the parse results; use * {@link ExecutionException#getCommandLine()} to get the command or subcommand where processing failed */ + @Override public List<Object> handleParseResult(List<CommandLine> parsedCommands, PrintStream out, Help.Ansi ansi) { if (printHelpIfRequested(parsedCommands, out, ansi)) { return Collections.emptyList(); } return Arrays.asList(execute(parsedCommands.get(0))); @@ -531,6 +532,7 @@ public class CommandLine { * @throws ExecutionException if a problem occurred while processing the parse results; use * {@link ExecutionException#getCommandLine()} to get the command or subcommand where processing failed */ + @Override public List<Object> handleParseResult(List<CommandLine> parsedCommands, PrintStream out, Help.Ansi ansi) { if (printHelpIfRequested(parsedCommands, out, ansi)) { return Collections.emptyList(); } CommandLine last = parsedCommands.get(parsedCommands.size() - 1); @@ -556,6 +558,7 @@ public class CommandLine { * @throws ExecutionException if a problem occurred while processing the parse results; use * {@link ExecutionException#getCommandLine()} to get the command or subcommand where processing failed */ + @Override public List<Object> handleParseResult(List<CommandLine> parsedCommands, PrintStream out, Help.Ansi ansi) { if (printHelpIfRequested(parsedCommands, out, ansi)) { return null; @@ -1773,17 +1776,21 @@ public class CommandLine { */ public boolean contains(int value) { return min <= value && max >= value; } + @Override public boolean equals(Object object) { if (!(object instanceof Range)) { return false; } Range other = (Range) object; return other.max == this.max && other.min == this.min && other.isVariable == this.isVariable; } + @Override public int hashCode() { return ((17 * 37 + max) * 37 + min) * 37 + (isVariable ? 1 : 0); } + @Override public String toString() { return min == max ? String.valueOf(min) : min + ".." + (isVariable ? "*" : max); } + @Override public int compareTo(Range other) { int result = min - other.min; return (result == 0) ? max - other.max : result; @@ -2565,6 +2572,7 @@ public class CommandLine { } if (type.isEnum()) { return new ITypeConverter<Object>() { + @Override @SuppressWarnings("unchecked") public Object convert(String value) throws Exception { return Enum.valueOf((Class<Enum>) type, value); @@ -2624,6 +2632,7 @@ public class CommandLine { } } private static class PositionalParametersSorter implements Comparator<Field> { + @Override public int compare(Field o1, Field o2) { int result = Range.parameterIndex(o1).compareTo(Range.parameterIndex(o2)); return (result == 0) ? Range.parameterArity(o1).compareTo(Range.parameterArity(o2)) : result; @@ -2637,20 +2646,25 @@ public class CommandLine { @Override public Path convert(final String value) { return Paths.get(value); } } static class StringConverter implements ITypeConverter<String> { + @Override public String convert(String value) { return value; } } static class StringBuilderConverter implements ITypeConverter<StringBuilder> { + @Override public StringBuilder convert(String value) { return new StringBuilder(value); } } static class CharSequenceConverter implements ITypeConverter<CharSequence> { + @Override public String convert(String value) { return value; } } /** Converts text to a {@code Byte} by delegating to {@link Byte#valueOf(String)}.*/ static class ByteConverter implements ITypeConverter<Byte> { + @Override public Byte convert(String value) { return Byte.valueOf(value); } } /** Converts {@code "true"} or {@code "false"} to a {@code Boolean}. Other values result in a ParameterException.*/ static class BooleanConverter implements ITypeConverter<Boolean> { + @Override public Boolean convert(String value) { if ("true".equalsIgnoreCase(value) || "false".equalsIgnoreCase(value)) { return Boolean.parseBoolean(value); @@ -2660,6 +2674,7 @@ public class CommandLine { } } static class CharacterConverter implements ITypeConverter<Character> { + @Override public Character convert(String value) { if (value.length() > 1) { throw new TypeConversionException("'" + value + "' is not a single character"); @@ -2669,33 +2684,42 @@ public class CommandLine { } /** Converts text to a {@code Short} by delegating to {@link Short#valueOf(String)}.*/ static class ShortConverter implements ITypeConverter<Short> { + @Override public Short convert(String value) { return Short.valueOf(value); } } /** Converts text to an {@code Integer} by delegating to {@link Integer#valueOf(String)}.*/ static class IntegerConverter implements ITypeConverter<Integer> { + @Override public Integer convert(String value) { return Integer.valueOf(value); } } /** Converts text to a {@code Long} by delegating to {@link Long#valueOf(String)}.*/ static class LongConverter implements ITypeConverter<Long> { + @Override public Long convert(String value) { return Long.valueOf(value); } } static class FloatConverter implements ITypeConverter<Float> { + @Override public Float convert(String value) { return Float.valueOf(value); } } static class DoubleConverter implements ITypeConverter<Double> { + @Override public Double convert(String value) { return Double.valueOf(value); } } static class FileConverter implements ITypeConverter<File> { + @Override public File convert(String value) { return new File(value); } } static class URLConverter implements ITypeConverter<URL> { + @Override public URL convert(String value) throws MalformedURLException { return new URL(value); } } static class URIConverter implements ITypeConverter<URI> { + @Override public URI convert(String value) throws URISyntaxException { return new URI(value); } } /** Converts text in {@code yyyy-mm-dd} format to a {@code java.util.Date}. ParameterException on failure. */ static class ISO8601DateConverter implements ITypeConverter<Date> { + @Override public Date convert(String value) { try { return new SimpleDateFormat("yyyy-MM-dd").parse(value); @@ -2707,6 +2731,7 @@ public class CommandLine { /** Converts text in any of the following formats to a {@code java.sql.Time}: {@code HH:mm}, {@code HH:mm:ss}, * {@code HH:mm:ss.SSS}, {@code HH:mm:ss,SSS}. Other formats result in a ParameterException. */ static class ISO8601TimeConverter implements ITypeConverter<Time> { + @Override public Time convert(String value) { try { if (value.length() <= 5) { @@ -2727,22 +2752,28 @@ public class CommandLine { } } static class BigDecimalConverter implements ITypeConverter<BigDecimal> { + @Override public BigDecimal convert(String value) { return new BigDecimal(value); } } static class BigIntegerConverter implements ITypeConverter<BigInteger> { + @Override public BigInteger convert(String value) { return new BigInteger(value); } } static class CharsetConverter implements ITypeConverter<Charset> { + @Override public Charset convert(String s) { return Charset.forName(s); } } /** Converts text to a {@code InetAddress} by delegating to {@link InetAddress#getByName(String)}. */ static class InetAddressConverter implements ITypeConverter<InetAddress> { + @Override public InetAddress convert(String s) throws Exception { return InetAddress.getByName(s); } } static class PatternConverter implements ITypeConverter<Pattern> { + @Override public Pattern convert(String s) { return Pattern.compile(s); } } static class UUIDConverter implements ITypeConverter<UUID> { + @Override public UUID convert(String s) throws Exception { return UUID.fromString(s); } } private BuiltIn() {} // private constructor: never instantiate @@ -3386,10 +3417,12 @@ public class CommandLine { * @return a new minimal ParamLabelRenderer */ public static IParamLabelRenderer createMinimalParamLabelRenderer() { return new IParamLabelRenderer() { + @Override public Text renderParameterLabel(Field field, Ansi ansi, List<IStyle> styles) { String text = DefaultParamLabelRenderer.renderParameterName(field); return ansi.apply(text, styles); } + @Override public String separator() { return ""; } }; } @@ -3458,6 +3491,7 @@ public class CommandLine { public Object command; private String sep; private boolean showDefault; + @Override public Text[][] render(Option option, Field field, IParamLabelRenderer paramLabelRenderer, ColorScheme scheme) { String[] names = ShortestFirst.sort(option.names()); int shortOptionCount = names[0].length() == 2 ? 1 : 0; @@ -3545,6 +3579,7 @@ public class CommandLine { /** The MinimalOptionRenderer converts {@link Option Options} to a single row with two columns of text: an * option name and a description. If multiple names or description lines exist, the first value is used. */ static class MinimalOptionRenderer implements IOptionRenderer { + @Override public Text[][] render(Option option, Field field, IParamLabelRenderer parameterLabelRenderer, ColorScheme scheme) { Text optionText = scheme.optionText(option.names()[0]); Text paramLabelText = parameterLabelRenderer.renderParameterLabel(field, scheme.ansi(), scheme.optionParamStyles); @@ -3556,6 +3591,7 @@ public class CommandLine { /** The MinimalParameterRenderer converts {@link Parameters Parameters} to a single row with two columns of * text: the parameters label and a description. If multiple description lines exist, the first value is used. */ static class MinimalParameterRenderer implements IParameterRenderer { + @Override public Text[][] render(Parameters param, Field field, IParamLabelRenderer parameterLabelRenderer, ColorScheme scheme) { return new Text[][] {{ parameterLabelRenderer.renderParameterLabel(field, scheme.ansi(), scheme.parameterStyles), scheme.ansi().new Text(param.description().length == 0 ? "" : param.description()[0]) }}; @@ -3590,6 +3626,7 @@ public class CommandLine { */ static class DefaultParameterRenderer implements IParameterRenderer { public String requiredMarker = " "; + @Override public Text[][] render(Parameters params, Field field, IParamLabelRenderer paramLabelRenderer, ColorScheme scheme) { Text label = paramLabelRenderer.renderParameterLabel(field, scheme.ansi(), scheme.parameterStyles); Text requiredParameter = scheme.parameterText(Range.parameterArity(field).min > 0 ? requiredMarker : ""); @@ -3640,7 +3677,9 @@ public class CommandLine { public DefaultParamLabelRenderer(String separator) { this.separator = Assert.notNull(separator, "separator"); } + @Override public String separator() { return separator; } + @Override public Text renderParameterLabel(Field field, Ansi ansi, List<IStyle> styles) { boolean isOptionParameter = field.isAnnotationPresent(Option.class); Range arity = isOptionParameter ? Range.optionArity(field) : Range.parameterCapacity(field); @@ -3799,6 +3838,7 @@ public class CommandLine { } /** Sorts short strings before longer strings. */ static class ShortestFirst implements Comparator<String> { + @Override public int compare(String o1, String o2) { return o1.length() - o2.length(); } @@ -3811,6 +3851,7 @@ public class CommandLine { /** Sorts {@code Option} instances by their name in case-insensitive alphabetic order. If an Option has * multiple names, the shortest name is used for the sorting. Help options follow non-help options. */ static class SortByShortestOptionNameAlphabetically implements Comparator<Field> { + @Override public int compare(Field f1, Field f2) { Option o1 = f1.getAnnotation(Option.class); Option o2 = f2.getAnnotation(Option.class); @@ -3824,6 +3865,7 @@ public class CommandLine { } /** Sorts {@code Option} instances by their max arity first, then their min arity, then delegates to super class. */ static class SortByOptionArityAndNameAlphabetically extends SortByShortestOptionNameAlphabetically { + @Override public int compare(Field f1, Field f2) { Option o1 = f1.getAnnotation(Option.class); Option o2 = f2.getAnnotation(Option.class); @@ -4077,6 +4119,7 @@ public class CommandLine { //if (Ansi.enabled()) { text.append(Style.reset.off()); } return text; } + @Override public String toString() { return toString(new StringBuilder()).toString(); } } /** Columns define the width, indent (leading number of spaces in a column before the value) and @@ -4262,7 +4305,9 @@ public class CommandLine { private final int endCode; Style(int startCode, int endCode) {this.startCode = startCode; this.endCode = endCode; } + @Override public String on() { return CSI + startCode + "m"; } + @Override public String off() { return CSI + endCode + "m"; } /** Returns the concatenated ANSI escape codes for turning all specified styles on. @@ -4348,7 +4393,9 @@ public class CommandLine { this.color = Integer.decode(color); } } + @Override public String on() { return String.format(CSI + "%d;5;%dm", fgbg, color); } + @Override public String off() { return CSI + (fgbg + 1) + "m"; } } private static class StyledSection { @@ -4454,6 +4501,7 @@ public class CommandLine { private void addStyledSection(int start, int length, String startStyle, String endStyle) { sections.add(new StyledSection(start, length, startStyle, endStyle)); } + @Override public Object clone() { try { return super.clone(); } catch (CloneNotSupportedException e) { throw new IllegalStateException(e); } } @@ -4547,12 +4595,15 @@ public class CommandLine { * @return the plain text without any formatting */ public String plainString() { return plain.toString().substring(from, from + length); } + @Override public boolean equals(Object obj) { return toString().equals(String.valueOf(obj)); } + @Override public int hashCode() { return toString().hashCode(); } /** Returns a String representation of the text with ANSI escape codes embedded, unless ANSI is * {@linkplain Ansi#enabled()} not enabled}, in which case the plain text is returned. * @return a String representation of the text with ANSI escape codes embedded (if enabled) */ + @Override public String toString() { if (!Ansi.this.enabled()) { return plain.toString().substring(from, from + length); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f5a4130e/log4j-core/src/test/java/org/apache/logging/log4j/core/async/QueueFullAbstractTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/QueueFullAbstractTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/QueueFullAbstractTest.java index 3666903..d0542dc 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/QueueFullAbstractTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/QueueFullAbstractTest.java @@ -51,6 +51,7 @@ public abstract class QueueFullAbstractTest { Unlocker(CountDownLatch countDownLatch) { this.countDownLatch = countDownLatch; } + @Override public void run() { try { countDownLatch.await(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f5a4130e/log4j-core/src/test/java/org/apache/logging/log4j/core/tools/picocli/CommandLineTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/tools/picocli/CommandLineTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/tools/picocli/CommandLineTest.java index 561ce73..118a59f 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/tools/picocli/CommandLineTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/tools/picocli/CommandLineTest.java @@ -245,6 +245,7 @@ public class CommandLineTest { SupportedTypes bean = new SupportedTypes(); CommandLine commandLine = new CommandLine(bean); ITypeConverter<Byte> converter = new ITypeConverter<Byte>() { + @Override public Byte convert(String s) { return Byte.decode(s); } @@ -278,6 +279,7 @@ public class CommandLineTest { SupportedTypes bean = new SupportedTypes(); CommandLine commandLine = new CommandLine(bean); ITypeConverter<Short> shortConverter = new ITypeConverter<Short>() { + @Override public Short convert(String s) { return Short.decode(s); } @@ -311,6 +313,7 @@ public class CommandLineTest { SupportedTypes bean = new SupportedTypes(); CommandLine commandLine = new CommandLine(bean); ITypeConverter<Integer> intConverter = new ITypeConverter<Integer>() { + @Override public Integer convert(String s) { return Integer.decode(s); } @@ -344,6 +347,7 @@ public class CommandLineTest { SupportedTypes bean = new SupportedTypes(); CommandLine commandLine = new CommandLine(bean); ITypeConverter<Long> longConverter = new ITypeConverter<Long>() { + @Override public Long convert(String s) { return Long.decode(s); } @@ -508,6 +512,7 @@ public class CommandLineTest { @Parameters Glob globField; } class GlobConverter implements ITypeConverter<Glob> { + @Override public Glob convert(String value) throws Exception { return new Glob(value); } } CommandLine commandLine = new CommandLine(new App()); @@ -2063,22 +2068,31 @@ public class CommandLineTest { assertTrue("cmd2", commandMap.get("cmd2").getCommand() instanceof Command2); } - static class MainCommand { @Option(names = "-a") boolean a; public boolean equals(Object o) { return getClass().equals(o.getClass()); }} - static class ChildCommand1 { @Option(names = "-b") boolean b; public boolean equals(Object o) { return getClass().equals(o.getClass()); }} - static class ChildCommand2 { @Option(names = "-c") boolean c; public boolean equals(Object o) { return getClass().equals(o.getClass()); }} - static class GrandChild1Command1 { @Option(names = "-d") boolean d; public boolean equals(Object o) { return getClass().equals(o.getClass()); }} - static class GrandChild1Command2 { @Option(names = "-e") CustomType e; public boolean equals(Object o) { return getClass().equals(o.getClass()); }} - static class GrandChild2Command1 { @Option(names = "-f") boolean f; public boolean equals(Object o) { return getClass().equals(o.getClass()); }} - static class GrandChild2Command2 { @Option(names = "-g") boolean g; public boolean equals(Object o) { return getClass().equals(o.getClass()); }} + static class MainCommand { @Option(names = "-a") boolean a; @Override + public boolean equals(Object o) { return getClass().equals(o.getClass()); }} + static class ChildCommand1 { @Option(names = "-b") boolean b; @Override + public boolean equals(Object o) { return getClass().equals(o.getClass()); }} + static class ChildCommand2 { @Option(names = "-c") boolean c; @Override + public boolean equals(Object o) { return getClass().equals(o.getClass()); }} + static class GrandChild1Command1 { @Option(names = "-d") boolean d; @Override + public boolean equals(Object o) { return getClass().equals(o.getClass()); }} + static class GrandChild1Command2 { @Option(names = "-e") CustomType e; @Override + public boolean equals(Object o) { return getClass().equals(o.getClass()); }} + static class GrandChild2Command1 { @Option(names = "-f") boolean f; @Override + public boolean equals(Object o) { return getClass().equals(o.getClass()); }} + static class GrandChild2Command2 { @Option(names = "-g") boolean g; @Override + public boolean equals(Object o) { return getClass().equals(o.getClass()); }} static class GreatGrandChild2Command2_1 { @Option(names = "-h") boolean h; @Option(names = {"-t", "--type"}) CustomType customType; + @Override public boolean equals(Object o) { return getClass().equals(o.getClass()); } } static class CustomType implements ITypeConverter<CustomType> { private final String val; private CustomType(String val) { this.val = val; } + @Override public CustomType convert(String value) { return new CustomType(value); } } private static CommandLine createNestedCommand() { @@ -2238,7 +2252,8 @@ public class CommandLineTest { @Test public void testCustomTypeConverterRegisteredAfterSubcommandsAdded() { - @Command class TopLevel { public boolean equals(Object o) {return getClass().equals(o.getClass());}} + @Command class TopLevel { @Override + public boolean equals(Object o) {return getClass().equals(o.getClass());}} CommandLine commandLine = new CommandLine(new TopLevel()); commandLine.addSubcommand("main", createNestedCommand()); commandLine.registerConverter(CustomType.class, new CustomType(null)); @@ -2254,6 +2269,7 @@ public class CommandLineTest { public void testRunCallsRunnableIfParseSucceeds() { final boolean[] runWasCalled = {false}; @Command class App implements Runnable { + @Override public void run() { runWasCalled[0] = true; } @@ -2267,6 +2283,7 @@ public class CommandLineTest { final boolean[] runWasCalled = {false}; class App implements Runnable { @Option(names = "-number") int number; + @Override public void run() { runWasCalled[0] = true; } @@ -2288,6 +2305,7 @@ public class CommandLineTest { @Test(expected = InitializationException.class) public void testRunRequiresAnnotatedCommand() { class App implements Runnable { + @Override public void run() { } } CommandLine.run(new App(), System.err); @@ -2296,6 +2314,7 @@ public class CommandLineTest { @Test public void testCallReturnsCallableResultParseSucceeds() throws Exception { @Command class App implements Callable<Boolean> { + @Override public Boolean call() { return true; } } assertTrue(CommandLine.call(new App(), System.err)); @@ -2305,6 +2324,7 @@ public class CommandLineTest { public void testCallReturnsNullAndPrintsErrorIfParseFails() throws Exception { class App implements Callable<Boolean> { @Option(names = "-number") int number; + @Override public Boolean call() { return true; } } PrintStream oldErr = System.err; @@ -2324,6 +2344,7 @@ public class CommandLineTest { @Test(expected = InitializationException.class) public void testCallRequiresAnnotatedCommand() throws Exception { class App implements Callable<Object> { + @Override public Object call() { return null; } } CommandLine.call(new App(), System.err); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f5a4130e/log4j-core/src/test/java/org/apache/logging/log4j/core/tools/picocli/CustomLayoutDemo.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/tools/picocli/CustomLayoutDemo.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/tools/picocli/CustomLayoutDemo.java index fe87b97..b0c505a 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/tools/picocli/CustomLayoutDemo.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/tools/picocli/CustomLayoutDemo.java @@ -51,6 +51,7 @@ public class CustomLayoutDemo implements Runnable { @Option(names = {"-n", "--netstat"}, description = "Show usage help for a layout with a narrow options column and a wide description column. Descriptions that wrap to the next row are not indented.") private boolean showNetstat; + @Override public void run() { if (!showZip && !showNetstat) { CommandLine.usage(this, System.err); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f5a4130e/log4j-core/src/test/java/org/apache/logging/log4j/core/tools/picocli/Demo.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/tools/picocli/Demo.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/tools/picocli/Demo.java index 73caa9d..084443f 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/tools/picocli/Demo.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/tools/picocli/Demo.java @@ -176,6 +176,7 @@ public class Demo implements Runnable { @Option(names = {"-t", "--tests"}, description = "Runs all tests in this class") private boolean runTests; + @Override public void run() { if (!runTests && !showSimpleExample &&
