Fixing noRemoteServers wasn't being respected at the JSON file #513 (…

…#515)

* bug and test fixed

* fixing one more test

* release notes

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

RELEASE-NOTES.md

@@ -1,3 +1,6 @@
+## 3.24.1
+* Fixing `noRemoteServers` wasn't being respected at the JSON file #513
+
 ## 3.24.0
 * Downgraded necessary libc version to run aarch binary to 2.28 #507
 

gradle.properties

@@ -1 +1 @@
-version=3.24.0-snapshot
+version=3.24.1-snapshot

src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2Mapper.java

@@ -4,7 +4,9 @@
 import com.mageddo.dnsproxyserver.config.Config;
 import com.mageddo.dnsproxyserver.config.SolverRemote;
 import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJson;
+import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV2;
 import com.mageddo.dnsproxyserver.utils.Booleans;
+import org.apache.commons.lang3.ObjectUtils;
 
 import java.nio.file.Path;
 
@@ -34,14 +36,30 @@ public static Config toConfig(ConfigJson json, Path configFileAbsolutePath) {
   }
 
   static SolverRemote toSolverRemote(ConfigJson json) {
-    final var solverRemote = json.getSolverRemote();
-    if (solverRemote == null) {
-      return null;
-    }
-    final var circuitBreaker = solverRemote.getCircuitBreaker();
-    if (circuitBreaker == null) {
+    if(nothingIsSet(json)){
       return null;
+    } else if (isPossibleToBuildComplete(json)) {
+      return buildCompleteSolverRemote(json, json.getSolverRemoteCircuitBreaker());
     }
+    return buildSimpleSolverRemote(json);
+  }
+
+  static boolean nothingIsSet(ConfigJson json) {
+    return ObjectUtils.allNull(json.getNoRemoteServers(), json.getSolverRemote(), json.getSolverRemoteCircuitBreaker());
+  }
+
+  static boolean isPossibleToBuildComplete(ConfigJson json) {
+    return ObjectUtils.allNotNull(json.getSolverRemote(), json.getSolverRemoteCircuitBreaker());
+  }
+
+  static SolverRemote buildSimpleSolverRemote(ConfigJson json) {
+    return SolverRemote
+      .builder()
+      .active(Booleans.reverseWhenNotNull(json.getNoRemoteServers()))
+      .build();
+  }
+
+  static SolverRemote buildCompleteSolverRemote(ConfigJson json, ConfigJsonV2.CircuitBreaker circuitBreaker) {
     return SolverRemote
       .builder()
       .active(Booleans.reverseWhenNotNull(json.getNoRemoteServers()))

src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigJson.java

@@ -49,4 +49,6 @@ public interface ConfigJson {
 
   ConfigJsonV2.SolverRemote getSolverRemote();
 
+  ConfigJsonV2.CircuitBreaker getSolverRemoteCircuitBreaker();
+
 }

src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigJsonV1.java

@@ -113,6 +113,11 @@ public ConfigJsonV2.SolverRemote getSolverRemote() {
     return null;
   }
 
+  @Override
+  public ConfigJsonV2.CircuitBreaker getSolverRemoteCircuitBreaker() {
+    return null;
+  }
+
   public ConfigJsonV2 toConfigV2() {
     return new ConfigJsonV2()
       .setDomain(this.getDomain())

src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigJsonV2.java

@@ -88,6 +88,15 @@ public Boolean getDockerSolverHostMachineFallbackActive() {
     return this.dockerSolverHostMachineFallbackActive;
   }
 
+  @JsonIgnore
+  @Override
+  public CircuitBreaker getSolverRemoteCircuitBreaker() {
+    if (this.solverRemote != null) {
+      return this.solverRemote.circuitBreaker;
+    }
+    return null;
+  }
+
   @Data
   @Accessors(chain = true)
   public static class Env {

src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2MapperTest.java

@@ -2,14 +2,14 @@
 
 import com.mageddo.dnsproxyserver.config.Config;
 import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJson;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import testing.templates.ConfigJsonTemplates;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 class ConfigJsonV2MapperTest {
 
@@ -28,7 +28,6 @@ void mustMapSolverRemoteAsInactiveWhenNoRemoteServersFlagIsSet(){
   }
 
   @Test
-  @Disabled("by the bug reported at #513")
   void mustMapSolverRemoteAsInactiveEvenWhenCircuitBreakerIsNOTSet(){
     // arrange
     final var configJson = ConfigJsonTemplates.withoutCircuitBreakerDefinedWithNoRemoteServers();
@@ -40,6 +39,18 @@ void mustMapSolverRemoteAsInactiveEvenWhenCircuitBreakerIsNOTSet(){
     assertFalse(config.isSolverRemoteActive());
   }
 
+  @Test
+  void mustReturnNullWhenNothingIsSet(){
+    // arrange
+    final var configJson = ConfigJsonTemplates.noRemoteServerFlagsSet();
+
+    // act
+    final var config = toConfig(configJson);
+
+    // assert
+    assertNull(config.getSolverRemote());
+  }
+
   static Config toConfig(ConfigJson configJson) {
     return ConfigJsonV2Mapper.toConfig(configJson, RANDOM_CONFIG_PATH);
   }

src/test/java/testing/templates/ConfigJsonTemplates.java

@@ -15,4 +15,10 @@ public static ConfigJson withoutCircuitBreakerDefinedWithNoRemoteServers() {
     final var path = "/configs-test/007.json";
     return JsonConfigs.loadConfig(TestUtils.readString(path));
   }
+
+  public static ConfigJson noRemoteServerFlagsSet() {
+    final var path = "/configs-test/008.json";
+    return JsonConfigs.loadConfig(TestUtils.readString(path));
+  }
+
 }

src/test/resources/configs-test/008.json

@@ -0,0 +1,19 @@
+{
+  "version" : 2,
+  "activeEnv" : "MARROI",
+  "remoteDnsServers" : [ ],
+  "envs" : [ {
+    "name" : "MARROI",
+    "hostnames" : null
+  } ],
+  "webServerPort" : 9393,
+  "dnsServerPort" : 5391,
+  "defaultDns" : false,
+  "logLevel" : "DEBUG",
+  "logFile" : "true",
+  "registerContainerNames" : true,
+  "hostMachineHostname" : "batata.com",
+  "domain" : "acme",
+  "dpsNetwork" : true,
+  "dpsNetworkAutoConnect" : true
+}