Unifying circuit breaker abstractions (#553)

* setup resilience4j

* specifying circuit breaker strategy name

* creating agnostic interface to support multiple circuit breaker strategy types

* fixme

* sppliting circuit breaker factory

* refactoring is done

* test is passing

* test is passing

* test is passing

* refactoring package

* [Gradle Release Plugin] - new version commit:  '3.25.11-snapshot'.

* release notes

* [Gradle Release Plugin] - new version commit:  '3.25.12-snapshot'.

* release notes

* fixme note

* fixme note

* refactoring to support multiple delegates

* refactoring name

* refactoring

* implementing non resilient strategy

* refactoring and test

* removing unnecessary test

* refactoring and fixing test

* release notes

* [Gradle Release Plugin] - new version commit:  '3.25.13-snapshot'.

Author: mageddo

RELEASE-NOTES.md

@@ -1,3 +1,6 @@
+## 3.25.13
+* Unifying circuit breaker abstractions #553
+
 ## 3.25.12
 * Creating an abstraction of circuit breaker implementation #533
 

gradle.properties

@@ -1 +1 @@
-version=3.25.12-snapshot
+version=3.25.13-snapshot

src/main/java/com/mageddo/dnsproxyserver/config/CircuitBreakerStrategy.java

@@ -0,0 +1,23 @@
+package com.mageddo.dnsproxyserver.config;
+
+import com.mageddo.dnsproxyserver.solver.remote.circuitbreaker.application.CircuitBreakerDelegateNonResilient;
+import com.mageddo.dnsproxyserver.solver.remote.circuitbreaker.application.CircuitBreakerDelegateStaticThresholdFailsafe;
+
+public interface CircuitBreakerStrategyConfig {
+
+  Name name();
+
+  enum Name {
+    /**
+     * @see CircuitBreakerDelegateStaticThresholdFailsafe
+     */
+    STATIC_THRESHOLD,
+
+    CANARY_RATE_THRESHOLD,
+
+    /**
+     * @see CircuitBreakerDelegateNonResilient
+     */
+    NON_RESILIENT,
+  }
+}

src/main/java/com/mageddo/dnsproxyserver/config/CircuitBreakerStrategyConfig.java

@@ -90,7 +90,7 @@ public void resetConfigFile() {
   }
 
   @JsonIgnore
-  public CircuitBreakerStrategy getSolverRemoteCircuitBreakerStrategy() {
+  public CircuitBreakerStrategyConfig getSolverRemoteCircuitBreakerStrategy() {
     if (this.solverRemote == null) {
       return null;
     }

src/main/java/com/mageddo/dnsproxyserver/config/Config.java

@@ -0,0 +1,8 @@
+package com.mageddo.dnsproxyserver.config;
+
+public class NonResilientCircuitBreakerStrategyConfig implements CircuitBreakerStrategyConfig {
+  @Override
+  public Name name() {
+    return Name.NON_RESILIENT;
+  }
+}

src/main/java/com/mageddo/dnsproxyserver/config/NonResilientCircuitBreakerStrategyConfig.java

@@ -9,5 +9,5 @@ public class SolverRemote {
 
   private Boolean active;
 
-  private CircuitBreakerStrategy circuitBreaker;
+  private CircuitBreakerStrategyConfig circuitBreaker;
 }

src/main/java/com/mageddo/dnsproxyserver/config/SolverRemote.java

@@ -8,7 +8,7 @@
 
 @Value
 @Builder
-public class StaticThresholdCircuitBreakerStrategy implements CircuitBreakerStrategy {
+public class StaticThresholdCircuitBreakerStrategyConfig implements CircuitBreakerStrategyConfig {
 
   /**
    * See {@link dev.failsafe.CircuitBreakerBuilder#withFailureThreshold(int, int)}
@@ -26,12 +26,12 @@ public class StaticThresholdCircuitBreakerStrategy implements CircuitBreakerStra
    */
   private Duration testDelay;
 
-  public static StaticThresholdCircuitBreakerStrategy empty() {
-    return StaticThresholdCircuitBreakerStrategy.builder().build();
+  public static StaticThresholdCircuitBreakerStrategyConfig empty() {
+    return StaticThresholdCircuitBreakerStrategyConfig.builder().build();
   }
 
   @Override
-  public Name type() {
+  public Name name() {
     return Name.STATIC_THRESHOLD;
   }
 }

…aticThresholdCircuitBreakerStrategy.java …resholdCircuitBreakerStrategyConfig.javasrc/main/java/com/mageddo/dnsproxyserver/config/StaticThresholdCircuitBreakerStrategy.java renamed to src/main/java/com/mageddo/dnsproxyserver/config/StaticThresholdCircuitBreakerStrategyConfig.java src/main/java/com/mageddo/dnsproxyserver/config/StaticThresholdCircuitBreakerStrategy.java renamed to src/main/java/com/mageddo/dnsproxyserver/config/StaticThresholdCircuitBreakerStrategyConfig.java

@@ -1,6 +1,8 @@
 package com.mageddo.dnsproxyserver.config.application;
 
+import com.mageddo.dnsproxyserver.config.CircuitBreakerStrategyConfig;
 import com.mageddo.dnsproxyserver.config.Config;
+import com.mageddo.dnsproxyserver.config.SolverRemote;
 import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAO;
 import com.mageddo.dnsproxyserver.config.mapper.ConfigMapper;
 import org.apache.commons.lang3.ClassUtils;
@@ -29,6 +31,12 @@ public Config findCurrentConfig() {
     return ConfigMapper.mapFrom(this.findConfigs());
   }
 
+  public SolverRemote findCurrentConfigRemote(){
+    return this.findCurrentConfig()
+      .getSolverRemote()
+      ;
+  }
+
   List<Config> findConfigs() {
     return this.findConfigDaos()
       .map(ConfigDAO::find)
@@ -46,4 +54,9 @@ public List<String> findConfigNames(){
       .map(ClassUtils::getSimpleName)
       .toList();
   }
+
+  public CircuitBreakerStrategyConfig findCurrentConfigCircuitBreaker() {
+    return this.findCurrentConfigRemote()
+      .getCircuitBreaker();
+  }
 }

src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigService.java

@@ -1,6 +1,6 @@
 package com.mageddo.dnsproxyserver.config.dataprovider.mapper;
 
-import com.mageddo.dnsproxyserver.config.StaticThresholdCircuitBreakerStrategy;
+import com.mageddo.dnsproxyserver.config.StaticThresholdCircuitBreakerStrategyConfig;
 import com.mageddo.dnsproxyserver.config.Config;
 import com.mageddo.dnsproxyserver.config.SolverRemote;
 import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJson;
@@ -65,7 +65,7 @@ static SolverRemote buildCompleteSolverRemote(ConfigJson json, ConfigJsonV2.Circ
       .active(Booleans.reverseWhenNotNull(json.getNoRemoteServers()))
       // fixme #533 need to create a dynamic json parser for different strategies,
       //      then a dynamic mapper to the solver remote
-      .circuitBreaker(StaticThresholdCircuitBreakerStrategy
+      .circuitBreaker(StaticThresholdCircuitBreakerStrategyConfig
         .builder()
         .failureThreshold(circuitBreaker.getFailureThreshold())
         .failureThresholdCapacity(circuitBreaker.getFailureThresholdCapacity())