Refactoring | Create packages for each config data format module (#622)

* clean code

* the current env will be refactored to legacy env

* refactoring packages to clean arch

* refactoring

* refactoring

* refactoring

* refactoring

* refactoring

* fixing test

* fixing reflection config

* refactoring packages

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

* release notes

Author: mageddo

RELEASE-NOTES.md

@@ -1,3 +1,6 @@
+## 3.32.6
+* Refactoring | Create packages for each config data format module. #594
+
 ## 3.32.5
 * Structuring Domain Model config.Config as proposed in section "New Modeling Propose". #594
 

gradle.properties

@@ -1 +1 @@
-version=3.32.5-snapshot
+version=3.32.6-snapshot

src/main/java/com/mageddo/dnsproxyserver/App.java

@@ -3,8 +3,8 @@
 import com.mageddo.dnsproxyserver.application.LogSettings;
 import com.mageddo.dnsproxyserver.config.Config;
 import com.mageddo.dnsproxyserver.config.application.Configs;
-import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOCmdArgs;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigFlag;
+import com.mageddo.dnsproxyserver.config.provider.cmdargs.ConfigDAOCmdArgs;
+import com.mageddo.dnsproxyserver.config.provider.cmdargs.vo.ConfigFlag;
 import com.mageddo.dnsproxyserver.di.Context;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

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

@@ -10,17 +10,12 @@
 import lombok.Value;
 import org.apache.commons.lang3.Validate;
 
-import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -33,28 +28,28 @@
 @Builder(toBuilder = true, builderClassName = "ConfigBuilder")
 public class Config {
 
-  private String version;
+  String version;
 
-  private Server server;
+  Server server;
 
-  private DefaultDns defaultDns;
+  DefaultDns defaultDns;
 
-  private Log log;
+  Log log;
 
-  private Path configPath;
+  Path configPath;
 
-  private SolverStub solverStub;
+  SolverStub solverStub;
 
-  private SolverRemote solverRemote;
+  SolverRemote solverRemote;
 
-  private SolverDocker solverDocker;
+  SolverDocker solverDocker;
 
-  private SolverSystem solverSystem;
+  SolverSystem solverSystem;
 
-  private SolverLocal solverLocal;
+  SolverLocal solverLocal;
 
   @NonNull
-  private Source source;
+  Source source;
 
   @JsonIgnore
   public Boolean isDefaultDnsActive() {
@@ -88,7 +83,6 @@ private DefaultDns.ResolvConf getDefaultDnsResolvConf() {
     return this.defaultDns.resolvConf;
   }
 
-  @Nonnull
   @JsonIgnore
   public List<IpAddr> getRemoteDnsServers() {
     if (this.solverRemote == null) {

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

@@ -1,9 +1,9 @@
 package com.mageddo.dnsproxyserver.config.application;
 
-import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOCmdArgs;
-import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOEnv;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigEnv;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigFlag;
+import com.mageddo.dnsproxyserver.config.provider.cmdargs.ConfigDAOCmdArgs;
+import com.mageddo.dnsproxyserver.config.provider.legacyenv.ConfigDAOLegacyEnv;
+import com.mageddo.dnsproxyserver.config.provider.legacyenv.ConfigEnv;
+import com.mageddo.dnsproxyserver.config.provider.cmdargs.vo.ConfigFlag;
 import com.mageddo.dnsproxyserver.utils.ObjectUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -17,7 +17,7 @@
 @RequiredArgsConstructor(onConstructor = @__({@Inject}))
 public class ConfigFileFinderService {
 
-  private final ConfigDAOEnv configDAOEnv;
+  private final ConfigDAOLegacyEnv configDAOEnv;
   private final ConfigDAOCmdArgs configDAOCmdArgs;
 
   public Path findPath(){

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

@@ -1,6 +1,6 @@
 package com.mageddo.dnsproxyserver.config.application;
 
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigFlag;
+import com.mageddo.dnsproxyserver.config.provider.cmdargs.vo.ConfigFlag;
 import com.mageddo.utils.Files;
 import com.mageddo.utils.Runtime;
 import com.mageddo.utils.Tests;

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

@@ -20,19 +20,21 @@
 public class ConfigService {
 
   private final List<ConfigDAO> configDAOS;
+  private final ConfigMapper configMapper;
 
   @Inject
-  public ConfigService(Instance<ConfigDAO> configDAOS) {
+  public ConfigService(Instance<ConfigDAO> configDAOS, ConfigMapper configMapper) {
     this.configDAOS = configDAOS
       .stream()
       .toList()
     ;
+    this.configMapper = configMapper;
   }
 
   public Config findCurrentConfig() {
     final var configs = this.findConfigs();
     log.trace("baseConfigs={}", configs);
-    final var config = ConfigMapper.mapFrom(configs);
+    final var config = this.configMapper.mapFrom(configs);
     return config;
   }