Moved code from Registries into AbstractRegistry in order to remove duplicate code

Author: RobWin

resilience4j-bulkhead/src/main/java/io/github/resilience4j/bulkhead/BulkheadRegistry.java

@@ -19,12 +19,13 @@
 package io.github.resilience4j.bulkhead;
 
 
-import java.util.function.Supplier;
-
 import io.github.resilience4j.bulkhead.internal.InMemoryBulkheadRegistry;
 import io.github.resilience4j.core.Registry;
 import io.vavr.collection.Seq;
 
+import java.util.Map;
+import java.util.function.Supplier;
+
 /**
  * The {@link BulkheadRegistry} is a factory to create Bulkhead instances which stores all bulkhead instances in a registry.
  */
@@ -49,13 +50,13 @@ public interface BulkheadRegistry extends Registry<Bulkhead, BulkheadConfig> {
 	 * Returns a managed {@link Bulkhead} or creates a new one with a custom BulkheadConfig configuration.
 	 *
 	 * @param name           the name of the Bulkhead
-	 * @param bulkheadConfig a custom Bulkhead configuration
+	 * @param config a custom Bulkhead configuration
 	 * @return The {@link Bulkhead}
 	 */
-	Bulkhead bulkhead(String name, BulkheadConfig bulkheadConfig);
+	Bulkhead bulkhead(String name, BulkheadConfig config);
 
 	/**
-	 * Returns a managed {@link Bulkhead} or creates a new one with a custom BulkheadConfig configuration.
+	 * Returns a managed {@link Bulkhead} or creates a new one with a custom Bulkhead configuration.
 	 *
 	 * @param name                   the name of the Bulkhead
 	 * @param bulkheadConfigSupplier a custom Bulkhead configuration supplier
@@ -64,7 +65,16 @@ public interface BulkheadRegistry extends Registry<Bulkhead, BulkheadConfig> {
 	Bulkhead bulkhead(String name, Supplier<BulkheadConfig> bulkheadConfigSupplier);
 
 	/**
-	 * @deprecated
+	 * Returns a managed {@link Bulkhead} or creates a new one with a custom Bulkhead configuration.
+	 *
+	 * @param name       the name of the Bulkhead
+	 * @param configName a custom Bulkhead configuration name
+	 * @return The {@link Bulkhead}
+	 */
+	Bulkhead bulkhead(String name, String configName);
+
+	/**
+	 * @deprecated Use {@link BulkheadRegistry#getDefaultConfig()} instead
 	 * @since (0.15.0)
 	 * Returns a default BulkheadConfig instance this registry is using.
 	 *
@@ -83,6 +93,16 @@ static BulkheadRegistry of(BulkheadConfig bulkheadConfig) {
 		return new InMemoryBulkheadRegistry(bulkheadConfig);
 	}
 
+	/**
+	 * Creates a BulkheadRegistry with a Map of shared Bulkhead configurations.
+	 *
+	 * @param configs a Map of shared Bulkhead configurations
+	 * @return a RetryRegistry with a Map of shared Bulkhead configurations.
+	 */
+	static BulkheadRegistry of(Map<String, BulkheadConfig> configs) {
+		return new InMemoryBulkheadRegistry(configs);
+	}
+
 	/**
 	 * Creates a BulkheadRegistry with a default Bulkhead configuration
 	 *

resilience4j-bulkhead/src/main/java/io/github/resilience4j/bulkhead/ThreadPoolBulkheadRegistry.java

@@ -19,15 +19,17 @@
 package io.github.resilience4j.bulkhead;
 
 
-import java.util.function.Supplier;
-
 import io.github.resilience4j.bulkhead.internal.InMemoryThreadPoolBulkheadRegistry;
+import io.github.resilience4j.core.Registry;
 import io.vavr.collection.Seq;
 
+import java.util.Map;
+import java.util.function.Supplier;
+
 /**
  * The {@link ThreadPoolBulkheadRegistry} is a factory to create ThreadPoolBulkhead instances which stores all bulkhead instances in a registry.
  */
-public interface ThreadPoolBulkheadRegistry {
+public interface ThreadPoolBulkheadRegistry  extends Registry<ThreadPoolBulkhead, ThreadPoolBulkheadConfig> {
 
 	/**
 	 * Creates a BulkheadRegistry with a custom Bulkhead configuration.
@@ -48,6 +50,16 @@ static ThreadPoolBulkheadRegistry ofDefaults() {
 		return new InMemoryThreadPoolBulkheadRegistry(ThreadPoolBulkheadConfig.ofDefaults());
 	}
 
+	/**
+	 * Creates a ThreadPoolBulkheadRegistry with a Map of shared ThreadPoolBulkhead configurations.
+	 *
+	 * @param configs a Map of shared Bulkhead configurations
+	 * @return a ThreadPoolBulkheadRegistry with a Map of shared ThreadPoolBulkhead configurations.
+	 */
+	static ThreadPoolBulkheadRegistry of(Map<String, ThreadPoolBulkheadConfig> configs) {
+		return new InMemoryThreadPoolBulkheadRegistry(configs);
+	}
+
 	/**
 	 * Returns all managed {@link ThreadPoolBulkhead} instances.
 	 *
@@ -64,16 +76,16 @@ static ThreadPoolBulkheadRegistry ofDefaults() {
 	ThreadPoolBulkhead bulkhead(String name);
 
 	/**
-	 * Returns a managed {@link ThreadPoolBulkhead} or creates a new one with a custom BulkheadConfig configuration.
+	 * Returns a managed {@link ThreadPoolBulkhead} or creates a new one with a custom ThreadPoolBulkhead configuration.
 	 *
 	 * @param name           the name of the ThreadPoolBulkhead
-	 * @param bulkheadConfig a custom ThreadPoolBulkheadConfig configuration
+	 * @param config a custom ThreadPoolBulkheadConfig configuration
 	 * @return The {@link ThreadPoolBulkhead}
 	 */
-	ThreadPoolBulkhead bulkhead(String name, ThreadPoolBulkheadConfig bulkheadConfig);
+	ThreadPoolBulkhead bulkhead(String name, ThreadPoolBulkheadConfig config);
 
 	/**
-	 * Returns a managed {@link ThreadPoolBulkhead} or creates a new one with a custom BulkheadConfig configuration.
+	 * Returns a managed {@link ThreadPoolBulkhead} or creates a new one with a custom ThreadPoolBulkhead configuration.
 	 *
 	 * @param name                   the name of the ThreadPoolBulkhead
 	 * @param bulkheadConfigSupplier a custom ThreadPoolBulkhead configuration supplier
@@ -82,10 +94,22 @@ static ThreadPoolBulkheadRegistry ofDefaults() {
 	ThreadPoolBulkhead bulkhead(String name, Supplier<ThreadPoolBulkheadConfig> bulkheadConfigSupplier);
 
 	/**
+	 * Returns a managed {@link ThreadPoolBulkhead} or creates a new one with a custom ThreadPoolBulkhead configuration.
+	 *
+	 * @param name       the name of the ThreadPoolBulkhead
+	 * @param configName a custom CircuitBreaker ThreadPoolBulkhead name
+	 * @return The {@link ThreadPoolBulkhead}
+	 */
+	ThreadPoolBulkhead bulkhead(String name, String configName);
+
+	/**
+	 * @deprecated Use {@link ThreadPoolBulkheadRegistry#getDefaultConfig()} instead
+	 * @since (0.15.0)
 	 * Returns a default ThreadPoolBulkheadConfig instance this registry is using.
 	 *
 	 * @return ThreadPoolBulkheadConfig instance
 	 */
+	@Deprecated
 	ThreadPoolBulkheadConfig getDefaultBulkheadConfig();
 
 }

resilience4j-bulkhead/src/main/java/io/github/resilience4j/bulkhead/internal/FixedThreadPoolBulkhead.java

@@ -33,6 +33,8 @@
 import java.util.concurrent.*;
 import java.util.function.Supplier;
 
+import static java.util.Objects.requireNonNull;
+
 /**
  * A Bulkhead implementation based on a fixed ThreadPoolExecutor.
  * which is based into the thread pool execution handling :
@@ -42,6 +44,8 @@
  */
 public class FixedThreadPoolBulkhead implements ThreadPoolBulkhead {
 
+	private static final String CONFIG_MUST_NOT_BE_NULL = "Config must not be null";
+
 	private final String name;
 	private final ThreadPoolExecutor executorService;
 	private final FixedThreadPoolBulkhead.BulkheadMetrics metrics;
@@ -56,8 +60,7 @@ public class FixedThreadPoolBulkhead implements ThreadPoolBulkhead {
 	 */
 	public FixedThreadPoolBulkhead(String name, @Nullable ThreadPoolBulkheadConfig bulkheadConfig) {
 		this.name = name;
-		this.config = bulkheadConfig != null ? bulkheadConfig
-				: ThreadPoolBulkheadConfig.ofDefaults();
+		this.config = requireNonNull(bulkheadConfig, CONFIG_MUST_NOT_BE_NULL);
 		// init thread pool executor
 		this.executorService = new ThreadPoolExecutor(config.getCoreThreadPoolSize(), config.getMaxThreadPoolSize(),
 				config.getKeepAliveTime(), TimeUnit.MILLISECONDS,

resilience4j-bulkhead/src/main/java/io/github/resilience4j/bulkhead/internal/InMemoryBulkheadRegistry.java

@@ -18,70 +18,88 @@
  */
 package io.github.resilience4j.bulkhead.internal;
 
-import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.function.Supplier;
-
 import io.github.resilience4j.bulkhead.Bulkhead;
 import io.github.resilience4j.bulkhead.BulkheadConfig;
 import io.github.resilience4j.bulkhead.BulkheadRegistry;
 import io.github.resilience4j.core.AbstractRegistry;
+import io.github.resilience4j.core.ConfigurationNotFoundException;
 import io.vavr.collection.Array;
 import io.vavr.collection.Seq;
 
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Supplier;
+
 /**
  * Bulkhead instance manager;
  * Constructs/returns bulkhead instances.
  */
 public final class InMemoryBulkheadRegistry extends AbstractRegistry<Bulkhead, BulkheadConfig> implements BulkheadRegistry {
 
-	private final BulkheadConfig defaultBulkheadConfig;
-
 	/**
-	 * The bulkheads, indexed by name
+	 * The constructor with default default.
 	 */
-	private final ConcurrentMap<String, Bulkhead> bulkheads;
+	public InMemoryBulkheadRegistry() {
+		this(BulkheadConfig.ofDefaults());
+	}
+
+	public InMemoryBulkheadRegistry(Map<String, BulkheadConfig> configs) {
+		this(configs.getOrDefault(DEFAULT_CONFIG, BulkheadConfig.ofDefaults()));
+		this.configurations.putAll(configs);
+	}
 
 	/**
-	 * The constructor with custom default bulkhead config
+	 * The constructor with custom default config.
 	 *
-	 * @param bulkheadConfig custom bulkhead config to use
+	 * @param defaultConfig The default config.
 	 */
-	public InMemoryBulkheadRegistry(BulkheadConfig bulkheadConfig) {
-		super();
-		this.defaultBulkheadConfig = bulkheadConfig;
-		this.bulkheads = new ConcurrentHashMap<>();
+	public InMemoryBulkheadRegistry(BulkheadConfig defaultConfig) {
+		super(defaultConfig);
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
 	@Override
 	public Seq<Bulkhead> getAllBulkheads() {
-		return Array.ofAll(bulkheads.values());
+		return Array.ofAll(targetMap.values());
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
 	@Override
 	public Bulkhead bulkhead(String name) {
-		return bulkhead(name, defaultBulkheadConfig);
+		return bulkhead(name, getDefaultConfig());
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
 	@Override
-	public Bulkhead bulkhead(String name, BulkheadConfig bulkheadConfig) {
-		return bulkheads.computeIfAbsent(
-				Objects.requireNonNull(name, "Name must not be null"),
-				k -> notifyPostCreationConsumers(Bulkhead.of(name, bulkheadConfig))
-		);
+	public Bulkhead bulkhead(String name, BulkheadConfig config) {
+		return computeIfAbsent(name, () -> Bulkhead.of(name, Objects.requireNonNull(config, CONFIG_MUST_NOT_BE_NULL)));
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
 	@Override
 	public Bulkhead bulkhead(String name, Supplier<BulkheadConfig> bulkheadConfigSupplier) {
-		return bulkheads.computeIfAbsent(
-				Objects.requireNonNull(name, "Name must not be null"),
-				k -> notifyPostCreationConsumers(Bulkhead.of(name, bulkheadConfigSupplier.get()))
-		);
+		return computeIfAbsent(name, () -> Bulkhead.of(name, Objects.requireNonNull(Objects.requireNonNull(bulkheadConfigSupplier, SUPPLIER_MUST_NOT_BE_NULL).get(), CONFIG_MUST_NOT_BE_NULL)));
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Bulkhead bulkhead(String name, String configName) {
+		return computeIfAbsent(name, () -> Bulkhead.of(name, getConfiguration(configName)
+				.orElseThrow(() -> new ConfigurationNotFoundException(configName))));
 	}
 
 	@Override
 	public BulkheadConfig getDefaultBulkheadConfig() {
-		return defaultBulkheadConfig;
+		return getDefaultConfig();
 	}
 }