From cd9c8d8a65526b43df7d1990d064d307c994b511 Mon Sep 17 00:00:00 2001 From: David Phillips Date: Fri, 1 Nov 2013 08:28:43 -0700 Subject: [PATCH] Rename package from command to airline --- .../{command => airline}/Accessor.java | 2 +- .../{command => airline}/Arguments.java | 2 +- .../io/airlift/{command => airline}/Cli.java | 16 ++++---- .../airlift/{command => airline}/Command.java | 2 +- .../CommandGroupUsage.java | 14 +++---- .../CommandSuggester.java | 6 +-- .../{command => airline}/CommandUsage.java | 12 +++--- .../airlift/{command => airline}/Context.java | 2 +- .../{command => airline}/GlobalSuggester.java | 10 ++--- .../{command => airline}/GlobalUsage.java | 13 +++--- .../GlobalUsageSummary.java | 12 +++--- .../{command => airline}/GroupSuggester.java | 8 ++-- .../io/airlift/{command => airline}/Help.java | 8 ++-- .../{command => airline}/HelpOption.java | 4 +- .../airlift/{command => airline}/Option.java | 2 +- .../{command => airline}/OptionType.java | 2 +- .../ParseArgumentsMissingException.java | 6 +-- .../ParseArgumentsUnexpectedException.java | 2 +- .../ParseCommandMissingException.java | 2 +- .../ParseCommandUnrecognizedException.java | 2 +- .../{command => airline}/ParseException.java | 2 +- .../ParseOptionConversionException.java | 2 +- .../ParseOptionMissingException.java | 2 +- .../ParseOptionMissingValueException.java | 2 +- .../{command => airline}/ParseState.java | 8 ++-- .../airlift/{command => airline}/Parser.java | 12 +++--- .../{command => airline}/ParserUtil.java | 6 +-- .../{command => airline}/SingleCommand.java | 12 +++--- .../{command => airline}/SuggestCommand.java | 16 ++++---- .../{command => airline}/Suggester.java | 2 +- .../{command => airline}/TypeConverter.java | 2 +- .../{command => airline}/UsageHelper.java | 10 ++--- .../{command => airline}/UsagePrinter.java | 2 +- .../model/ArgumentsMetadata.java | 4 +- .../model/CommandGroupMetadata.java | 2 +- .../model/CommandMetadata.java | 5 +-- .../model/GlobalMetadata.java | 2 +- .../model/MetadataLoader.java | 14 +++---- .../model/OptionMetadata.java | 6 +-- .../model/SuggesterMetadata.java | 6 +-- .../ArgsRequiredWrongMain.java | 2 +- .../{command => airline}/CommandTest.java | 40 +++++++++---------- .../GalaxyCommandLineParser.java | 6 +-- .../io/airlift/{command => airline}/Git.java | 6 +-- .../airlift/{command => airline}/GitTest.java | 2 +- .../{command => airline}/HelpTest.java | 30 +++++++------- .../ParametersDelegateTest.java | 4 +- .../io/airlift/{command => airline}/Ping.java | 2 +- .../{command => airline}/PingTest.java | 2 +- .../SingleCommandTest.java | 40 +++++++++---------- .../{command => airline}/TestUtil.java | 2 +- .../{command => airline}/args/Args1.java | 8 ++-- .../{command => airline}/args/Args2.java | 8 ++-- .../args/ArgsArityString.java | 8 ++-- .../args/ArgsBooleanArity.java | 6 +-- .../args/ArgsBooleanArity0.java | 6 +-- .../args/ArgsDefault.java | 6 +-- .../{command => airline}/args/ArgsEnum.java | 6 +-- .../args/ArgsInherited.java | 6 +-- .../args/ArgsMultipleUnparsed.java | 6 +-- .../args/ArgsOutOfMemory.java | 6 +-- .../args/ArgsPrivate.java | 6 +-- .../args/ArgsRequired.java | 6 +-- .../args/ArgsSingleChar.java | 8 ++-- .../{command => airline}/args/Arity1.java | 6 +-- .../args/CommandHidden.java | 6 +-- .../args/CommandLineArgs.java | 8 ++-- .../args/OptionsHidden.java | 6 +-- .../args/OptionsRequired.java | 9 ++--- .../command/CommandAdd.java | 8 ++-- .../command/CommandCommit.java | 8 ++-- .../command/CommandMain.java | 6 +-- .../command/CommandTest.java | 6 +-- 73 files changed, 260 insertions(+), 269 deletions(-) rename src/main/java/io/airlift/{command => airline}/Accessor.java (99%) rename src/main/java/io/airlift/{command => airline}/Arguments.java (97%) rename src/main/java/io/airlift/{command => airline}/Cli.java (96%) rename src/main/java/io/airlift/{command => airline}/Command.java (98%) rename src/main/java/io/airlift/{command => airline}/CommandGroupUsage.java (94%) rename src/main/java/io/airlift/{command => airline}/CommandSuggester.java (84%) rename src/main/java/io/airlift/{command => airline}/CommandUsage.java (94%) rename src/main/java/io/airlift/{command => airline}/Context.java (70%) rename src/main/java/io/airlift/{command => airline}/GlobalSuggester.java (73%) rename src/main/java/io/airlift/{command => airline}/GlobalUsage.java (91%) rename src/main/java/io/airlift/{command => airline}/GlobalUsageSummary.java (92%) rename src/main/java/io/airlift/{command => airline}/GroupSuggester.java (74%) rename src/main/java/io/airlift/{command => airline}/Help.java (94%) rename src/main/java/io/airlift/{command => airline}/HelpOption.java (82%) rename src/main/java/io/airlift/{command => airline}/Option.java (98%) rename src/main/java/io/airlift/{command => airline}/OptionType.java (66%) rename src/main/java/io/airlift/{command => airline}/ParseArgumentsMissingException.java (91%) rename src/main/java/io/airlift/{command => airline}/ParseArgumentsUnexpectedException.java (97%) rename src/main/java/io/airlift/{command => airline}/ParseCommandMissingException.java (96%) rename src/main/java/io/airlift/{command => airline}/ParseCommandUnrecognizedException.java (97%) rename src/main/java/io/airlift/{command => airline}/ParseException.java (97%) rename src/main/java/io/airlift/{command => airline}/ParseOptionConversionException.java (98%) rename src/main/java/io/airlift/{command => airline}/ParseOptionMissingException.java (97%) rename src/main/java/io/airlift/{command => airline}/ParseOptionMissingValueException.java (97%) rename src/main/java/io/airlift/{command => airline}/ParseState.java (96%) rename src/main/java/io/airlift/{command => airline}/Parser.java (97%) rename src/main/java/io/airlift/{command => airline}/ParserUtil.java (94%) rename src/main/java/io/airlift/{command => airline}/SingleCommand.java (92%) rename src/main/java/io/airlift/{command => airline}/SuggestCommand.java (86%) rename src/main/java/io/airlift/{command => airline}/Suggester.java (69%) rename src/main/java/io/airlift/{command => airline}/TypeConverter.java (99%) rename src/main/java/io/airlift/{command => airline}/UsageHelper.java (95%) rename src/main/java/io/airlift/{command => airline}/UsagePrinter.java (99%) rename src/main/java/io/airlift/{command => airline}/model/ArgumentsMetadata.java (98%) rename src/main/java/io/airlift/{command => airline}/model/CommandGroupMetadata.java (98%) rename src/main/java/io/airlift/{command => airline}/model/CommandMetadata.java (96%) rename src/main/java/io/airlift/{command => airline}/model/GlobalMetadata.java (98%) rename src/main/java/io/airlift/{command => airline}/model/MetadataLoader.java (97%) rename src/main/java/io/airlift/{command => airline}/model/OptionMetadata.java (98%) rename src/main/java/io/airlift/{command => airline}/model/SuggesterMetadata.java (86%) rename src/test/java/io/airlift/{command => airline}/ArgsRequiredWrongMain.java (83%) rename src/test/java/io/airlift/{command => airline}/CommandTest.java (93%) rename src/test/java/io/airlift/{command => airline}/GalaxyCommandLineParser.java (99%) rename src/test/java/io/airlift/{command => airline}/Git.java (94%) rename src/test/java/io/airlift/{command => airline}/GitTest.java (96%) rename src/test/java/io/airlift/{command => airline}/HelpTest.java (96%) rename src/test/java/io/airlift/{command => airline}/ParametersDelegateTest.java (98%) rename src/test/java/io/airlift/{command => airline}/Ping.java (95%) rename src/test/java/io/airlift/{command => airline}/PingTest.java (94%) rename src/test/java/io/airlift/{command => airline}/SingleCommandTest.java (92%) rename src/test/java/io/airlift/{command => airline}/TestUtil.java (88%) rename src/test/java/io/airlift/{command => airline}/args/Args1.java (92%) rename src/test/java/io/airlift/{command => airline}/args/Args2.java (91%) rename src/test/java/io/airlift/{command => airline}/args/ArgsArityString.java (88%) rename src/test/java/io/airlift/{command => airline}/args/ArgsBooleanArity.java (89%) rename src/test/java/io/airlift/{command => airline}/args/ArgsBooleanArity0.java (89%) rename src/test/java/io/airlift/{command => airline}/args/ArgsDefault.java (92%) rename src/test/java/io/airlift/{command => airline}/args/ArgsEnum.java (90%) rename src/test/java/io/airlift/{command => airline}/args/ArgsInherited.java (89%) rename src/test/java/io/airlift/{command => airline}/args/ArgsMultipleUnparsed.java (91%) rename src/test/java/io/airlift/{command => airline}/args/ArgsOutOfMemory.java (79%) rename src/test/java/io/airlift/{command => airline}/args/ArgsPrivate.java (90%) rename src/test/java/io/airlift/{command => airline}/args/ArgsRequired.java (90%) rename src/test/java/io/airlift/{command => airline}/args/ArgsSingleChar.java (92%) rename src/test/java/io/airlift/{command => airline}/args/Arity1.java (60%) rename src/test/java/io/airlift/{command => airline}/args/CommandHidden.java (90%) rename src/test/java/io/airlift/{command => airline}/args/CommandLineArgs.java (96%) rename src/test/java/io/airlift/{command => airline}/args/OptionsHidden.java (90%) rename src/test/java/io/airlift/{command => airline}/args/OptionsRequired.java (85%) rename src/test/java/io/airlift/{command => airline}/command/CommandAdd.java (88%) rename src/test/java/io/airlift/{command => airline}/command/CommandCommit.java (89%) rename src/test/java/io/airlift/{command => airline}/command/CommandMain.java (87%) rename src/test/java/io/airlift/{command => airline}/command/CommandTest.java (94%) diff --git a/src/main/java/io/airlift/command/Accessor.java b/src/main/java/io/airlift/airline/Accessor.java similarity index 99% rename from src/main/java/io/airlift/command/Accessor.java rename to src/main/java/io/airlift/airline/Accessor.java index 834fc719a..9122be6bf 100644 --- a/src/main/java/io/airlift/command/Accessor.java +++ b/src/main/java/io/airlift/airline/Accessor.java @@ -1,4 +1,4 @@ -package io.airlift.command; +package io.airlift.airline; import com.google.common.base.Function; import com.google.common.base.Joiner; diff --git a/src/main/java/io/airlift/command/Arguments.java b/src/main/java/io/airlift/airline/Arguments.java similarity index 97% rename from src/main/java/io/airlift/command/Arguments.java rename to src/main/java/io/airlift/airline/Arguments.java index 8cdf512b2..9a598f926 100644 --- a/src/main/java/io/airlift/command/Arguments.java +++ b/src/main/java/io/airlift/airline/Arguments.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package io.airlift.command; +package io.airlift.airline; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/src/main/java/io/airlift/command/Cli.java b/src/main/java/io/airlift/airline/Cli.java similarity index 96% rename from src/main/java/io/airlift/command/Cli.java rename to src/main/java/io/airlift/airline/Cli.java index f83500d22..13f7533f1 100644 --- a/src/main/java/io/airlift/command/Cli.java +++ b/src/main/java/io/airlift/airline/Cli.java @@ -16,26 +16,26 @@ * limitations under the License. */ -package io.airlift.command; +package io.airlift.airline; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; -import io.airlift.command.model.ArgumentsMetadata; -import io.airlift.command.model.CommandGroupMetadata; -import io.airlift.command.model.CommandMetadata; -import io.airlift.command.model.GlobalMetadata; -import io.airlift.command.model.MetadataLoader; -import io.airlift.command.model.OptionMetadata; +import io.airlift.airline.model.ArgumentsMetadata; +import io.airlift.airline.model.CommandGroupMetadata; +import io.airlift.airline.model.CommandMetadata; +import io.airlift.airline.model.GlobalMetadata; +import io.airlift.airline.model.MetadataLoader; +import io.airlift.airline.model.OptionMetadata; import java.util.List; import java.util.Map; import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Maps.newHashMap; -import static io.airlift.command.ParserUtil.createInstance; +import static io.airlift.airline.ParserUtil.createInstance; public class Cli { diff --git a/src/main/java/io/airlift/command/Command.java b/src/main/java/io/airlift/airline/Command.java similarity index 98% rename from src/main/java/io/airlift/command/Command.java rename to src/main/java/io/airlift/airline/Command.java index da0734f86..ce68a8deb 100644 --- a/src/main/java/io/airlift/command/Command.java +++ b/src/main/java/io/airlift/airline/Command.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package io.airlift.command; +package io.airlift.airline; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/src/main/java/io/airlift/command/CommandGroupUsage.java b/src/main/java/io/airlift/airline/CommandGroupUsage.java similarity index 94% rename from src/main/java/io/airlift/command/CommandGroupUsage.java rename to src/main/java/io/airlift/airline/CommandGroupUsage.java index 4ef237501..6397a07c4 100644 --- a/src/main/java/io/airlift/command/CommandGroupUsage.java +++ b/src/main/java/io/airlift/airline/CommandGroupUsage.java @@ -1,10 +1,10 @@ -package io.airlift.command; +package io.airlift.airline; import com.google.common.base.Preconditions; -import io.airlift.command.model.CommandGroupMetadata; -import io.airlift.command.model.CommandMetadata; -import io.airlift.command.model.GlobalMetadata; -import io.airlift.command.model.OptionMetadata; +import io.airlift.airline.model.CommandGroupMetadata; +import io.airlift.airline.model.CommandMetadata; +import io.airlift.airline.model.GlobalMetadata; +import io.airlift.airline.model.OptionMetadata; import javax.annotation.Nullable; import java.util.Collections; @@ -12,8 +12,8 @@ import java.util.List; import static com.google.common.collect.Lists.newArrayList; -import static io.airlift.command.UsageHelper.DEFAULT_COMMAND_COMPARATOR; -import static io.airlift.command.UsageHelper.DEFAULT_OPTION_COMPARATOR; +import static io.airlift.airline.UsageHelper.DEFAULT_COMMAND_COMPARATOR; +import static io.airlift.airline.UsageHelper.DEFAULT_OPTION_COMPARATOR; public class CommandGroupUsage { diff --git a/src/main/java/io/airlift/command/CommandSuggester.java b/src/main/java/io/airlift/airline/CommandSuggester.java similarity index 84% rename from src/main/java/io/airlift/command/CommandSuggester.java rename to src/main/java/io/airlift/airline/CommandSuggester.java index 63fac888e..6514ae158 100644 --- a/src/main/java/io/airlift/command/CommandSuggester.java +++ b/src/main/java/io/airlift/airline/CommandSuggester.java @@ -1,8 +1,8 @@ -package io.airlift.command; +package io.airlift.airline; import com.google.common.collect.ImmutableList; -import io.airlift.command.model.CommandMetadata; -import io.airlift.command.model.OptionMetadata; +import io.airlift.airline.model.CommandMetadata; +import io.airlift.airline.model.OptionMetadata; import javax.inject.Inject; diff --git a/src/main/java/io/airlift/command/CommandUsage.java b/src/main/java/io/airlift/airline/CommandUsage.java similarity index 94% rename from src/main/java/io/airlift/command/CommandUsage.java rename to src/main/java/io/airlift/airline/CommandUsage.java index 6f84593b4..d053bd615 100644 --- a/src/main/java/io/airlift/command/CommandUsage.java +++ b/src/main/java/io/airlift/airline/CommandUsage.java @@ -1,9 +1,9 @@ -package io.airlift.command; +package io.airlift.airline; import com.google.common.base.Preconditions; -import io.airlift.command.model.ArgumentsMetadata; -import io.airlift.command.model.CommandMetadata; -import io.airlift.command.model.OptionMetadata; +import io.airlift.airline.model.ArgumentsMetadata; +import io.airlift.airline.model.CommandMetadata; +import io.airlift.airline.model.OptionMetadata; import javax.annotation.Nullable; import java.util.ArrayList; @@ -12,8 +12,8 @@ import java.util.List; import static com.google.common.collect.Lists.newArrayList; -import static io.airlift.command.UsageHelper.DEFAULT_OPTION_COMPARATOR; -import static io.airlift.command.UsageHelper.toSynopsisUsage; +import static io.airlift.airline.UsageHelper.DEFAULT_OPTION_COMPARATOR; +import static io.airlift.airline.UsageHelper.toSynopsisUsage; public class CommandUsage { diff --git a/src/main/java/io/airlift/command/Context.java b/src/main/java/io/airlift/airline/Context.java similarity index 70% rename from src/main/java/io/airlift/command/Context.java rename to src/main/java/io/airlift/airline/Context.java index 9b31013f9..b1116d908 100644 --- a/src/main/java/io/airlift/command/Context.java +++ b/src/main/java/io/airlift/airline/Context.java @@ -1,4 +1,4 @@ -package io.airlift.command; +package io.airlift.airline; public enum Context { diff --git a/src/main/java/io/airlift/command/GlobalSuggester.java b/src/main/java/io/airlift/airline/GlobalSuggester.java similarity index 73% rename from src/main/java/io/airlift/command/GlobalSuggester.java rename to src/main/java/io/airlift/airline/GlobalSuggester.java index db0c029b8..b670cdc86 100644 --- a/src/main/java/io/airlift/command/GlobalSuggester.java +++ b/src/main/java/io/airlift/airline/GlobalSuggester.java @@ -1,9 +1,9 @@ -package io.airlift.command; +package io.airlift.airline; -import io.airlift.command.model.CommandGroupMetadata; -import io.airlift.command.model.CommandMetadata; -import io.airlift.command.model.GlobalMetadata; -import io.airlift.command.model.OptionMetadata; +import io.airlift.airline.model.CommandGroupMetadata; +import io.airlift.airline.model.CommandMetadata; +import io.airlift.airline.model.GlobalMetadata; +import io.airlift.airline.model.OptionMetadata; import javax.inject.Inject; diff --git a/src/main/java/io/airlift/command/GlobalUsage.java b/src/main/java/io/airlift/airline/GlobalUsage.java similarity index 91% rename from src/main/java/io/airlift/command/GlobalUsage.java rename to src/main/java/io/airlift/airline/GlobalUsage.java index 9410204fe..221532e7e 100644 --- a/src/main/java/io/airlift/command/GlobalUsage.java +++ b/src/main/java/io/airlift/airline/GlobalUsage.java @@ -1,10 +1,10 @@ -package io.airlift.command; +package io.airlift.airline; import com.google.common.base.Preconditions; -import io.airlift.command.model.CommandGroupMetadata; -import io.airlift.command.model.CommandMetadata; -import io.airlift.command.model.GlobalMetadata; -import io.airlift.command.model.OptionMetadata; +import io.airlift.airline.model.CommandGroupMetadata; +import io.airlift.airline.model.CommandMetadata; +import io.airlift.airline.model.GlobalMetadata; +import io.airlift.airline.model.OptionMetadata; import javax.annotation.Nullable; import java.util.Collections; @@ -12,8 +12,7 @@ import java.util.List; import static com.google.common.collect.Lists.newArrayList; -import static io.airlift.command.UsageHelper.DEFAULT_COMMAND_COMPARATOR; -import static io.airlift.command.UsageHelper.DEFAULT_OPTION_COMPARATOR; +import static io.airlift.airline.UsageHelper.DEFAULT_OPTION_COMPARATOR; public class GlobalUsage { diff --git a/src/main/java/io/airlift/command/GlobalUsageSummary.java b/src/main/java/io/airlift/airline/GlobalUsageSummary.java similarity index 92% rename from src/main/java/io/airlift/command/GlobalUsageSummary.java rename to src/main/java/io/airlift/airline/GlobalUsageSummary.java index e009329e1..d27344684 100644 --- a/src/main/java/io/airlift/command/GlobalUsageSummary.java +++ b/src/main/java/io/airlift/airline/GlobalUsageSummary.java @@ -1,4 +1,4 @@ -package io.airlift.command; +package io.airlift.airline; import com.google.common.base.Function; import com.google.common.base.Objects; @@ -6,10 +6,10 @@ import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import io.airlift.command.model.CommandGroupMetadata; -import io.airlift.command.model.CommandMetadata; -import io.airlift.command.model.GlobalMetadata; -import io.airlift.command.model.OptionMetadata; +import io.airlift.airline.model.CommandGroupMetadata; +import io.airlift.airline.model.CommandMetadata; +import io.airlift.airline.model.GlobalMetadata; +import io.airlift.airline.model.OptionMetadata; import java.util.List; import java.util.Map; @@ -17,7 +17,7 @@ import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Maps.newTreeMap; -import static io.airlift.command.UsageHelper.toUsage; +import static io.airlift.airline.UsageHelper.toUsage; public class GlobalUsageSummary { diff --git a/src/main/java/io/airlift/command/GroupSuggester.java b/src/main/java/io/airlift/airline/GroupSuggester.java similarity index 74% rename from src/main/java/io/airlift/command/GroupSuggester.java rename to src/main/java/io/airlift/airline/GroupSuggester.java index 1f2d6e4af..4758f6320 100644 --- a/src/main/java/io/airlift/command/GroupSuggester.java +++ b/src/main/java/io/airlift/airline/GroupSuggester.java @@ -1,8 +1,8 @@ -package io.airlift.command; +package io.airlift.airline; -import io.airlift.command.model.CommandGroupMetadata; -import io.airlift.command.model.CommandMetadata; -import io.airlift.command.model.OptionMetadata; +import io.airlift.airline.model.CommandGroupMetadata; +import io.airlift.airline.model.CommandMetadata; +import io.airlift.airline.model.OptionMetadata; import javax.inject.Inject; diff --git a/src/main/java/io/airlift/command/Help.java b/src/main/java/io/airlift/airline/Help.java similarity index 94% rename from src/main/java/io/airlift/command/Help.java rename to src/main/java/io/airlift/airline/Help.java index bcca42b8a..868651c6d 100644 --- a/src/main/java/io/airlift/command/Help.java +++ b/src/main/java/io/airlift/airline/Help.java @@ -1,8 +1,8 @@ -package io.airlift.command; +package io.airlift.airline; -import io.airlift.command.model.CommandGroupMetadata; -import io.airlift.command.model.CommandMetadata; -import io.airlift.command.model.GlobalMetadata; +import io.airlift.airline.model.CommandGroupMetadata; +import io.airlift.airline.model.CommandMetadata; +import io.airlift.airline.model.GlobalMetadata; import javax.inject.Inject; import java.util.List; diff --git a/src/main/java/io/airlift/command/HelpOption.java b/src/main/java/io/airlift/airline/HelpOption.java similarity index 82% rename from src/main/java/io/airlift/command/HelpOption.java rename to src/main/java/io/airlift/airline/HelpOption.java index 5b3fc373c..281cabde9 100644 --- a/src/main/java/io/airlift/command/HelpOption.java +++ b/src/main/java/io/airlift/airline/HelpOption.java @@ -1,6 +1,6 @@ -package io.airlift.command; +package io.airlift.airline; -import io.airlift.command.model.CommandMetadata; +import io.airlift.airline.model.CommandMetadata; import javax.inject.Inject; diff --git a/src/main/java/io/airlift/command/Option.java b/src/main/java/io/airlift/airline/Option.java similarity index 98% rename from src/main/java/io/airlift/command/Option.java rename to src/main/java/io/airlift/airline/Option.java index 27d169198..1188fadda 100644 --- a/src/main/java/io/airlift/command/Option.java +++ b/src/main/java/io/airlift/airline/Option.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package io.airlift.command; +package io.airlift.airline; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/src/main/java/io/airlift/command/OptionType.java b/src/main/java/io/airlift/airline/OptionType.java similarity index 66% rename from src/main/java/io/airlift/command/OptionType.java rename to src/main/java/io/airlift/airline/OptionType.java index 0a1518cfc..8f331bee5 100644 --- a/src/main/java/io/airlift/command/OptionType.java +++ b/src/main/java/io/airlift/airline/OptionType.java @@ -1,4 +1,4 @@ -package io.airlift.command; +package io.airlift.airline; public enum OptionType { diff --git a/src/main/java/io/airlift/command/ParseArgumentsMissingException.java b/src/main/java/io/airlift/airline/ParseArgumentsMissingException.java similarity index 91% rename from src/main/java/io/airlift/command/ParseArgumentsMissingException.java rename to src/main/java/io/airlift/airline/ParseArgumentsMissingException.java index 3ef1133eb..5c59f3b54 100644 --- a/src/main/java/io/airlift/command/ParseArgumentsMissingException.java +++ b/src/main/java/io/airlift/airline/ParseArgumentsMissingException.java @@ -16,11 +16,7 @@ * limitations under the License. */ -package io.airlift.command; - -import com.google.common.collect.ImmutableList; - -import java.util.List; +package io.airlift.airline; public class ParseArgumentsMissingException extends ParseException { diff --git a/src/main/java/io/airlift/command/ParseArgumentsUnexpectedException.java b/src/main/java/io/airlift/airline/ParseArgumentsUnexpectedException.java similarity index 97% rename from src/main/java/io/airlift/command/ParseArgumentsUnexpectedException.java rename to src/main/java/io/airlift/airline/ParseArgumentsUnexpectedException.java index 4dc6b0853..fa347f598 100644 --- a/src/main/java/io/airlift/command/ParseArgumentsUnexpectedException.java +++ b/src/main/java/io/airlift/airline/ParseArgumentsUnexpectedException.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package io.airlift.command; +package io.airlift.airline; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/io/airlift/command/ParseCommandMissingException.java b/src/main/java/io/airlift/airline/ParseCommandMissingException.java similarity index 96% rename from src/main/java/io/airlift/command/ParseCommandMissingException.java rename to src/main/java/io/airlift/airline/ParseCommandMissingException.java index 93f26d184..15ee71271 100644 --- a/src/main/java/io/airlift/command/ParseCommandMissingException.java +++ b/src/main/java/io/airlift/airline/ParseCommandMissingException.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package io.airlift.command; +package io.airlift.airline; public class ParseCommandMissingException extends ParseException { diff --git a/src/main/java/io/airlift/command/ParseCommandUnrecognizedException.java b/src/main/java/io/airlift/airline/ParseCommandUnrecognizedException.java similarity index 97% rename from src/main/java/io/airlift/command/ParseCommandUnrecognizedException.java rename to src/main/java/io/airlift/airline/ParseCommandUnrecognizedException.java index 761ac21fc..72d9000c2 100644 --- a/src/main/java/io/airlift/command/ParseCommandUnrecognizedException.java +++ b/src/main/java/io/airlift/airline/ParseCommandUnrecognizedException.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package io.airlift.command; +package io.airlift.airline; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/io/airlift/command/ParseException.java b/src/main/java/io/airlift/airline/ParseException.java similarity index 97% rename from src/main/java/io/airlift/command/ParseException.java rename to src/main/java/io/airlift/airline/ParseException.java index 7eebb83c2..5b28f57d4 100644 --- a/src/main/java/io/airlift/command/ParseException.java +++ b/src/main/java/io/airlift/airline/ParseException.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package io.airlift.command; +package io.airlift.airline; public class ParseException extends RuntimeException { diff --git a/src/main/java/io/airlift/command/ParseOptionConversionException.java b/src/main/java/io/airlift/airline/ParseOptionConversionException.java similarity index 98% rename from src/main/java/io/airlift/command/ParseOptionConversionException.java rename to src/main/java/io/airlift/airline/ParseOptionConversionException.java index cd18bccb2..b83ab1cfe 100644 --- a/src/main/java/io/airlift/command/ParseOptionConversionException.java +++ b/src/main/java/io/airlift/airline/ParseOptionConversionException.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package io.airlift.command; +package io.airlift.airline; public class ParseOptionConversionException extends ParseException { diff --git a/src/main/java/io/airlift/command/ParseOptionMissingException.java b/src/main/java/io/airlift/airline/ParseOptionMissingException.java similarity index 97% rename from src/main/java/io/airlift/command/ParseOptionMissingException.java rename to src/main/java/io/airlift/airline/ParseOptionMissingException.java index 8da009e6d..c7b09ea11 100644 --- a/src/main/java/io/airlift/command/ParseOptionMissingException.java +++ b/src/main/java/io/airlift/airline/ParseOptionMissingException.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package io.airlift.command; +package io.airlift.airline; public class ParseOptionMissingException extends ParseException { diff --git a/src/main/java/io/airlift/command/ParseOptionMissingValueException.java b/src/main/java/io/airlift/airline/ParseOptionMissingValueException.java similarity index 97% rename from src/main/java/io/airlift/command/ParseOptionMissingValueException.java rename to src/main/java/io/airlift/airline/ParseOptionMissingValueException.java index 0620020ad..05cfcbe82 100644 --- a/src/main/java/io/airlift/command/ParseOptionMissingValueException.java +++ b/src/main/java/io/airlift/airline/ParseOptionMissingValueException.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package io.airlift.command; +package io.airlift.airline; public class ParseOptionMissingValueException extends ParseException { diff --git a/src/main/java/io/airlift/command/ParseState.java b/src/main/java/io/airlift/airline/ParseState.java similarity index 96% rename from src/main/java/io/airlift/command/ParseState.java rename to src/main/java/io/airlift/airline/ParseState.java index 4a4be586f..c4eb965e9 100644 --- a/src/main/java/io/airlift/command/ParseState.java +++ b/src/main/java/io/airlift/airline/ParseState.java @@ -1,12 +1,12 @@ -package io.airlift.command; +package io.airlift.airline; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ListMultimap; -import io.airlift.command.model.CommandGroupMetadata; -import io.airlift.command.model.CommandMetadata; -import io.airlift.command.model.OptionMetadata; +import io.airlift.airline.model.CommandGroupMetadata; +import io.airlift.airline.model.CommandMetadata; +import io.airlift.airline.model.OptionMetadata; import java.util.List; diff --git a/src/main/java/io/airlift/command/Parser.java b/src/main/java/io/airlift/airline/Parser.java similarity index 97% rename from src/main/java/io/airlift/command/Parser.java rename to src/main/java/io/airlift/airline/Parser.java index 05ab20f38..368667135 100644 --- a/src/main/java/io/airlift/command/Parser.java +++ b/src/main/java/io/airlift/airline/Parser.java @@ -1,14 +1,14 @@ -package io.airlift.command; +package io.airlift.airline; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterators; import com.google.common.collect.PeekingIterator; -import io.airlift.command.model.ArgumentsMetadata; -import io.airlift.command.model.CommandGroupMetadata; -import io.airlift.command.model.CommandMetadata; -import io.airlift.command.model.GlobalMetadata; -import io.airlift.command.model.OptionMetadata; +import io.airlift.airline.model.ArgumentsMetadata; +import io.airlift.airline.model.CommandGroupMetadata; +import io.airlift.airline.model.CommandMetadata; +import io.airlift.airline.model.GlobalMetadata; +import io.airlift.airline.model.OptionMetadata; import java.util.List; import java.util.regex.Pattern; diff --git a/src/main/java/io/airlift/command/ParserUtil.java b/src/main/java/io/airlift/airline/ParserUtil.java similarity index 94% rename from src/main/java/io/airlift/command/ParserUtil.java rename to src/main/java/io/airlift/airline/ParserUtil.java index ad27486ad..72d568b38 100644 --- a/src/main/java/io/airlift/command/ParserUtil.java +++ b/src/main/java/io/airlift/airline/ParserUtil.java @@ -1,9 +1,9 @@ -package io.airlift.command; +package io.airlift.airline; import com.google.common.collect.ImmutableList; import com.google.common.collect.ListMultimap; -import io.airlift.command.model.ArgumentsMetadata; -import io.airlift.command.model.OptionMetadata; +import io.airlift.airline.model.ArgumentsMetadata; +import io.airlift.airline.model.OptionMetadata; import java.util.List; import java.util.Map; diff --git a/src/main/java/io/airlift/command/SingleCommand.java b/src/main/java/io/airlift/airline/SingleCommand.java similarity index 92% rename from src/main/java/io/airlift/command/SingleCommand.java rename to src/main/java/io/airlift/airline/SingleCommand.java index 1d732d18d..8dc5d116d 100644 --- a/src/main/java/io/airlift/command/SingleCommand.java +++ b/src/main/java/io/airlift/airline/SingleCommand.java @@ -16,19 +16,19 @@ * limitations under the License. */ -package io.airlift.command; +package io.airlift.airline; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.command.model.ArgumentsMetadata; -import io.airlift.command.model.CommandMetadata; -import io.airlift.command.model.MetadataLoader; -import io.airlift.command.model.OptionMetadata; +import io.airlift.airline.model.ArgumentsMetadata; +import io.airlift.airline.model.CommandMetadata; +import io.airlift.airline.model.MetadataLoader; +import io.airlift.airline.model.OptionMetadata; import java.util.List; import static com.google.common.base.Preconditions.checkNotNull; -import static io.airlift.command.ParserUtil.createInstance; +import static io.airlift.airline.ParserUtil.createInstance; public class SingleCommand { diff --git a/src/main/java/io/airlift/command/SuggestCommand.java b/src/main/java/io/airlift/airline/SuggestCommand.java similarity index 86% rename from src/main/java/io/airlift/command/SuggestCommand.java rename to src/main/java/io/airlift/airline/SuggestCommand.java index 76a306ab0..71fab7137 100644 --- a/src/main/java/io/airlift/command/SuggestCommand.java +++ b/src/main/java/io/airlift/airline/SuggestCommand.java @@ -1,15 +1,15 @@ -package io.airlift.command; +package io.airlift.airline; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.airlift.command.model.CommandGroupMetadata; -import io.airlift.command.model.CommandMetadata; -import io.airlift.command.model.GlobalMetadata; -import io.airlift.command.model.MetadataLoader; -import io.airlift.command.model.OptionMetadata; -import io.airlift.command.model.SuggesterMetadata; +import io.airlift.airline.model.CommandGroupMetadata; +import io.airlift.airline.model.CommandMetadata; +import io.airlift.airline.model.GlobalMetadata; +import io.airlift.airline.model.MetadataLoader; +import io.airlift.airline.model.OptionMetadata; +import io.airlift.airline.model.SuggesterMetadata; import javax.inject.Inject; import java.util.List; @@ -17,7 +17,7 @@ import java.util.concurrent.Callable; import static com.google.common.collect.Lists.newArrayList; -import static io.airlift.command.ParserUtil.createInstance; +import static io.airlift.airline.ParserUtil.createInstance; @Command(name = "suggest") public class SuggestCommand diff --git a/src/main/java/io/airlift/command/Suggester.java b/src/main/java/io/airlift/airline/Suggester.java similarity index 69% rename from src/main/java/io/airlift/command/Suggester.java rename to src/main/java/io/airlift/airline/Suggester.java index cfadd571c..be8f96f29 100644 --- a/src/main/java/io/airlift/command/Suggester.java +++ b/src/main/java/io/airlift/airline/Suggester.java @@ -1,4 +1,4 @@ -package io.airlift.command; +package io.airlift.airline; public interface Suggester { diff --git a/src/main/java/io/airlift/command/TypeConverter.java b/src/main/java/io/airlift/airline/TypeConverter.java similarity index 99% rename from src/main/java/io/airlift/command/TypeConverter.java rename to src/main/java/io/airlift/airline/TypeConverter.java index e7a2af71b..ae4543f40 100644 --- a/src/main/java/io/airlift/command/TypeConverter.java +++ b/src/main/java/io/airlift/airline/TypeConverter.java @@ -1,4 +1,4 @@ -package io.airlift.command; +package io.airlift.airline; import com.google.common.base.Preconditions; diff --git a/src/main/java/io/airlift/command/UsageHelper.java b/src/main/java/io/airlift/airline/UsageHelper.java similarity index 95% rename from src/main/java/io/airlift/command/UsageHelper.java rename to src/main/java/io/airlift/airline/UsageHelper.java index ea3cfea9e..03ee79ca0 100644 --- a/src/main/java/io/airlift/command/UsageHelper.java +++ b/src/main/java/io/airlift/airline/UsageHelper.java @@ -1,13 +1,13 @@ -package io.airlift.command; +package io.airlift.airline; import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.collect.ComparisonChain; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.airlift.command.model.ArgumentsMetadata; -import io.airlift.command.model.CommandMetadata; -import io.airlift.command.model.OptionMetadata; +import io.airlift.airline.model.ArgumentsMetadata; +import io.airlift.airline.model.CommandMetadata; +import io.airlift.airline.model.OptionMetadata; import javax.annotation.Nullable; import java.util.Comparator; @@ -16,7 +16,7 @@ import static com.google.common.collect.Iterables.filter; import static com.google.common.collect.Iterables.transform; -import static io.airlift.command.model.OptionMetadata.isHiddenPredicate; +import static io.airlift.airline.model.OptionMetadata.isHiddenPredicate; public class UsageHelper { diff --git a/src/main/java/io/airlift/command/UsagePrinter.java b/src/main/java/io/airlift/airline/UsagePrinter.java similarity index 99% rename from src/main/java/io/airlift/command/UsagePrinter.java rename to src/main/java/io/airlift/airline/UsagePrinter.java index a31eb93ec..4c674ae07 100644 --- a/src/main/java/io/airlift/command/UsagePrinter.java +++ b/src/main/java/io/airlift/airline/UsagePrinter.java @@ -1,4 +1,4 @@ -package io.airlift.command; +package io.airlift.airline; import com.google.common.base.Splitter; diff --git a/src/main/java/io/airlift/command/model/ArgumentsMetadata.java b/src/main/java/io/airlift/airline/model/ArgumentsMetadata.java similarity index 98% rename from src/main/java/io/airlift/command/model/ArgumentsMetadata.java rename to src/main/java/io/airlift/airline/model/ArgumentsMetadata.java index 0cb94ba25..a5487e1b7 100644 --- a/src/main/java/io/airlift/command/model/ArgumentsMetadata.java +++ b/src/main/java/io/airlift/airline/model/ArgumentsMetadata.java @@ -1,9 +1,9 @@ -package io.airlift.command.model; +package io.airlift.airline.model; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import io.airlift.command.Accessor; +import io.airlift.airline.Accessor; import java.lang.reflect.Field; import java.util.Set; diff --git a/src/main/java/io/airlift/command/model/CommandGroupMetadata.java b/src/main/java/io/airlift/airline/model/CommandGroupMetadata.java similarity index 98% rename from src/main/java/io/airlift/command/model/CommandGroupMetadata.java rename to src/main/java/io/airlift/airline/model/CommandGroupMetadata.java index 08d7792c1..a7a778494 100644 --- a/src/main/java/io/airlift/command/model/CommandGroupMetadata.java +++ b/src/main/java/io/airlift/airline/model/CommandGroupMetadata.java @@ -1,4 +1,4 @@ -package io.airlift.command.model; +package io.airlift.airline.model; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/io/airlift/command/model/CommandMetadata.java b/src/main/java/io/airlift/airline/model/CommandMetadata.java similarity index 96% rename from src/main/java/io/airlift/command/model/CommandMetadata.java rename to src/main/java/io/airlift/airline/model/CommandMetadata.java index e9f4f647b..5cf95eb91 100644 --- a/src/main/java/io/airlift/command/model/CommandMetadata.java +++ b/src/main/java/io/airlift/airline/model/CommandMetadata.java @@ -1,10 +1,9 @@ -package io.airlift.command.model; +package io.airlift.airline.model; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; -import io.airlift.command.Accessor; +import io.airlift.airline.Accessor; -import javax.annotation.Nullable; import java.util.List; public class CommandMetadata diff --git a/src/main/java/io/airlift/command/model/GlobalMetadata.java b/src/main/java/io/airlift/airline/model/GlobalMetadata.java similarity index 98% rename from src/main/java/io/airlift/command/model/GlobalMetadata.java rename to src/main/java/io/airlift/airline/model/GlobalMetadata.java index 5307b0701..80dabab48 100644 --- a/src/main/java/io/airlift/command/model/GlobalMetadata.java +++ b/src/main/java/io/airlift/airline/model/GlobalMetadata.java @@ -1,4 +1,4 @@ -package io.airlift.command.model; +package io.airlift.airline.model; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/io/airlift/command/model/MetadataLoader.java b/src/main/java/io/airlift/airline/model/MetadataLoader.java similarity index 97% rename from src/main/java/io/airlift/command/model/MetadataLoader.java rename to src/main/java/io/airlift/airline/model/MetadataLoader.java index 0279108c9..bd27347de 100644 --- a/src/main/java/io/airlift/command/model/MetadataLoader.java +++ b/src/main/java/io/airlift/airline/model/MetadataLoader.java @@ -1,4 +1,4 @@ -package io.airlift.command.model; +package io.airlift.airline.model; import com.google.common.base.Function; import com.google.common.base.Preconditions; @@ -6,12 +6,12 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.ListMultimap; -import io.airlift.command.Accessor; -import io.airlift.command.Arguments; -import io.airlift.command.Command; -import io.airlift.command.Option; -import io.airlift.command.OptionType; -import io.airlift.command.Suggester; +import io.airlift.airline.Accessor; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; +import io.airlift.airline.Option; +import io.airlift.airline.OptionType; +import io.airlift.airline.Suggester; import javax.annotation.Nullable; import javax.inject.Inject; diff --git a/src/main/java/io/airlift/command/model/OptionMetadata.java b/src/main/java/io/airlift/airline/model/OptionMetadata.java similarity index 98% rename from src/main/java/io/airlift/command/model/OptionMetadata.java rename to src/main/java/io/airlift/airline/model/OptionMetadata.java index 05f42d824..095e0fad8 100644 --- a/src/main/java/io/airlift/command/model/OptionMetadata.java +++ b/src/main/java/io/airlift/airline/model/OptionMetadata.java @@ -1,12 +1,12 @@ -package io.airlift.command.model; +package io.airlift.airline.model; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import io.airlift.command.Accessor; -import io.airlift.command.OptionType; +import io.airlift.airline.Accessor; +import io.airlift.airline.OptionType; import javax.annotation.Nullable; import java.lang.reflect.Field; diff --git a/src/main/java/io/airlift/command/model/SuggesterMetadata.java b/src/main/java/io/airlift/airline/model/SuggesterMetadata.java similarity index 86% rename from src/main/java/io/airlift/command/model/SuggesterMetadata.java rename to src/main/java/io/airlift/airline/model/SuggesterMetadata.java index c1fbba906..fb0fcb519 100644 --- a/src/main/java/io/airlift/command/model/SuggesterMetadata.java +++ b/src/main/java/io/airlift/airline/model/SuggesterMetadata.java @@ -1,8 +1,8 @@ -package io.airlift.command.model; +package io.airlift.airline.model; import com.google.common.collect.ImmutableList; -import io.airlift.command.Accessor; -import io.airlift.command.Suggester; +import io.airlift.airline.Accessor; +import io.airlift.airline.Suggester; import java.util.List; diff --git a/src/test/java/io/airlift/command/ArgsRequiredWrongMain.java b/src/test/java/io/airlift/airline/ArgsRequiredWrongMain.java similarity index 83% rename from src/test/java/io/airlift/command/ArgsRequiredWrongMain.java rename to src/test/java/io/airlift/airline/ArgsRequiredWrongMain.java index d3990a53c..5036fe237 100644 --- a/src/test/java/io/airlift/command/ArgsRequiredWrongMain.java +++ b/src/test/java/io/airlift/airline/ArgsRequiredWrongMain.java @@ -1,4 +1,4 @@ -package io.airlift.command; +package io.airlift.airline; @Command(name="ArgsRequiredWrongMain") public class ArgsRequiredWrongMain diff --git a/src/test/java/io/airlift/command/CommandTest.java b/src/test/java/io/airlift/airline/CommandTest.java similarity index 93% rename from src/test/java/io/airlift/command/CommandTest.java rename to src/test/java/io/airlift/airline/CommandTest.java index 36322d924..e2c203ffd 100644 --- a/src/test/java/io/airlift/command/CommandTest.java +++ b/src/test/java/io/airlift/airline/CommandTest.java @@ -16,27 +16,27 @@ * limitations under the License. */ -package io.airlift.command; +package io.airlift.airline; import com.google.common.collect.ImmutableList; -import io.airlift.command.Cli.CliBuilder; -import io.airlift.command.args.Args1; -import io.airlift.command.args.Args2; -import io.airlift.command.args.ArgsArityString; -import io.airlift.command.args.ArgsBooleanArity; -import io.airlift.command.args.ArgsBooleanArity0; -import io.airlift.command.args.ArgsEnum; -import io.airlift.command.args.ArgsInherited; -import io.airlift.command.args.ArgsMultipleUnparsed; -import io.airlift.command.args.ArgsOutOfMemory; -import io.airlift.command.args.ArgsPrivate; -import io.airlift.command.args.ArgsRequired; -import io.airlift.command.args.ArgsSingleChar; -import io.airlift.command.args.Arity1; -import io.airlift.command.args.OptionsRequired; -import io.airlift.command.command.CommandAdd; -import io.airlift.command.command.CommandCommit; -import io.airlift.command.model.CommandMetadata; +import io.airlift.airline.Cli.CliBuilder; +import io.airlift.airline.args.Args1; +import io.airlift.airline.args.Args2; +import io.airlift.airline.args.ArgsArityString; +import io.airlift.airline.args.ArgsBooleanArity; +import io.airlift.airline.args.ArgsBooleanArity0; +import io.airlift.airline.args.ArgsEnum; +import io.airlift.airline.args.ArgsInherited; +import io.airlift.airline.args.ArgsMultipleUnparsed; +import io.airlift.airline.args.ArgsOutOfMemory; +import io.airlift.airline.args.ArgsPrivate; +import io.airlift.airline.args.ArgsRequired; +import io.airlift.airline.args.ArgsSingleChar; +import io.airlift.airline.args.Arity1; +import io.airlift.airline.args.OptionsRequired; +import io.airlift.airline.command.CommandAdd; +import io.airlift.airline.command.CommandCommit; +import io.airlift.airline.model.CommandMetadata; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -48,7 +48,7 @@ import static com.google.common.base.Predicates.compose; import static com.google.common.base.Predicates.equalTo; import static com.google.common.collect.Iterables.find; -import static io.airlift.command.TestUtil.singleCommandParser; +import static io.airlift.airline.TestUtil.singleCommandParser; @Test public class CommandTest diff --git a/src/test/java/io/airlift/command/GalaxyCommandLineParser.java b/src/test/java/io/airlift/airline/GalaxyCommandLineParser.java similarity index 99% rename from src/test/java/io/airlift/command/GalaxyCommandLineParser.java rename to src/test/java/io/airlift/airline/GalaxyCommandLineParser.java index 639bfc5a4..9d3c068f0 100644 --- a/src/test/java/io/airlift/command/GalaxyCommandLineParser.java +++ b/src/test/java/io/airlift/airline/GalaxyCommandLineParser.java @@ -1,16 +1,16 @@ -package io.airlift.command; +package io.airlift.airline; import com.google.common.base.Joiner; import com.google.common.base.Objects; import com.google.common.collect.Lists; -import io.airlift.command.Cli.CliBuilder; +import io.airlift.airline.Cli.CliBuilder; import org.testng.annotations.Test; import javax.inject.Inject; import java.util.List; import static com.google.common.collect.Lists.newArrayList; -import static io.airlift.command.OptionType.GLOBAL; +import static io.airlift.airline.OptionType.GLOBAL; public class GalaxyCommandLineParser { diff --git a/src/test/java/io/airlift/command/Git.java b/src/test/java/io/airlift/airline/Git.java similarity index 94% rename from src/test/java/io/airlift/command/Git.java rename to src/test/java/io/airlift/airline/Git.java index 4f9ebd92e..5a508fa58 100644 --- a/src/test/java/io/airlift/command/Git.java +++ b/src/test/java/io/airlift/airline/Git.java @@ -1,10 +1,10 @@ -package io.airlift.command; +package io.airlift.airline; -import io.airlift.command.Cli.CliBuilder; +import io.airlift.airline.Cli.CliBuilder; import java.util.List; -import static io.airlift.command.OptionType.GLOBAL; +import static io.airlift.airline.OptionType.GLOBAL; public class Git { diff --git a/src/test/java/io/airlift/command/GitTest.java b/src/test/java/io/airlift/airline/GitTest.java similarity index 96% rename from src/test/java/io/airlift/command/GitTest.java rename to src/test/java/io/airlift/airline/GitTest.java index 72a195394..87069fb11 100644 --- a/src/test/java/io/airlift/command/GitTest.java +++ b/src/test/java/io/airlift/airline/GitTest.java @@ -1,4 +1,4 @@ -package io.airlift.command; +package io.airlift.airline; import com.google.common.base.Joiner; import org.testng.annotations.Test; diff --git a/src/test/java/io/airlift/command/HelpTest.java b/src/test/java/io/airlift/airline/HelpTest.java similarity index 96% rename from src/test/java/io/airlift/command/HelpTest.java rename to src/test/java/io/airlift/airline/HelpTest.java index dd2be7a7d..77c1aaf2e 100644 --- a/src/test/java/io/airlift/command/HelpTest.java +++ b/src/test/java/io/airlift/airline/HelpTest.java @@ -15,26 +15,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.command; +package io.airlift.airline; import com.google.common.collect.ImmutableList; -import io.airlift.command.Cli.CliBuilder; -import io.airlift.command.Git.Add; -import io.airlift.command.Git.RemoteAdd; -import io.airlift.command.Git.RemoteShow; -import io.airlift.command.args.Args1; -import io.airlift.command.args.Args2; -import io.airlift.command.args.ArgsArityString; -import io.airlift.command.args.ArgsBooleanArity; -import io.airlift.command.args.ArgsInherited; -import io.airlift.command.args.ArgsRequired; -import io.airlift.command.args.CommandHidden; -import io.airlift.command.args.OptionsHidden; -import io.airlift.command.args.OptionsRequired; +import io.airlift.airline.Cli.CliBuilder; +import io.airlift.airline.Git.Add; +import io.airlift.airline.Git.RemoteAdd; +import io.airlift.airline.Git.RemoteShow; +import io.airlift.airline.args.Args1; +import io.airlift.airline.args.Args2; +import io.airlift.airline.args.ArgsArityString; +import io.airlift.airline.args.ArgsBooleanArity; +import io.airlift.airline.args.ArgsInherited; +import io.airlift.airline.args.ArgsRequired; +import io.airlift.airline.args.CommandHidden; +import io.airlift.airline.args.OptionsHidden; +import io.airlift.airline.args.OptionsRequired; import org.testng.Assert; import org.testng.annotations.Test; -import static io.airlift.command.SingleCommand.singleCommand; +import static io.airlift.airline.SingleCommand.singleCommand; @Test public class HelpTest diff --git a/src/test/java/io/airlift/command/ParametersDelegateTest.java b/src/test/java/io/airlift/airline/ParametersDelegateTest.java similarity index 98% rename from src/test/java/io/airlift/command/ParametersDelegateTest.java rename to src/test/java/io/airlift/airline/ParametersDelegateTest.java index 6970f4645..e42452b99 100644 --- a/src/test/java/io/airlift/command/ParametersDelegateTest.java +++ b/src/test/java/io/airlift/airline/ParametersDelegateTest.java @@ -1,4 +1,4 @@ -package io.airlift.command; +package io.airlift.airline; import com.google.common.collect.ImmutableList; import org.testng.Assert; @@ -8,7 +8,7 @@ import java.util.List; import static com.google.common.collect.Lists.newArrayList; -import static io.airlift.command.TestUtil.singleCommandParser; +import static io.airlift.airline.TestUtil.singleCommandParser; /** * @author dain diff --git a/src/test/java/io/airlift/command/Ping.java b/src/test/java/io/airlift/airline/Ping.java similarity index 95% rename from src/test/java/io/airlift/command/Ping.java rename to src/test/java/io/airlift/airline/Ping.java index 62fb285a9..2df9d8121 100644 --- a/src/test/java/io/airlift/command/Ping.java +++ b/src/test/java/io/airlift/airline/Ping.java @@ -1,4 +1,4 @@ -package io.airlift.command; +package io.airlift.airline; import javax.inject.Inject; diff --git a/src/test/java/io/airlift/command/PingTest.java b/src/test/java/io/airlift/airline/PingTest.java similarity index 94% rename from src/test/java/io/airlift/command/PingTest.java rename to src/test/java/io/airlift/airline/PingTest.java index c57bbda58..3d3ccbbb4 100644 --- a/src/test/java/io/airlift/command/PingTest.java +++ b/src/test/java/io/airlift/airline/PingTest.java @@ -1,4 +1,4 @@ -package io.airlift.command; +package io.airlift.airline; import com.google.common.base.Joiner; import org.testng.annotations.Test; diff --git a/src/test/java/io/airlift/command/SingleCommandTest.java b/src/test/java/io/airlift/airline/SingleCommandTest.java similarity index 92% rename from src/test/java/io/airlift/command/SingleCommandTest.java rename to src/test/java/io/airlift/airline/SingleCommandTest.java index a413a8e59..5439f6802 100644 --- a/src/test/java/io/airlift/command/SingleCommandTest.java +++ b/src/test/java/io/airlift/airline/SingleCommandTest.java @@ -16,27 +16,27 @@ * limitations under the License. */ -package io.airlift.command; +package io.airlift.airline; import com.google.common.collect.ImmutableList; -import io.airlift.command.Cli.CliBuilder; -import io.airlift.command.args.Args1; -import io.airlift.command.args.Args2; -import io.airlift.command.args.ArgsArityString; -import io.airlift.command.args.ArgsBooleanArity; -import io.airlift.command.args.ArgsBooleanArity0; -import io.airlift.command.args.ArgsEnum; -import io.airlift.command.args.ArgsInherited; -import io.airlift.command.args.ArgsMultipleUnparsed; -import io.airlift.command.args.ArgsOutOfMemory; -import io.airlift.command.args.ArgsPrivate; -import io.airlift.command.args.ArgsRequired; -import io.airlift.command.args.ArgsSingleChar; -import io.airlift.command.args.Arity1; -import io.airlift.command.args.OptionsRequired; -import io.airlift.command.command.CommandAdd; -import io.airlift.command.command.CommandCommit; -import io.airlift.command.model.CommandMetadata; +import io.airlift.airline.Cli.CliBuilder; +import io.airlift.airline.args.Args1; +import io.airlift.airline.args.Args2; +import io.airlift.airline.args.ArgsArityString; +import io.airlift.airline.args.ArgsBooleanArity; +import io.airlift.airline.args.ArgsBooleanArity0; +import io.airlift.airline.args.ArgsEnum; +import io.airlift.airline.args.ArgsInherited; +import io.airlift.airline.args.ArgsMultipleUnparsed; +import io.airlift.airline.args.ArgsOutOfMemory; +import io.airlift.airline.args.ArgsPrivate; +import io.airlift.airline.args.ArgsRequired; +import io.airlift.airline.args.ArgsSingleChar; +import io.airlift.airline.args.Arity1; +import io.airlift.airline.args.OptionsRequired; +import io.airlift.airline.command.CommandAdd; +import io.airlift.airline.command.CommandCommit; +import io.airlift.airline.model.CommandMetadata; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -50,7 +50,7 @@ import static com.google.common.base.Predicates.compose; import static com.google.common.base.Predicates.equalTo; import static com.google.common.collect.Iterables.find; -import static io.airlift.command.SingleCommand.singleCommand; +import static io.airlift.airline.SingleCommand.singleCommand; import static org.testng.Assert.assertTrue; @Test diff --git a/src/test/java/io/airlift/command/TestUtil.java b/src/test/java/io/airlift/airline/TestUtil.java similarity index 88% rename from src/test/java/io/airlift/command/TestUtil.java rename to src/test/java/io/airlift/airline/TestUtil.java index 0c1499a9e..5dbf3ce01 100644 --- a/src/test/java/io/airlift/command/TestUtil.java +++ b/src/test/java/io/airlift/airline/TestUtil.java @@ -1,4 +1,4 @@ -package io.airlift.command; +package io.airlift.airline; public class TestUtil { diff --git a/src/test/java/io/airlift/command/args/Args1.java b/src/test/java/io/airlift/airline/args/Args1.java similarity index 92% rename from src/test/java/io/airlift/command/args/Args1.java rename to src/test/java/io/airlift/airline/args/Args1.java index 64810cb54..65a994d14 100644 --- a/src/test/java/io/airlift/command/args/Args1.java +++ b/src/test/java/io/airlift/airline/args/Args1.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package io.airlift.command.args; +package io.airlift.airline.args; import com.google.common.collect.Lists; -import io.airlift.command.Arguments; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import java.math.BigDecimal; import java.util.Date; diff --git a/src/test/java/io/airlift/command/args/Args2.java b/src/test/java/io/airlift/airline/args/Args2.java similarity index 91% rename from src/test/java/io/airlift/command/args/Args2.java rename to src/test/java/io/airlift/airline/args/Args2.java index db466a734..e14ad5390 100644 --- a/src/test/java/io/airlift/command/args/Args2.java +++ b/src/test/java/io/airlift/airline/args/Args2.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package io.airlift.command.args; +package io.airlift.airline.args; -import io.airlift.command.Arguments; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import java.util.List; diff --git a/src/test/java/io/airlift/command/args/ArgsArityString.java b/src/test/java/io/airlift/airline/args/ArgsArityString.java similarity index 88% rename from src/test/java/io/airlift/command/args/ArgsArityString.java rename to src/test/java/io/airlift/airline/args/ArgsArityString.java index cc1b9862d..6f812880b 100644 --- a/src/test/java/io/airlift/command/args/ArgsArityString.java +++ b/src/test/java/io/airlift/airline/args/ArgsArityString.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package io.airlift.command.args; +package io.airlift.airline.args; -import io.airlift.command.Arguments; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import java.util.List; diff --git a/src/test/java/io/airlift/command/args/ArgsBooleanArity.java b/src/test/java/io/airlift/airline/args/ArgsBooleanArity.java similarity index 89% rename from src/test/java/io/airlift/command/args/ArgsBooleanArity.java rename to src/test/java/io/airlift/airline/args/ArgsBooleanArity.java index eff2b6d41..f5d0b632a 100644 --- a/src/test/java/io/airlift/command/args/ArgsBooleanArity.java +++ b/src/test/java/io/airlift/airline/args/ArgsBooleanArity.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package io.airlift.command.args; +package io.airlift.airline.args; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Command; +import io.airlift.airline.Option; @Command(name="ArgsBooleanArity") public class ArgsBooleanArity diff --git a/src/test/java/io/airlift/command/args/ArgsBooleanArity0.java b/src/test/java/io/airlift/airline/args/ArgsBooleanArity0.java similarity index 89% rename from src/test/java/io/airlift/command/args/ArgsBooleanArity0.java rename to src/test/java/io/airlift/airline/args/ArgsBooleanArity0.java index 730d05555..ce2f81727 100644 --- a/src/test/java/io/airlift/command/args/ArgsBooleanArity0.java +++ b/src/test/java/io/airlift/airline/args/ArgsBooleanArity0.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package io.airlift.command.args; +package io.airlift.airline.args; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Command; +import io.airlift.airline.Option; @Command(name="ArgsBooleanArity0") public class ArgsBooleanArity0 diff --git a/src/test/java/io/airlift/command/args/ArgsDefault.java b/src/test/java/io/airlift/airline/args/ArgsDefault.java similarity index 92% rename from src/test/java/io/airlift/command/args/ArgsDefault.java rename to src/test/java/io/airlift/airline/args/ArgsDefault.java index ea7b23460..4dbb39097 100644 --- a/src/test/java/io/airlift/command/args/ArgsDefault.java +++ b/src/test/java/io/airlift/airline/args/ArgsDefault.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package io.airlift.command.args; +package io.airlift.airline.args; import com.google.common.collect.Lists; -import io.airlift.command.Arguments; -import io.airlift.command.Option; +import io.airlift.airline.Arguments; +import io.airlift.airline.Option; import java.util.List; diff --git a/src/test/java/io/airlift/command/args/ArgsEnum.java b/src/test/java/io/airlift/airline/args/ArgsEnum.java similarity index 90% rename from src/test/java/io/airlift/command/args/ArgsEnum.java rename to src/test/java/io/airlift/airline/args/ArgsEnum.java index ac388a9f9..df8111c5b 100644 --- a/src/test/java/io/airlift/command/args/ArgsEnum.java +++ b/src/test/java/io/airlift/airline/args/ArgsEnum.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package io.airlift.command.args; +package io.airlift.airline.args; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Command; +import io.airlift.airline.Option; /** * Test enums. diff --git a/src/test/java/io/airlift/command/args/ArgsInherited.java b/src/test/java/io/airlift/airline/args/ArgsInherited.java similarity index 89% rename from src/test/java/io/airlift/command/args/ArgsInherited.java rename to src/test/java/io/airlift/airline/args/ArgsInherited.java index 8ce1ed64b..23349c2ce 100644 --- a/src/test/java/io/airlift/command/args/ArgsInherited.java +++ b/src/test/java/io/airlift/airline/args/ArgsInherited.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package io.airlift.command.args; +package io.airlift.airline.args; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Command; +import io.airlift.airline.Option; @Command(name="ArgsInherited") public class ArgsInherited extends ArgsDefault diff --git a/src/test/java/io/airlift/command/args/ArgsMultipleUnparsed.java b/src/test/java/io/airlift/airline/args/ArgsMultipleUnparsed.java similarity index 91% rename from src/test/java/io/airlift/command/args/ArgsMultipleUnparsed.java rename to src/test/java/io/airlift/airline/args/ArgsMultipleUnparsed.java index 98ef56790..0eab6c1a4 100644 --- a/src/test/java/io/airlift/command/args/ArgsMultipleUnparsed.java +++ b/src/test/java/io/airlift/airline/args/ArgsMultipleUnparsed.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package io.airlift.command.args; +package io.airlift.airline.args; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; /** * Error case if multiple unparsed (without a names attribute) arguments are defined. diff --git a/src/test/java/io/airlift/command/args/ArgsOutOfMemory.java b/src/test/java/io/airlift/airline/args/ArgsOutOfMemory.java similarity index 79% rename from src/test/java/io/airlift/command/args/ArgsOutOfMemory.java rename to src/test/java/io/airlift/airline/args/ArgsOutOfMemory.java index daab12ab9..800de9a71 100644 --- a/src/test/java/io/airlift/command/args/ArgsOutOfMemory.java +++ b/src/test/java/io/airlift/airline/args/ArgsOutOfMemory.java @@ -1,7 +1,7 @@ -package io.airlift.command.args; +package io.airlift.airline.args; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Command; +import io.airlift.airline.Option; @Command(name="ArgsOutOfMemory") public class ArgsOutOfMemory diff --git a/src/test/java/io/airlift/command/args/ArgsPrivate.java b/src/test/java/io/airlift/airline/args/ArgsPrivate.java similarity index 90% rename from src/test/java/io/airlift/command/args/ArgsPrivate.java rename to src/test/java/io/airlift/airline/args/ArgsPrivate.java index 3613d7f79..a9f9c71f7 100644 --- a/src/test/java/io/airlift/command/args/ArgsPrivate.java +++ b/src/test/java/io/airlift/airline/args/ArgsPrivate.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package io.airlift.command.args; +package io.airlift.airline.args; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Command; +import io.airlift.airline.Option; @Command(name="ArgsPrivate") public class ArgsPrivate diff --git a/src/test/java/io/airlift/command/args/ArgsRequired.java b/src/test/java/io/airlift/airline/args/ArgsRequired.java similarity index 90% rename from src/test/java/io/airlift/command/args/ArgsRequired.java rename to src/test/java/io/airlift/airline/args/ArgsRequired.java index 33e04586e..b5cf46903 100644 --- a/src/test/java/io/airlift/command/args/ArgsRequired.java +++ b/src/test/java/io/airlift/airline/args/ArgsRequired.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package io.airlift.command.args; +package io.airlift.airline.args; -import io.airlift.command.Arguments; -import io.airlift.command.Command; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; import java.util.List; diff --git a/src/test/java/io/airlift/command/args/ArgsSingleChar.java b/src/test/java/io/airlift/airline/args/ArgsSingleChar.java similarity index 92% rename from src/test/java/io/airlift/command/args/ArgsSingleChar.java rename to src/test/java/io/airlift/airline/args/ArgsSingleChar.java index 272e9df56..4da491a82 100644 --- a/src/test/java/io/airlift/command/args/ArgsSingleChar.java +++ b/src/test/java/io/airlift/airline/args/ArgsSingleChar.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package io.airlift.command.args; +package io.airlift.airline.args; import com.google.common.collect.Lists; -import io.airlift.command.Arguments; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import java.util.List; diff --git a/src/test/java/io/airlift/command/args/Arity1.java b/src/test/java/io/airlift/airline/args/Arity1.java similarity index 60% rename from src/test/java/io/airlift/command/args/Arity1.java rename to src/test/java/io/airlift/airline/args/Arity1.java index 7af81b5ed..638da4e9f 100644 --- a/src/test/java/io/airlift/command/args/Arity1.java +++ b/src/test/java/io/airlift/airline/args/Arity1.java @@ -1,7 +1,7 @@ -package io.airlift.command.args; +package io.airlift.airline.args; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Command; +import io.airlift.airline.Option; @Command(name="Arity1") public class Arity1 diff --git a/src/test/java/io/airlift/command/args/CommandHidden.java b/src/test/java/io/airlift/airline/args/CommandHidden.java similarity index 90% rename from src/test/java/io/airlift/command/args/CommandHidden.java rename to src/test/java/io/airlift/airline/args/CommandHidden.java index 1ab21200f..20fdde8a5 100644 --- a/src/test/java/io/airlift/command/args/CommandHidden.java +++ b/src/test/java/io/airlift/airline/args/CommandHidden.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package io.airlift.command.args; +package io.airlift.airline.args; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Command; +import io.airlift.airline.Option; @Command(name="CommandHidden", hidden = true) public class CommandHidden diff --git a/src/test/java/io/airlift/command/args/CommandLineArgs.java b/src/test/java/io/airlift/airline/args/CommandLineArgs.java similarity index 96% rename from src/test/java/io/airlift/command/args/CommandLineArgs.java rename to src/test/java/io/airlift/airline/args/CommandLineArgs.java index f2c9b8d2a..9b61e269c 100644 --- a/src/test/java/io/airlift/command/args/CommandLineArgs.java +++ b/src/test/java/io/airlift/airline/args/CommandLineArgs.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package io.airlift.command.args; +package io.airlift.airline.args; -import io.airlift.command.Arguments; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import java.util.List; diff --git a/src/test/java/io/airlift/command/args/OptionsHidden.java b/src/test/java/io/airlift/airline/args/OptionsHidden.java similarity index 90% rename from src/test/java/io/airlift/command/args/OptionsHidden.java rename to src/test/java/io/airlift/airline/args/OptionsHidden.java index fc867a959..7263e949b 100644 --- a/src/test/java/io/airlift/command/args/OptionsHidden.java +++ b/src/test/java/io/airlift/airline/args/OptionsHidden.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package io.airlift.command.args; +package io.airlift.airline.args; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Command; +import io.airlift.airline.Option; @Command(name="OptionsHidden") public class OptionsHidden diff --git a/src/test/java/io/airlift/command/args/OptionsRequired.java b/src/test/java/io/airlift/airline/args/OptionsRequired.java similarity index 85% rename from src/test/java/io/airlift/command/args/OptionsRequired.java rename to src/test/java/io/airlift/airline/args/OptionsRequired.java index 615144ddf..b42576595 100644 --- a/src/test/java/io/airlift/command/args/OptionsRequired.java +++ b/src/test/java/io/airlift/airline/args/OptionsRequired.java @@ -16,13 +16,10 @@ * limitations under the License. */ -package io.airlift.command.args; +package io.airlift.airline.args; -import io.airlift.command.Arguments; -import io.airlift.command.Command; -import io.airlift.command.Option; - -import java.util.List; +import io.airlift.airline.Command; +import io.airlift.airline.Option; @Command(name="OptionsRequired") public class OptionsRequired diff --git a/src/test/java/io/airlift/command/command/CommandAdd.java b/src/test/java/io/airlift/airline/command/CommandAdd.java similarity index 88% rename from src/test/java/io/airlift/command/command/CommandAdd.java rename to src/test/java/io/airlift/airline/command/CommandAdd.java index f558ba807..bceb5ff50 100644 --- a/src/test/java/io/airlift/command/command/CommandAdd.java +++ b/src/test/java/io/airlift/airline/command/CommandAdd.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package io.airlift.command.command; +package io.airlift.airline.command; -import io.airlift.command.Arguments; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import javax.inject.Inject; import java.util.List; diff --git a/src/test/java/io/airlift/command/command/CommandCommit.java b/src/test/java/io/airlift/airline/command/CommandCommit.java similarity index 89% rename from src/test/java/io/airlift/command/command/CommandCommit.java rename to src/test/java/io/airlift/airline/command/CommandCommit.java index e1f91a4c3..e62dc7892 100644 --- a/src/test/java/io/airlift/command/command/CommandCommit.java +++ b/src/test/java/io/airlift/airline/command/CommandCommit.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package io.airlift.command.command; +package io.airlift.airline.command; -import io.airlift.command.Arguments; -import io.airlift.command.Command; -import io.airlift.command.Option; +import io.airlift.airline.Arguments; +import io.airlift.airline.Command; +import io.airlift.airline.Option; import javax.inject.Inject; import java.util.List; diff --git a/src/test/java/io/airlift/command/command/CommandMain.java b/src/test/java/io/airlift/airline/command/CommandMain.java similarity index 87% rename from src/test/java/io/airlift/command/command/CommandMain.java rename to src/test/java/io/airlift/airline/command/CommandMain.java index 30321631c..6da9fe99b 100644 --- a/src/test/java/io/airlift/command/command/CommandMain.java +++ b/src/test/java/io/airlift/airline/command/CommandMain.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package io.airlift.command.command; +package io.airlift.airline.command; -import io.airlift.command.Option; +import io.airlift.airline.Option; -import static io.airlift.command.OptionType.GLOBAL; +import static io.airlift.airline.OptionType.GLOBAL; public class CommandMain { diff --git a/src/test/java/io/airlift/command/command/CommandTest.java b/src/test/java/io/airlift/airline/command/CommandTest.java similarity index 94% rename from src/test/java/io/airlift/command/command/CommandTest.java rename to src/test/java/io/airlift/airline/command/CommandTest.java index 5461aabd7..531b99441 100644 --- a/src/test/java/io/airlift/command/command/CommandTest.java +++ b/src/test/java/io/airlift/airline/command/CommandTest.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package io.airlift.command.command; +package io.airlift.airline.command; -import io.airlift.command.Cli; +import io.airlift.airline.Cli; import org.testng.Assert; import org.testng.annotations.Test; import java.util.Arrays; -import static io.airlift.command.TestUtil.singleCommandParser; +import static io.airlift.airline.TestUtil.singleCommandParser; public class CommandTest {