Fixing SolverRemote NPE #533 (#556)

* Fixing SolverRemote NPE #533

* creating test

Author: mageddo

RELEASE-NOTES.md

@@ -1,3 +1,6 @@
+## 3.25.14
+* Fixing SolverRemote NPE #533
+
 ## 3.25.13
 * Unifying circuit breaker abstractions #553
 

gradle.properties

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

src/main/java/com/mageddo/dnsproxyserver/solver/remote/application/failsafe/CircuitBreakerFactory.java

@@ -99,16 +99,23 @@ public List<Stats> stats() {
   }
 
   public CircuitStatus findStatus(InetSocketAddress remoteAddress) {
-    return this.circuitBreakerMap.get(remoteAddress)
-      .findStatus();
+    final var circuitBreaker = this.findCircuitBreakerFromCache(remoteAddress);
+    if (circuitBreaker == null) {
+      return null;
+    }
+    return circuitBreaker.findStatus();
   }
 
   private Stats toStats(InetSocketAddress remoteAddr) {
-    final var circuitBreaker = this.circuitBreakerMap.get(remoteAddr);
+    final var circuitBreaker = this.findCircuitBreakerFromCache(remoteAddr);
     final var state = circuitBreaker.findStatus().name();
     return Stats.of(remoteAddr.toString(), state);
   }
 
+  private CircuitBreakerDelegate findCircuitBreakerFromCache(InetSocketAddress remoteAddress) {
+    return this.circuitBreakerMap.get(remoteAddress);
+  }
+
   @Value
   public static class Stats {
 

src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/failsafe/CircuitBreakerFactoryTest.java

@@ -14,6 +14,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -130,4 +131,14 @@ void mustBuildNonResilientCircuitBreaker(){
 
   }
 
+  @Test
+  void mustReturnNullWhenNoStatusIsFound(){
+
+    final var addr = InetSocketAddressTemplates._8_8_8_8();
+
+    final var status = this.factory.findStatus(addr);
+
+    assertNull(status);
+  }
+
 }