From 7eebe9c4b298a93ec1e3b91c5c9eaf1d09912f20 Mon Sep 17 00:00:00 2001
From: Piotr Findeisen <piotr.findeisen@gmail.com>
Date: Mon, 18 Nov 2019 14:23:33 +0100
Subject: [PATCH] Update to Airbase 93

---
 pom.xml                                       |  2 +-
 .../java/io/airlift/airline/Arguments.java    |  5 +++--
 src/main/java/io/airlift/airline/Cli.java     |  4 ++--
 .../io/airlift/airline/GlobalSuggester.java   |  3 +--
 .../io/airlift/airline/GroupSuggester.java    |  3 +--
 src/main/java/io/airlift/airline/Option.java  |  5 +++--
 .../java/io/airlift/airline/ParserUtil.java   |  4 +++-
 .../java/io/airlift/airline/UsageHelper.java  |  4 +++-
 .../airlift/airline/model/MetadataLoader.java |  4 +++-
 src/test/java/io/airlift/airline/Git.java     |  4 +++-
 .../java/io/airlift/airline/TestCommand.java  |  1 +
 .../airline/TestGalaxyCommandLineParser.java  | 10 +++++-----
 .../airline/TestParametersDelegate.java       |  2 --
 .../io/airlift/airline/TestSingleCommand.java |  1 +
 .../java/io/airlift/airline/TestingUtil.java  |  4 +++-
 .../java/io/airlift/airline/args/Args1.java   |  2 +-
 .../java/io/airlift/airline/args/Args2.java   |  2 +-
 .../airlift/airline/args/ArgsArityString.java |  1 -
 .../io/airlift/airline/args/ArgsDefault.java  |  2 +-
 .../io/airlift/airline/args/ArgsEnum.java     |  3 ---
 .../airlift/airline/args/ArgsSingleChar.java  | 20 +++++++++----------
 .../airlift/airline/args/CommandLineArgs.java |  1 -
 22 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6234b767f..e8c67ba0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.airlift</groupId>
         <artifactId>airbase</artifactId>
-        <version>68</version>
+        <version>93</version>
     </parent>
 
     <artifactId>airline</artifactId>
diff --git a/src/main/java/io/airlift/airline/Arguments.java b/src/main/java/io/airlift/airline/Arguments.java
index dc58b1e5b..5a388a53c 100644
--- a/src/main/java/io/airlift/airline/Arguments.java
+++ b/src/main/java/io/airlift/airline/Arguments.java
@@ -22,9 +22,10 @@
 import java.lang.annotation.Target;
 
 import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-@Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
-@Target({FIELD})
+@Retention(RUNTIME)
+@Target(FIELD)
 public @interface Arguments
 {
     /**
diff --git a/src/main/java/io/airlift/airline/Cli.java b/src/main/java/io/airlift/airline/Cli.java
index 936e9a84a..3630f729d 100644
--- a/src/main/java/io/airlift/airline/Cli.java
+++ b/src/main/java/io/airlift/airline/Cli.java
@@ -305,8 +305,8 @@ public Cli<C> build()
     public static class GroupBuilder<C>
     {
         private final String name;
-        private String description = null;
-        private Class<? extends C> defaultCommand = null;
+        private String description;
+        private Class<? extends C> defaultCommand;
 
         private final List<Class<? extends C>> commands = new ArrayList<>();
 
diff --git a/src/main/java/io/airlift/airline/GlobalSuggester.java b/src/main/java/io/airlift/airline/GlobalSuggester.java
index cad5dc318..391ad807a 100644
--- a/src/main/java/io/airlift/airline/GlobalSuggester.java
+++ b/src/main/java/io/airlift/airline/GlobalSuggester.java
@@ -22,7 +22,6 @@ public Iterable<String> suggest()
         return concat(
                 transform(metadata.getCommandGroups(), CommandGroupMetadata::getName),
                 transform(metadata.getDefaultGroupCommands(), CommandMetadata::getName),
-                concat(transform(metadata.getOptions(), OptionMetadata::getOptions))
-        );
+                concat(transform(metadata.getOptions(), OptionMetadata::getOptions)));
     }
 }
diff --git a/src/main/java/io/airlift/airline/GroupSuggester.java b/src/main/java/io/airlift/airline/GroupSuggester.java
index 58dcb836f..85279d4a9 100644
--- a/src/main/java/io/airlift/airline/GroupSuggester.java
+++ b/src/main/java/io/airlift/airline/GroupSuggester.java
@@ -20,7 +20,6 @@ public Iterable<String> suggest()
     {
         return concat(
                 transform(group.getCommands(), CommandMetadata::getName),
-                concat(transform(group.getOptions(), OptionMetadata::getOptions))
-        );
+                concat(transform(group.getOptions(), OptionMetadata::getOptions)));
     }
 }
diff --git a/src/main/java/io/airlift/airline/Option.java b/src/main/java/io/airlift/airline/Option.java
index bd83af549..d721b345b 100644
--- a/src/main/java/io/airlift/airline/Option.java
+++ b/src/main/java/io/airlift/airline/Option.java
@@ -22,9 +22,10 @@
 import java.lang.annotation.Target;
 
 import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-@Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
-@Target({FIELD})
+@Retention(RUNTIME)
+@Target(FIELD)
 public @interface Option
 {
     /**
diff --git a/src/main/java/io/airlift/airline/ParserUtil.java b/src/main/java/io/airlift/airline/ParserUtil.java
index ccc26cd0b..8fafaa6bd 100644
--- a/src/main/java/io/airlift/airline/ParserUtil.java
+++ b/src/main/java/io/airlift/airline/ParserUtil.java
@@ -10,8 +10,10 @@
 
 import static com.google.common.collect.Iterables.concat;
 
-public class ParserUtil
+public final class ParserUtil
 {
+    private ParserUtil() {}
+
     public static <T> T createInstance(Class<T> type)
     {
         if (type != null) {
diff --git a/src/main/java/io/airlift/airline/UsageHelper.java b/src/main/java/io/airlift/airline/UsageHelper.java
index 59a92af43..814f44c73 100644
--- a/src/main/java/io/airlift/airline/UsageHelper.java
+++ b/src/main/java/io/airlift/airline/UsageHelper.java
@@ -12,8 +12,10 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static java.util.stream.Collectors.joining;
 
-public class UsageHelper
+public final class UsageHelper
 {
+    private UsageHelper() {}
+
     public static final Comparator<OptionMetadata> DEFAULT_OPTION_COMPARATOR = new Comparator<OptionMetadata>()
     {
         @Override
diff --git a/src/main/java/io/airlift/airline/model/MetadataLoader.java b/src/main/java/io/airlift/airline/model/MetadataLoader.java
index ea376e925..869fab2ec 100644
--- a/src/main/java/io/airlift/airline/model/MetadataLoader.java
+++ b/src/main/java/io/airlift/airline/model/MetadataLoader.java
@@ -23,8 +23,10 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Streams.stream;
 
-public class MetadataLoader
+public final class MetadataLoader
 {
+    private MetadataLoader() {}
+
     public static GlobalMetadata loadGlobal(String name,
             String description,
             CommandMetadata defaultCommand,
diff --git a/src/test/java/io/airlift/airline/Git.java b/src/test/java/io/airlift/airline/Git.java
index e20589b83..25bcc1441 100644
--- a/src/test/java/io/airlift/airline/Git.java
+++ b/src/test/java/io/airlift/airline/Git.java
@@ -6,8 +6,10 @@
 
 import static io.airlift.airline.OptionType.GLOBAL;
 
-public class Git
+public final class Git
 {
+    private Git() {}
+
     public static void main(String... args)
     {
         CliBuilder<Runnable> builder = Cli.<Runnable>builder("git")
diff --git a/src/test/java/io/airlift/airline/TestCommand.java b/src/test/java/io/airlift/airline/TestCommand.java
index b71b8376f..ca22e97d1 100644
--- a/src/test/java/io/airlift/airline/TestCommand.java
+++ b/src/test/java/io/airlift/airline/TestCommand.java
@@ -425,6 +425,7 @@ class A
             @Option(name = "-long")
             public long l;
         }
+
         singleCommandParser(A.class).parse("-lon", "32");
     }
 }
diff --git a/src/test/java/io/airlift/airline/TestGalaxyCommandLineParser.java b/src/test/java/io/airlift/airline/TestGalaxyCommandLineParser.java
index 601eb2927..2d958c4bc 100644
--- a/src/test/java/io/airlift/airline/TestGalaxyCommandLineParser.java
+++ b/src/test/java/io/airlift/airline/TestGalaxyCommandLineParser.java
@@ -88,7 +88,7 @@ private void parse(String... args)
     public static class GlobalOptions
     {
         @Option(type = GLOBAL, name = "--debug", description = "Enable debug messages")
-        public boolean debug = false;
+        public boolean debug;
 
         @Option(type = GLOBAL, name = "--coordinator", description = "Galaxy coordinator host (overrides GALAXY_COORDINATOR)")
         public String coordinator = firstNonNull(System.getenv("GALAXY_COORDINATOR"), "http://localhost:64000");
@@ -163,7 +163,7 @@ public String toString()
         }
     }
 
-    public static abstract class GalaxyCommand
+    public abstract static class GalaxyCommand
     {
         @Inject
         public GlobalOptions globalOptions = new GlobalOptions();
@@ -209,7 +209,7 @@ public String toString()
     public static class InstallCommand
             extends GalaxyCommand
     {
-        @Option(name = {"--count"}, description = "Number of instances to install")
+        @Option(name = "--count", description = "Number of instances to install")
         public int count = 1;
 
         @Inject
@@ -362,10 +362,10 @@ public String toString()
     public static class AgentAddCommand
             extends GalaxyCommand
     {
-        @Option(name = {"--count"}, description = "Number of agents to provision")
+        @Option(name = "--count", description = "Number of agents to provision")
         public int count = 1;
 
-        @Option(name = {"--availability-zone"}, description = "Availability zone to provision")
+        @Option(name = "--availability-zone", description = "Availability zone to provision")
         public String availabilityZone;
 
         @Arguments(usage = "[<instance-type>]", description = "Instance type to provision")
diff --git a/src/test/java/io/airlift/airline/TestParametersDelegate.java b/src/test/java/io/airlift/airline/TestParametersDelegate.java
index 1e40bada4..7e49ec517 100644
--- a/src/test/java/io/airlift/airline/TestParametersDelegate.java
+++ b/src/test/java/io/airlift/airline/TestParametersDelegate.java
@@ -73,7 +73,6 @@ public static class ComplexDelegate
     @Test
     public void delegatingSetsFieldsOnBothMainParamsAndTheDelegatedParams()
     {
-
         DelegatingSetsFieldsOnBothMainParamsAndTheDelegatedParams p = singleCommandParser(DelegatingSetsFieldsOnBothMainParamsAndTheDelegatedParams.class)
                 .parse("command", "-c", "--long-d", "123", "--long-b", "bValue");
         assertFalse(p.isA);
@@ -177,7 +176,6 @@ public static class ComplexDelegate
     @Test
     public void nullDelegatesAreAllowed()
     {
-
         NullDelegatesAreProhibited value = singleCommandParser(NullDelegatesAreProhibited.class).parse("command", "-a");
         assertEquals(value.delegate.a, true);
     }
diff --git a/src/test/java/io/airlift/airline/TestSingleCommand.java b/src/test/java/io/airlift/airline/TestSingleCommand.java
index f63cdd17d..5fa578138 100644
--- a/src/test/java/io/airlift/airline/TestSingleCommand.java
+++ b/src/test/java/io/airlift/airline/TestSingleCommand.java
@@ -379,6 +379,7 @@ class A
             @Option(name = "-long")
             public long l;
         }
+
         singleCommand(A.class).parse("32");
     }
 
diff --git a/src/test/java/io/airlift/airline/TestingUtil.java b/src/test/java/io/airlift/airline/TestingUtil.java
index 20107d618..3877b1833 100644
--- a/src/test/java/io/airlift/airline/TestingUtil.java
+++ b/src/test/java/io/airlift/airline/TestingUtil.java
@@ -1,7 +1,9 @@
 package io.airlift.airline;
 
-public class TestingUtil
+public final class TestingUtil
 {
+    private TestingUtil() {}
+
     public static <T> Cli<T> singleCommandParser(Class<T> commandClass)
     {
         return Cli.<T>builder("parser")
diff --git a/src/test/java/io/airlift/airline/args/Args1.java b/src/test/java/io/airlift/airline/args/Args1.java
index 2bfef7a0d..ebc52b882 100644
--- a/src/test/java/io/airlift/airline/args/Args1.java
+++ b/src/test/java/io/airlift/airline/args/Args1.java
@@ -40,7 +40,7 @@ public class Args1
     public String groups;
 
     @Option(name = "-debug", description = "Debug mode")
-    public boolean debug = false;
+    public boolean debug;
 
     @Option(name = "-long", description = "A long number")
     public long l;
diff --git a/src/test/java/io/airlift/airline/args/Args2.java b/src/test/java/io/airlift/airline/args/Args2.java
index 0ad1c645e..75478f69f 100644
--- a/src/test/java/io/airlift/airline/args/Args2.java
+++ b/src/test/java/io/airlift/airline/args/Args2.java
@@ -38,7 +38,7 @@ public class Args2
     public String groups;
 
     @Option(name = "-debug", description = "Debug mode")
-    public boolean debug = false;
+    public boolean debug;
 
     @Option(name = "-host", description = "The host")
     public List<String> hosts = new ArrayList<>();
diff --git a/src/test/java/io/airlift/airline/args/ArgsArityString.java b/src/test/java/io/airlift/airline/args/ArgsArityString.java
index fd4578712..26e219d83 100644
--- a/src/test/java/io/airlift/airline/args/ArgsArityString.java
+++ b/src/test/java/io/airlift/airline/args/ArgsArityString.java
@@ -32,7 +32,6 @@
 @Command(name = "ArgsArityString")
 public class ArgsArityString
 {
-
     @Option(name = "-pairs", arity = 2, description = "Pairs")
     public List<String> pairs;
 
diff --git a/src/test/java/io/airlift/airline/args/ArgsDefault.java b/src/test/java/io/airlift/airline/args/ArgsDefault.java
index 030532fa9..f701dfd93 100644
--- a/src/test/java/io/airlift/airline/args/ArgsDefault.java
+++ b/src/test/java/io/airlift/airline/args/ArgsDefault.java
@@ -36,7 +36,7 @@ public class ArgsDefault
     public String groups;
 
     @Option(name = "-debug", description = "Debug mode")
-    public boolean debug = false;
+    public boolean debug;
 
     @Option(name = "-level", description = "A long number")
     public long level;
diff --git a/src/test/java/io/airlift/airline/args/ArgsEnum.java b/src/test/java/io/airlift/airline/args/ArgsEnum.java
index d330440f6..a88e212e4 100644
--- a/src/test/java/io/airlift/airline/args/ArgsEnum.java
+++ b/src/test/java/io/airlift/airline/args/ArgsEnum.java
@@ -29,7 +29,6 @@
 @Command(name = "ArgsEnum")
 public class ArgsEnum
 {
-
     public enum ChoiceType
     {
         ONE, TWO, THREE
@@ -38,5 +37,3 @@ public enum ChoiceType
     @Option(name = "-choice", description = "Choice parameter")
     public ChoiceType choice = ChoiceType.ONE;
 }
-
-
diff --git a/src/test/java/io/airlift/airline/args/ArgsSingleChar.java b/src/test/java/io/airlift/airline/args/ArgsSingleChar.java
index b0d254401..39ca0a924 100644
--- a/src/test/java/io/airlift/airline/args/ArgsSingleChar.java
+++ b/src/test/java/io/airlift/airline/args/ArgsSingleChar.java
@@ -31,32 +31,32 @@ public class ArgsSingleChar
     @Arguments
     public List<String> parameters = new ArrayList<>();
 
-    @Option(name = {"-l"}, description = "Long")
-    public boolean l = false;
+    @Option(name = "-l", description = "Long")
+    public boolean l;
 
     @Option(name = "-g", description = "Global")
-    public boolean g = false;
+    public boolean g;
 
     @Option(name = "-d", description = "Debug mode")
-    public boolean d = false;
+    public boolean d;
 
     @Option(name = "-s", description = "A string")
-    public String s = null;
+    public String s;
 
     @Option(name = "-p", description = "A path")
-    public String p = null;
+    public String p;
 
     @Option(name = "-n", description = "No action")
-    public boolean n = false;
+    public boolean n;
 
     @Option(name = "-2", description = "Two")
-    public boolean two = false;
+    public boolean two;
 
     @Option(name = "-f", description = "A filename")
-    public String f = null;
+    public String f;
 
     @Option(name = "-z", description = "Compress")
-    public boolean z = false;
+    public boolean z;
 
     @Option(name = "--D", description = "Directory")
     public String dir;
diff --git a/src/test/java/io/airlift/airline/args/CommandLineArgs.java b/src/test/java/io/airlift/airline/args/CommandLineArgs.java
index 7a69e8595..97bab66d1 100644
--- a/src/test/java/io/airlift/airline/args/CommandLineArgs.java
+++ b/src/test/java/io/airlift/airline/args/CommandLineArgs.java
@@ -28,7 +28,6 @@
 @Command(name = "CommandLineArgs")
 public class CommandLineArgs
 {
-
     @Arguments(description = "The XML suite files to run")
     public List<String> suiteFiles = new ArrayList<>();