Complex command invocation structures #131

* renaming CommandRefWithDecorator to CommandRefDecorated
bootique · Nov 28, 2017 · 8ff4677 · 8ff4677
1 parent f3f7f99
commit 8ff4677
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/bootique/src/main/java/io/bootique/BQCoreModule.java b/bootique/src/main/java/io/bootique/BQCoreModule.java
@@ -21,7 +21,7 @@
 import io.bootique.command.CommandDispatchThreadFactory;
 import io.bootique.command.CommandManager;
 import io.bootique.command.CommandManagerBuilder;
-import io.bootique.command.CommandRefWithDecorator;
+import io.bootique.command.CommandRefDecorated;
 import io.bootique.command.ExecutionPlanBuilder;
 import io.bootique.config.CliConfigurationSource;
 import io.bootique.config.ConfigurationFactory;
@@ -311,7 +311,7 @@ Cli provideCli(CliFactory cliFactory, @Args String[] args) {
     ExecutionPlanBuilder provideExecutionPlanBuilder(
             Provider<CliFactory> cliFactoryProvider,
             Provider<CommandManager> commandManagerProvider,
-            Set<CommandRefWithDecorator> commandDecorators,
+            Set<CommandRefDecorated> commandDecorators,
             BootLogger logger,
             ShutdownManager shutdownManager) {
 

diff --git a/bootique/src/main/java/io/bootique/BQCoreModuleExtender.java b/bootique/src/main/java/io/bootique/BQCoreModuleExtender.java
@@ -11,7 +11,7 @@
 import io.bootique.annotation.LogLevels;
 import io.bootique.command.Command;
 import io.bootique.command.CommandDecorator;
-import io.bootique.command.CommandRefWithDecorator;
+import io.bootique.command.CommandRefDecorated;
 import io.bootique.env.DeclaredVariable;
 import io.bootique.meta.application.OptionMetadata;
 
@@ -34,7 +34,7 @@ public class BQCoreModuleExtender extends ModuleExtender<BQCoreModuleExtender> {
     private Multibinder<DeclaredVariable> declaredVariables;
     private Multibinder<OptionMetadata> options;
     private Multibinder<Command> commands;
-    private Multibinder<CommandRefWithDecorator> commandDecorators;
+    private Multibinder<CommandRefDecorated> commandDecorators;
 
     protected BQCoreModuleExtender(Binder binder) {
         super(binder);
@@ -240,7 +240,7 @@ public BQCoreModuleExtender addCommand(Class<? extends Command> commandType) {
      * @since 0.25
      */
     public BQCoreModuleExtender decorateCommand(Class<? extends Command> commandType, CommandDecorator commandDecorator) {
-        contributeCommandDecorators().addBinding().toInstance(new CommandRefWithDecorator(commandType, commandDecorator));
+        contributeCommandDecorators().addBinding().toInstance(new CommandRefDecorated(commandType, commandDecorator));
         return this;
     }
 
@@ -263,8 +263,8 @@ protected Multibinder<Command> contributeCommands() {
         return commands != null ? commands : (commands = newSet(Command.class));
     }
 
-    protected Multibinder<CommandRefWithDecorator> contributeCommandDecorators() {
+    protected Multibinder<CommandRefDecorated> contributeCommandDecorators() {
-        return commandDecorators != null ? commandDecorators : (commandDecorators = newSet(CommandRefWithDecorator.class));
+        return commandDecorators != null ? commandDecorators : (commandDecorators = newSet(CommandRefDecorated.class));
     }
 
     protected MapBinder<String, String> contributeProperties() {

diff --git a/...ique/command/CommandRefWithDecorator.java → ...bootique/command/CommandRefDecorated.java b/...ique/command/CommandRefWithDecorator.java → ...bootique/command/CommandRefDecorated.java
@@ -1,14 +1,16 @@
 package io.bootique.command;
 
 /**
+ * An internal data structure that denotes a reference to a command combined with that command decorator.
+ *
  * @since 0.25
  */
-public class CommandRefWithDecorator {
+public class CommandRefDecorated {
 
     private Class<? extends Command> commandType;
     private CommandDecorator decorator;
 
-    public CommandRefWithDecorator(Class<? extends Command> commandType, CommandDecorator decorator) {
+    public CommandRefDecorated(Class<? extends Command> commandType, CommandDecorator decorator) {
         this.commandType = commandType;
         this.decorator = decorator;
     }

diff --git a/bootique/src/main/java/io/bootique/command/ExecutionPlanBuilder.java b/bootique/src/main/java/io/bootique/command/ExecutionPlanBuilder.java
@@ -39,7 +39,7 @@ public ExecutionPlanBuilder(
     }
 
     public static Map<Class<? extends Command>, CommandDecorator> mergeDecorators(
-            Set<CommandRefWithDecorator> decoratorSet) {
+            Set<CommandRefDecorated> decoratorSet) {
 
 
         if (decoratorSet.isEmpty()) {