Rename manager factories and add methods with builder functions (#13)

Author: jpenilla

cloud-processors-confirmation/src/main/java/org/incendo/cloud/processors/confirmation/ConfirmationManager.java

@@ -27,6 +27,7 @@
 import java.time.Instant;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.function.Function;
 import org.apiguardian.api.API;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.incendo.cloud.Command;
@@ -60,10 +61,24 @@ public final class ConfirmationManager<C> implements Command.Builder.Applicable<
      * @param configuration configuration for the confirmation manager
      * @return the created manager
      */
-    public static <C> @NonNull ConfirmationManager<C> of(final @NonNull ConfirmationConfiguration<C> configuration) {
+    public static <C> @NonNull ConfirmationManager<C> confirmationManager(final @NonNull ConfirmationConfiguration<C> configuration) {
         return new ConfirmationManager<>(Objects.requireNonNull(configuration, "configuration"));
     }
 
+    /**
+     * Creates a new confirmation manager using the given {@code configuration}.
+     *
+     * @param <C>           command sender type
+     * @param configuration configuration for the confirmation manager
+     * @return the created manager
+     */
+    public static <C> @NonNull ConfirmationManager<C> confirmationManager(
+            final @NonNull Function<ImmutableConfirmationConfiguration.@NonNull CacheBuildStage<C>,
+                    ImmutableConfirmationConfiguration.@NonNull BuildFinal<C>> configuration
+    ) {
+        return confirmationManager(configuration.apply(ConfirmationConfiguration.builder()).build());
+    }
+
     private final CloudCache<C, ConfirmationContext<C>> cache;
     private final ConfirmationConfiguration<C> configuration;
 

cloud-processors-confirmation/src/test/java/org/incendo/cloud/processors/confirmation/ConfirmationManagerTest.java

@@ -63,12 +63,11 @@ class ConfirmationManagerTest {
     @BeforeEach
     void setup() {
         this.commandManager = new TestCommandManager();
-        this.confirmationManager = ConfirmationManager.of(
-                ConfirmationConfiguration.<TestCommandSender>builder()
+        this.confirmationManager = ConfirmationManager.confirmationManager(
+                configBuilder -> configBuilder
                         .cache(SimpleCache.of())
                         .noPendingCommandNotifier(this.noPendingCommandNotifier)
                         .confirmationRequiredNotifier(this.confirmationRequiredNotifier)
-                        .build()
         );
         this.commandManager.registerCommandPostProcessor(this.confirmationManager.createPostprocessor());
     }

cloud-processors-cooldown/src/main/java/org/incendo/cloud/processors/cooldown/CooldownManager.java

@@ -25,6 +25,7 @@
 
 import io.leangen.geantyref.TypeToken;
 import java.util.Objects;
+import java.util.function.Function;
 import org.apiguardian.api.API;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.incendo.cloud.execution.postprocessor.CommandPostprocessor;
@@ -49,16 +50,30 @@ public final class CooldownManager<C> {
     );
 
     /**
-     * Creates a new confirmation manager using the given {@code configuration}.
+     * Creates a new cooldown manager using the given {@code configuration}.
      *
      * @param <C>           command sender type
-     * @param configuration configuration for the confirmation manager
+     * @param configuration configuration for the cooldown manager
      * @return the created manager
      */
-    public static <C> @NonNull CooldownManager<C> of(final @NonNull CooldownConfiguration<C> configuration) {
+    public static <C> @NonNull CooldownManager<C> cooldownManager(final @NonNull CooldownConfiguration<C> configuration) {
         return new CooldownManager<>(Objects.requireNonNull(configuration, "configuration"));
     }
 
+    /**
+     * Creates a new cooldown manager using the given {@code configuration}.
+     *
+     * @param <C>           command sender type
+     * @param configuration configuration for the cooldown manager
+     * @return the created manager
+     */
+    public static <C> @NonNull CooldownManager<C> cooldownManager(
+            final @NonNull Function<ImmutableCooldownConfiguration.RepositoryBuildStage<C>,
+                    ImmutableCooldownConfiguration.BuildFinal<C>> configuration
+    ) {
+        return cooldownManager(configuration.apply(CooldownConfiguration.builder()).build());
+    }
+
     private final CooldownRepository<C> repository;
     private final CooldownConfiguration<C> configuration;
 

cloud-processors-cooldown/src/test/java/org/incendo/cloud/processors/confirmation/CooldownManagerTest.java

@@ -33,7 +33,6 @@
 import org.incendo.cloud.processors.confirmation.util.TestCommandManager;
 import org.incendo.cloud.processors.confirmation.util.TestCommandSender;
 import org.incendo.cloud.processors.cooldown.Cooldown;
-import org.incendo.cloud.processors.cooldown.CooldownConfiguration;
 import org.incendo.cloud.processors.cooldown.CooldownGroup;
 import org.incendo.cloud.processors.cooldown.CooldownInstance;
 import org.incendo.cloud.processors.cooldown.CooldownManager;
@@ -76,14 +75,11 @@ class CooldownManagerTest {
     @BeforeEach
     void setup() {
         this.commandManager = new TestCommandManager();
-        this.cooldownManager = CooldownManager.of(
-                CooldownConfiguration.<TestCommandSender>builder()
-                        .repository(CooldownRepository.forMap(new HashMap<>()))
+        this.cooldownManager = CooldownManager.cooldownManager(configBuilder ->
+                configBuilder.repository(CooldownRepository.forMap(new HashMap<>()))
                         .addActiveCooldownListener(this.notifier)
                         .clock(this.clock)
-                        .addCreationListener(this.listener)
-                        .build()
-        );
+                        .addCreationListener(this.listener));
         this.commandManager.registerCommandPostProcessor(this.cooldownManager.createPostprocessor());
     }