From 401eba73a5e5231e7fe709dd2dc6982c98e6fe6a Mon Sep 17 00:00:00 2001 From: Elvis de Freitas Date: Mon, 31 Mar 2025 09:56:32 -0300 Subject: [PATCH 01/13] clean code --- .../mageddo/dnsproxyserver/config/Config.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/Config.java b/src/main/java/com/mageddo/dnsproxyserver/config/Config.java index 5971efce6..9176ecb98 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/Config.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/Config.java @@ -33,28 +33,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() { From 1a821b3b0f00014aa5d6579ee77fbd0f00ad1390 Mon Sep 17 00:00:00 2001 From: Elvis de Freitas Date: Mon, 31 Mar 2025 09:59:54 -0300 Subject: [PATCH 02/13] the current env will be refactored to legacy env --- .../java/com/mageddo/dnsproxyserver/config/Config.java | 8 +------- .../config/application/ConfigFileFinderService.java | 4 ++-- .../config/configurator/module/ModuleConfigDAO.java | 4 ++-- .../{ConfigDAOEnv.java => ConfigDAOLegacyEnv.java} | 2 +- .../dnsproxyserver/config/di/module/ModuleConfigDAO.java | 4 ++-- .../config/application/ConfigFileFinderServiceTest.java | 4 ++-- 6 files changed, 10 insertions(+), 16 deletions(-) rename src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/{ConfigDAOEnv.java => ConfigDAOLegacyEnv.java} (92%) diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/Config.java b/src/main/java/com/mageddo/dnsproxyserver/config/Config.java index 9176ecb98..97b0123dd 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/Config.java +++ b/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; @@ -88,7 +83,6 @@ private DefaultDns.ResolvConf getDefaultDnsResolvConf() { return this.defaultDns.resolvConf; } - @Nonnull @JsonIgnore public List getRemoteDnsServers() { if (this.solverRemote == null) { diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderService.java b/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderService.java index f4c68f392..a834376bc 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderService.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderService.java @@ -1,7 +1,7 @@ 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.ConfigDAOLegacyEnv; import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigEnv; import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigFlag; import com.mageddo.dnsproxyserver.utils.ObjectUtils; @@ -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(){ diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/configurator/module/ModuleConfigDAO.java b/src/main/java/com/mageddo/dnsproxyserver/config/configurator/module/ModuleConfigDAO.java index 2d53bf365..6253480eb 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/configurator/module/ModuleConfigDAO.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/configurator/module/ModuleConfigDAO.java @@ -3,7 +3,7 @@ import com.mageddo.di.InstanceImpl; import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAO; import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOCmdArgs; -import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOEnv; +import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOLegacyEnv; import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOJson; import dagger.Module; import dagger.Provides; @@ -24,7 +24,7 @@ static Instance multiSourceConfigDAOInstance(Set instances @Singleton @ElementsIntoSet static Set configDaos( - ConfigDAOEnv o1, ConfigDAOCmdArgs o2, ConfigDAOJson o3 + ConfigDAOLegacyEnv o1, ConfigDAOCmdArgs o2, ConfigDAOJson o3 ) { return Set.of(o1, o2, o3); } diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOEnv.java b/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOLegacyEnv.java similarity index 92% rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOEnv.java rename to src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOLegacyEnv.java index f3e5c8b7c..2147d6ff9 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOEnv.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOLegacyEnv.java @@ -10,7 +10,7 @@ @Singleton @RequiredArgsConstructor(onConstructor = @__({@Inject})) -public class ConfigDAOEnv implements ConfigDAO { +public class ConfigDAOLegacyEnv implements ConfigDAO { @Override public Config find() { diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java b/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java index 7ea9d3954..391764835 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java @@ -3,7 +3,7 @@ import com.mageddo.di.InstanceImpl; import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAO; import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOCmdArgs; -import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOEnv; +import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOLegacyEnv; import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOJson; import dagger.Module; import dagger.Provides; @@ -24,7 +24,7 @@ static Instance multiSourceConfigDAOInstance(Set instances @Singleton @ElementsIntoSet static Set configDaos( - ConfigDAOEnv o1, ConfigDAOCmdArgs o2, ConfigDAOJson o3 + ConfigDAOLegacyEnv o1, ConfigDAOCmdArgs o2, ConfigDAOJson o3 ) { return Set.of(o1, o2, o3); } diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderServiceTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderServiceTest.java index 3b359e8be..9963bfd0a 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderServiceTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderServiceTest.java @@ -1,7 +1,7 @@ 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.ConfigDAOLegacyEnv; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -22,7 +22,7 @@ class ConfigFileFinderServiceTest { @Mock - ConfigDAOEnv configDAOEnv; + ConfigDAOLegacyEnv configDAOEnv; @Mock ConfigDAOCmdArgs configDAOCmdArgs; From c11e6a3675b9a6e5df5673b7e54498d9bacf3ee8 Mon Sep 17 00:00:00 2001 From: Elvis de Freitas Date: Mon, 31 Mar 2025 10:02:24 -0300 Subject: [PATCH 03/13] refactoring packages to clean arch --- .../config/application/ConfigFileFinderService.java | 4 ++-- .../config/configurator/module/ModuleConfigDAO.java | 2 +- .../dnsproxyserver/config/di/module/ModuleConfigDAO.java | 2 +- .../{dataprovider => legacyenv}/ConfigDAOLegacyEnv.java | 5 ++--- .../config/{dataprovider/vo => legacyenv}/ConfigEnv.java | 2 +- .../{dataprovider/mapper => legacyenv}/ConfigEnvMapper.java | 4 ++-- .../dnsproxyserver/sandbox/BinaryFromGradleTestsSandbox.java | 2 +- .../config/application/ConfigFileFinderServiceTest.java | 2 +- .../config/dataprovider/mapper/ConfigEnvMapperTest.java | 1 + .../dnsconfigurator/linux/DnsConfiguratorLinuxTest.java | 2 +- src/test/java/testing/templates/ConfigTemplates.java | 2 +- .../java/testing/templates/config/ConfigEnvTemplates.java | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) rename src/main/java/com/mageddo/dnsproxyserver/config/{dataprovider => legacyenv}/ConfigDAOLegacyEnv.java (71%) rename src/main/java/com/mageddo/dnsproxyserver/config/{dataprovider/vo => legacyenv}/ConfigEnv.java (98%) rename src/main/java/com/mageddo/dnsproxyserver/config/{dataprovider/mapper => legacyenv}/ConfigEnvMapper.java (93%) diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderService.java b/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderService.java index a834376bc..3a312da2e 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderService.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderService.java @@ -1,8 +1,8 @@ package com.mageddo.dnsproxyserver.config.application; import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOCmdArgs; -import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOLegacyEnv; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigEnv; +import com.mageddo.dnsproxyserver.config.legacyenv.ConfigDAOLegacyEnv; +import com.mageddo.dnsproxyserver.config.legacyenv.ConfigEnv; import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigFlag; import com.mageddo.dnsproxyserver.utils.ObjectUtils; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/configurator/module/ModuleConfigDAO.java b/src/main/java/com/mageddo/dnsproxyserver/config/configurator/module/ModuleConfigDAO.java index 6253480eb..8f9a07a25 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/configurator/module/ModuleConfigDAO.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/configurator/module/ModuleConfigDAO.java @@ -3,7 +3,7 @@ import com.mageddo.di.InstanceImpl; import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAO; import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOCmdArgs; -import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOLegacyEnv; +import com.mageddo.dnsproxyserver.config.legacyenv.ConfigDAOLegacyEnv; import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOJson; import dagger.Module; import dagger.Provides; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java b/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java index 391764835..f76673c00 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java @@ -3,7 +3,7 @@ import com.mageddo.di.InstanceImpl; import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAO; import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOCmdArgs; -import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOLegacyEnv; +import com.mageddo.dnsproxyserver.config.legacyenv.ConfigDAOLegacyEnv; import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOJson; import dagger.Module; import dagger.Provides; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOLegacyEnv.java b/src/main/java/com/mageddo/dnsproxyserver/config/legacyenv/ConfigDAOLegacyEnv.java similarity index 71% rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOLegacyEnv.java rename to src/main/java/com/mageddo/dnsproxyserver/config/legacyenv/ConfigDAOLegacyEnv.java index 2147d6ff9..c8c5eb94a 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOLegacyEnv.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/legacyenv/ConfigDAOLegacyEnv.java @@ -1,8 +1,7 @@ -package com.mageddo.dnsproxyserver.config.dataprovider; +package com.mageddo.dnsproxyserver.config.legacyenv; import com.mageddo.dnsproxyserver.config.Config; -import com.mageddo.dnsproxyserver.config.dataprovider.mapper.ConfigEnvMapper; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigEnv; +import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAO; import lombok.RequiredArgsConstructor; import javax.inject.Inject; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigEnv.java b/src/main/java/com/mageddo/dnsproxyserver/config/legacyenv/ConfigEnv.java similarity index 98% rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigEnv.java rename to src/main/java/com/mageddo/dnsproxyserver/config/legacyenv/ConfigEnv.java index 4a451d998..65716372e 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigEnv.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/legacyenv/ConfigEnv.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.dataprovider.vo; +package com.mageddo.dnsproxyserver.config.legacyenv; import com.mageddo.dnsproxyserver.utils.Envs; import com.mageddo.http.UriUtils; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigEnvMapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/legacyenv/ConfigEnvMapper.java similarity index 93% rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigEnvMapper.java rename to src/main/java/com/mageddo/dnsproxyserver/config/legacyenv/ConfigEnvMapper.java index 67da0684b..b51611df2 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigEnvMapper.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/legacyenv/ConfigEnvMapper.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.dataprovider.mapper; +package com.mageddo.dnsproxyserver.config.legacyenv; import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsproxyserver.config.Log; @@ -7,7 +7,7 @@ import com.mageddo.dnsproxyserver.config.SolverRemote; import com.mageddo.dnsproxyserver.config.SolverStub; import com.mageddo.dnsproxyserver.config.SolverSystem; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigEnv; +import com.mageddo.dnsproxyserver.config.dataprovider.mapper.ConfigFieldsValuesMapper; import com.mageddo.dnsproxyserver.utils.Booleans; public class ConfigEnvMapper { diff --git a/src/main/java/com/mageddo/dnsproxyserver/sandbox/BinaryFromGradleTestsSandbox.java b/src/main/java/com/mageddo/dnsproxyserver/sandbox/BinaryFromGradleTestsSandbox.java index 6816a43ad..d37d0346d 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/sandbox/BinaryFromGradleTestsSandbox.java +++ b/src/main/java/com/mageddo/dnsproxyserver/sandbox/BinaryFromGradleTestsSandbox.java @@ -3,7 +3,7 @@ import com.mageddo.commons.exec.CommandLines; import com.mageddo.commons.exec.NopResultHandler; import com.mageddo.commons.exec.Request; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigEnv; +import com.mageddo.dnsproxyserver.config.legacyenv.ConfigEnv; import lombok.extern.slf4j.Slf4j; import java.nio.file.Path; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderServiceTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderServiceTest.java index 9963bfd0a..575eeb618 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderServiceTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderServiceTest.java @@ -1,7 +1,7 @@ package com.mageddo.dnsproxyserver.config.application; import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOCmdArgs; -import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOLegacyEnv; +import com.mageddo.dnsproxyserver.config.legacyenv.ConfigDAOLegacyEnv; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigEnvMapperTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigEnvMapperTest.java index ff97326fc..08e45ee60 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigEnvMapperTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigEnvMapperTest.java @@ -1,5 +1,6 @@ package com.mageddo.dnsproxyserver.config.dataprovider.mapper; +import com.mageddo.dnsproxyserver.config.legacyenv.ConfigEnvMapper; import org.junit.jupiter.api.Test; import testing.templates.config.ConfigEnvTemplates; diff --git a/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/DnsConfiguratorLinuxTest.java b/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/DnsConfiguratorLinuxTest.java index 0898cf7c8..48fc2b45c 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/DnsConfiguratorLinuxTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/DnsConfiguratorLinuxTest.java @@ -1,6 +1,6 @@ package com.mageddo.dnsproxyserver.dnsconfigurator.linux; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigEnv; +import com.mageddo.dnsproxyserver.config.legacyenv.ConfigEnv; import com.mageddo.dnsproxyserver.dnsconfigurator.linux.ResolvFile.Type; import testing.templates.IpAddrTemplates; import org.apache.commons.exec.OS; diff --git a/src/test/java/testing/templates/ConfigTemplates.java b/src/test/java/testing/templates/ConfigTemplates.java index e4520850a..5b0608e55 100644 --- a/src/test/java/testing/templates/ConfigTemplates.java +++ b/src/test/java/testing/templates/ConfigTemplates.java @@ -9,7 +9,7 @@ import com.mageddo.dnsproxyserver.config.SolverRemote; import com.mageddo.dnsproxyserver.config.SolverStub; import com.mageddo.dnsproxyserver.config.SolverSystem; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigEnv; +import com.mageddo.dnsproxyserver.config.legacyenv.ConfigEnv; import com.mageddo.dnsserver.SimpleServer; import com.mageddo.net.IP; diff --git a/src/test/java/testing/templates/config/ConfigEnvTemplates.java b/src/test/java/testing/templates/config/ConfigEnvTemplates.java index 79ba2e1ce..582a6bede 100644 --- a/src/test/java/testing/templates/config/ConfigEnvTemplates.java +++ b/src/test/java/testing/templates/config/ConfigEnvTemplates.java @@ -1,6 +1,6 @@ package testing.templates.config; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigEnv; +import com.mageddo.dnsproxyserver.config.legacyenv.ConfigEnv; import java.nio.file.Paths; From bfd06c2368cc7c7c3954b8ca83975f95744de88f Mon Sep 17 00:00:00 2001 From: Elvis de Freitas Date: Mon, 31 Mar 2025 10:03:13 -0300 Subject: [PATCH 04/13] refactoring --- .../mageddo/dnsproxyserver/config/legacyenv/ConfigEnv.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/legacyenv/ConfigEnv.java b/src/main/java/com/mageddo/dnsproxyserver/config/legacyenv/ConfigEnv.java index 65716372e..63df42963 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/legacyenv/ConfigEnv.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/legacyenv/ConfigEnv.java @@ -4,7 +4,6 @@ import com.mageddo.http.UriUtils; import lombok.Builder; import lombok.Value; -import org.apache.commons.lang3.StringUtils; import java.net.URI; import java.nio.file.Path; @@ -91,11 +90,7 @@ public static ConfigEnv fromEnv() { } static String findLogFilePath() { - final var logFile = System.getenv(MG_LOG_FILE); - if (StringUtils.isBlank(logFile)) { - return null; - } - return logFile; + return Envs.getStringOrNull(MG_LOG_FILE); } } From 923a53368485fabeb8ef24f956bf519598076133 Mon Sep 17 00:00:00 2001 From: Elvis de Freitas Date: Mon, 31 Mar 2025 10:07:01 -0300 Subject: [PATCH 05/13] refactoring --- .../config/configurator/module/ModuleConfigDAO.java | 2 +- .../config/dataprovider/JsonConfigs.java | 12 ++++++------ .../config/dataprovider/PersistentConfigDAOJson.java | 2 +- .../dataprovider/predicate/EntryPredicate.java | 2 +- .../dataprovider/predicate/JsonEnvPredicate.java | 2 +- .../config/di/module/ModuleConfigDAO.java | 2 +- .../{dataprovider => jsonv1v2}/ConfigDAOJson.java | 5 +++-- .../mapper => jsonv1v2}/ConfigJsonV1EnvsMapper.java | 4 ++-- .../mapper => jsonv1v2}/ConfigJsonV2EnvsMapper.java | 4 ++-- .../mapper => jsonv1v2}/ConfigJsonV2Mapper.java | 11 ++++++----- .../{dataprovider => jsonv1v2}/vo/ConfigJson.java | 2 +- .../{dataprovider => jsonv1v2}/vo/ConfigJsonV1.java | 4 ++-- .../{dataprovider => jsonv1v2}/vo/ConfigJsonV2.java | 4 ++-- .../config/jsonv1v2/vo/package-info.java | 9 +++++++++ .../java/com/mageddo/dnsproxyserver/AppIntTest.java | 2 +- .../mageddo/dnsproxyserver/config/ConfigTest.java | 2 +- .../config/dataprovider/ConfigDAOJsonTest.java | 1 + .../dataprovider/mapper/ConfigJsonV2MapperTest.java | 3 ++- .../config/entrypoint/JsonConfigsTest.java | 6 +++--- .../testing/templates/ConfigFlagArgsTemplates.java | 2 +- .../java/testing/templates/ConfigJsonTemplates.java | 2 +- 21 files changed, 48 insertions(+), 35 deletions(-) rename src/main/java/com/mageddo/dnsproxyserver/config/{dataprovider => jsonv1v2}/ConfigDAOJson.java (82%) rename src/main/java/com/mageddo/dnsproxyserver/config/{dataprovider/mapper => jsonv1v2}/ConfigJsonV1EnvsMapper.java (88%) rename src/main/java/com/mageddo/dnsproxyserver/config/{dataprovider/mapper => jsonv1v2}/ConfigJsonV2EnvsMapper.java (92%) rename src/main/java/com/mageddo/dnsproxyserver/config/{dataprovider/mapper => jsonv1v2}/ConfigJsonV2Mapper.java (92%) rename src/main/java/com/mageddo/dnsproxyserver/config/{dataprovider => jsonv1v2}/vo/ConfigJson.java (95%) rename src/main/java/com/mageddo/dnsproxyserver/config/{dataprovider => jsonv1v2}/vo/ConfigJsonV1.java (96%) rename src/main/java/com/mageddo/dnsproxyserver/config/{dataprovider => jsonv1v2}/vo/ConfigJsonV2.java (97%) create mode 100644 src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/package-info.java diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/configurator/module/ModuleConfigDAO.java b/src/main/java/com/mageddo/dnsproxyserver/config/configurator/module/ModuleConfigDAO.java index 8f9a07a25..3ec6754a6 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/configurator/module/ModuleConfigDAO.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/configurator/module/ModuleConfigDAO.java @@ -4,7 +4,7 @@ import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAO; import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOCmdArgs; import com.mageddo.dnsproxyserver.config.legacyenv.ConfigDAOLegacyEnv; -import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOJson; +import com.mageddo.dnsproxyserver.config.jsonv1v2.ConfigDAOJson; import dagger.Module; import dagger.Provides; import dagger.multibindings.ElementsIntoSet; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/JsonConfigs.java b/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/JsonConfigs.java index 2e1de3ba8..30ed9e749 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/JsonConfigs.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/JsonConfigs.java @@ -3,12 +3,12 @@ import com.fasterxml.jackson.databind.JsonNode; import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsproxyserver.config.application.Configs; -import com.mageddo.dnsproxyserver.config.dataprovider.mapper.ConfigJsonV2Mapper; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJson; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV1; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV2; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV2.Entry; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV2.Env; +import com.mageddo.dnsproxyserver.config.jsonv1v2.ConfigJsonV2Mapper; +import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJson; +import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV1; +import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2; +import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2.Entry; +import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2.Env; import com.mageddo.json.JsonUtils; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/PersistentConfigDAOJson.java b/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/PersistentConfigDAOJson.java index 247b3c674..2df196ffc 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/PersistentConfigDAOJson.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/PersistentConfigDAOJson.java @@ -5,7 +5,7 @@ import com.mageddo.dnsproxyserver.config.dataprovider.predicate.EntryPredicate; import com.mageddo.dnsproxyserver.config.dataprovider.predicate.EnvPredicate; import com.mageddo.dnsproxyserver.config.dataprovider.predicate.JsonEnvPredicate; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV2; +import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2; import com.mageddo.dnsproxyserver.solver.HostnameQuery; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/predicate/EntryPredicate.java b/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/predicate/EntryPredicate.java index f35dda3b0..cb560c85f 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/predicate/EntryPredicate.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/predicate/EntryPredicate.java @@ -1,7 +1,7 @@ package com.mageddo.dnsproxyserver.config.dataprovider.predicate; import com.mageddo.dnsproxyserver.config.Config; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV2; +import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2; import java.util.Objects; import java.util.function.Predicate; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/predicate/JsonEnvPredicate.java b/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/predicate/JsonEnvPredicate.java index ad947506f..388afcbcb 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/predicate/JsonEnvPredicate.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/predicate/JsonEnvPredicate.java @@ -1,6 +1,6 @@ package com.mageddo.dnsproxyserver.config.dataprovider.predicate; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV2; +import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2; import org.apache.commons.lang3.StringUtils; import java.util.function.Predicate; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java b/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java index f76673c00..6dafab6a5 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java @@ -4,7 +4,7 @@ import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAO; import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOCmdArgs; import com.mageddo.dnsproxyserver.config.legacyenv.ConfigDAOLegacyEnv; -import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOJson; +import com.mageddo.dnsproxyserver.config.jsonv1v2.ConfigDAOJson; import dagger.Module; import dagger.Provides; import dagger.multibindings.ElementsIntoSet; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOJson.java b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/ConfigDAOJson.java similarity index 82% rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOJson.java rename to src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/ConfigDAOJson.java index ec518f0d1..1fe95c7ae 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOJson.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/ConfigDAOJson.java @@ -1,8 +1,9 @@ -package com.mageddo.dnsproxyserver.config.dataprovider; +package com.mageddo.dnsproxyserver.config.jsonv1v2; import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsproxyserver.config.application.ConfigFileFinderService; -import com.mageddo.dnsproxyserver.config.dataprovider.mapper.ConfigJsonV2Mapper; +import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAO; +import com.mageddo.dnsproxyserver.config.dataprovider.JsonConfigs; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV1EnvsMapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/ConfigJsonV1EnvsMapper.java similarity index 88% rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV1EnvsMapper.java rename to src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/ConfigJsonV1EnvsMapper.java index 1ebbacc0a..e9034e2f5 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV1EnvsMapper.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/ConfigJsonV1EnvsMapper.java @@ -1,7 +1,7 @@ -package com.mageddo.dnsproxyserver.config.dataprovider.mapper; +package com.mageddo.dnsproxyserver.config.jsonv1v2; import com.mageddo.dnsproxyserver.config.Config; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV1; +import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV1; import com.mageddo.net.IpAddr; import java.util.List; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2EnvsMapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/ConfigJsonV2EnvsMapper.java similarity index 92% rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2EnvsMapper.java rename to src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/ConfigJsonV2EnvsMapper.java index 2915ef4e1..9338b8b87 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2EnvsMapper.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/ConfigJsonV2EnvsMapper.java @@ -1,7 +1,7 @@ -package com.mageddo.dnsproxyserver.config.dataprovider.mapper; +package com.mageddo.dnsproxyserver.config.jsonv1v2; import com.mageddo.dnsproxyserver.config.Config; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV2; +import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2; import com.mageddo.net.IP; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2Mapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/ConfigJsonV2Mapper.java similarity index 92% rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2Mapper.java rename to src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/ConfigJsonV2Mapper.java index c4251c63b..750b99800 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2Mapper.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/ConfigJsonV2Mapper.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.dataprovider.mapper; +package com.mageddo.dnsproxyserver.config.jsonv1v2; import com.mageddo.dnsproxyserver.config.CanaryRateThresholdCircuitBreakerStrategyConfig; import com.mageddo.dnsproxyserver.config.CircuitBreakerStrategyConfig; @@ -10,10 +10,11 @@ import com.mageddo.dnsproxyserver.config.SolverRemote; import com.mageddo.dnsproxyserver.config.SolverStub; import com.mageddo.dnsproxyserver.config.StaticThresholdCircuitBreakerStrategyConfig; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJson; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV2; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV2.CanaryRateThresholdCircuitBreaker; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV2.StaticThresholdCircuitBreaker; +import com.mageddo.dnsproxyserver.config.dataprovider.mapper.ConfigFieldsValuesMapper; +import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJson; +import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2; +import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2.CanaryRateThresholdCircuitBreaker; +import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2.StaticThresholdCircuitBreaker; import com.mageddo.dnsproxyserver.utils.Booleans; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigJson.java b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/ConfigJson.java similarity index 95% rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigJson.java rename to src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/ConfigJson.java index 540af52d1..5bf093521 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigJson.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/ConfigJson.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.dataprovider.vo; +package com.mageddo.dnsproxyserver.config.jsonv1v2.vo; import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsserver.SimpleServer; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigJsonV1.java b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/ConfigJsonV1.java similarity index 96% rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigJsonV1.java rename to src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/ConfigJsonV1.java index 52a9de0ba..2713d3576 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigJsonV1.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/ConfigJsonV1.java @@ -1,9 +1,9 @@ -package com.mageddo.dnsproxyserver.config.dataprovider.vo; +package com.mageddo.dnsproxyserver.config.jsonv1v2.vo; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.mageddo.dnsproxyserver.config.Config; -import com.mageddo.dnsproxyserver.config.dataprovider.mapper.ConfigJsonV1EnvsMapper; +import com.mageddo.dnsproxyserver.config.jsonv1v2.ConfigJsonV1EnvsMapper; import com.mageddo.dnsserver.SimpleServer; import com.mageddo.net.IpAddr; import lombok.Data; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigJsonV2.java b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/ConfigJsonV2.java similarity index 97% rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigJsonV2.java rename to src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/ConfigJsonV2.java index 9b2149c52..5afde24cd 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigJsonV2.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/ConfigJsonV2.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.dataprovider.vo; +package com.mageddo.dnsproxyserver.config.jsonv1v2.vo; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; @@ -11,7 +11,7 @@ import com.mageddo.dnsproxyserver.config.CircuitBreakerStrategyConfig; import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsproxyserver.config.Config.Entry.Type; -import com.mageddo.dnsproxyserver.config.dataprovider.mapper.ConfigJsonV2EnvsMapper; +import com.mageddo.dnsproxyserver.config.jsonv1v2.ConfigJsonV2EnvsMapper; import com.mageddo.dnsserver.SimpleServer; import com.mageddo.net.IP; import com.mageddo.net.IpAddr; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/package-info.java b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/package-info.java new file mode 100644 index 000000000..6dc863b06 --- /dev/null +++ b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/package-info.java @@ -0,0 +1,9 @@ +@Reflection( + scanPackage = "com.mageddo.dnsproxyserver.config.jsonv1v2.vo", + publicConstructors = true, constructors = true, declaredConstructors = true, + publicMethods = true, declaredMethods = true, + publicFields = true, declaredFields = true +) +package com.mageddo.dnsproxyserver.config.jsonv1v2.vo; + +import nativeimage.Reflection; diff --git a/src/test/java/com/mageddo/dnsproxyserver/AppIntTest.java b/src/test/java/com/mageddo/dnsproxyserver/AppIntTest.java index e28419962..42b7ec126 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/AppIntTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/AppIntTest.java @@ -5,7 +5,7 @@ import com.mageddo.dns.utils.Messages; import com.mageddo.dnsproxyserver.config.application.Configs; import com.mageddo.dnsproxyserver.config.dataprovider.JsonConfigs; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJson; +import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJson; import com.mageddo.dnsproxyserver.sandbox.Instance; import com.mageddo.dnsproxyserver.sandbox.Sandbox; import com.mageddo.dnsproxyserver.server.Starter; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/ConfigTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/ConfigTest.java index 562dae8b2..45251acd1 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/ConfigTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/ConfigTest.java @@ -2,7 +2,7 @@ import com.mageddo.dnsproxyserver.config.application.Configs; import com.mageddo.dnsproxyserver.config.dataprovider.JsonConfigs; -import com.mageddo.dnsproxyserver.config.dataprovider.mapper.ConfigJsonV2Mapper; +import com.mageddo.dnsproxyserver.config.jsonv1v2.ConfigJsonV2Mapper; import com.mageddo.utils.Files; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOJsonTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOJsonTest.java index e586e22e1..64f926f8d 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOJsonTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOJsonTest.java @@ -1,5 +1,6 @@ package com.mageddo.dnsproxyserver.config.dataprovider; +import com.mageddo.dnsproxyserver.config.jsonv1v2.ConfigDAOJson; import lombok.SneakyThrows; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2MapperTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2MapperTest.java index 1a09bad95..5d512cbc1 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2MapperTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2MapperTest.java @@ -1,7 +1,8 @@ package com.mageddo.dnsproxyserver.config.dataprovider.mapper; import com.mageddo.dnsproxyserver.config.Config; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJson; +import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJson; +import com.mageddo.dnsproxyserver.config.jsonv1v2.ConfigJsonV2Mapper; import org.junit.jupiter.api.Test; import testing.templates.ConfigJsonTemplates; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/JsonConfigsTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/JsonConfigsTest.java index e8772aa04..45290f9d6 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/JsonConfigsTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/JsonConfigsTest.java @@ -1,9 +1,9 @@ package com.mageddo.dnsproxyserver.config.entrypoint; import com.mageddo.dnsproxyserver.config.dataprovider.JsonConfigs; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV2; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV2.CanaryRateThresholdCircuitBreaker; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV2.StaticThresholdCircuitBreaker; +import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2; +import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2.CanaryRateThresholdCircuitBreaker; +import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2.StaticThresholdCircuitBreaker; import org.apache.commons.lang3.ClassUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/src/test/java/testing/templates/ConfigFlagArgsTemplates.java b/src/test/java/testing/templates/ConfigFlagArgsTemplates.java index 674b2f75a..4e560c433 100644 --- a/src/test/java/testing/templates/ConfigFlagArgsTemplates.java +++ b/src/test/java/testing/templates/ConfigFlagArgsTemplates.java @@ -1,6 +1,6 @@ package testing.templates; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJson; +import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJson; import com.mageddo.net.IpAddr; import com.mageddo.net.SocketUtils; import lombok.Builder; diff --git a/src/test/java/testing/templates/ConfigJsonTemplates.java b/src/test/java/testing/templates/ConfigJsonTemplates.java index b26c6dc6c..d74dbe4ca 100644 --- a/src/test/java/testing/templates/ConfigJsonTemplates.java +++ b/src/test/java/testing/templates/ConfigJsonTemplates.java @@ -1,7 +1,7 @@ package testing.templates; import com.mageddo.dnsproxyserver.config.dataprovider.JsonConfigs; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJson; +import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJson; import com.mageddo.utils.TestUtils; public class ConfigJsonTemplates { From db6ff941127f31984e235059d549e78a5dd9c3e0 Mon Sep 17 00:00:00 2001 From: Elvis de Freitas Date: Mon, 31 Mar 2025 10:12:36 -0300 Subject: [PATCH 06/13] refactoring --- src/main/java/com/mageddo/dnsproxyserver/App.java | 4 ++-- .../config/application/ConfigFileFinderService.java | 4 ++-- .../config/application/ConfigPathMapper.java | 2 +- .../{ => cmdargs}/dataprovider/ConfigDAOCmdArgs.java | 7 ++++--- .../dataprovider/mapper/ConfigFlagMapper.java | 7 ++++--- .../config/{ => cmdargs}/dataprovider/vo/ConfigFlag.java | 3 +-- .../{ => cmdargs}/dataprovider/vo/package-info.java | 4 ++-- .../config/configurator/module/ModuleConfigDAO.java | 4 ++-- ...ConfigFieldsValuesMapper.java => LogLevelMapper.java} | 2 +- .../dnsproxyserver/config/di/module/ModuleConfigDAO.java | 4 ++-- .../jsonv1v2/{ => dataprovider}/ConfigDAOJson.java | 4 ++-- .../config/{ => jsonv1v2}/dataprovider/JsonConfigs.java | 4 ++-- .../dataprovider/PersistentConfigDAOJson.java | 9 +++++---- .../dataprovider/predicate/EntryPredicate.java | 2 +- .../dataprovider/predicate/EnvPredicate.java | 2 +- .../dataprovider/predicate/JsonEnvPredicate.java | 2 +- .../jsonv1v2/{ => mapper}/ConfigJsonV1EnvsMapper.java | 2 +- .../jsonv1v2/{ => mapper}/ConfigJsonV2EnvsMapper.java | 2 +- .../config/jsonv1v2/{ => mapper}/ConfigJsonV2Mapper.java | 8 ++++---- .../dnsproxyserver/config/jsonv1v2/vo/ConfigJsonV1.java | 2 +- .../dnsproxyserver/config/jsonv1v2/vo/ConfigJsonV2.java | 2 +- .../dnsproxyserver/config/legacyenv/ConfigEnvMapper.java | 4 ++-- .../dnsproxyserver/dataprovider/LogSettingsDAOSlf4j.java | 4 ++-- .../com/mageddo/dnsproxyserver/di/module/ModuleDao.java | 2 +- src/test/java/com/mageddo/dnsproxyserver/AppIntTest.java | 2 +- .../com/mageddo/dnsproxyserver/config/ConfigTest.java | 4 ++-- .../config/PersistentConfigDAOJsonTest.java | 2 +- .../config/application/ConfigFileFinderServiceTest.java | 2 +- .../config/application/ConfigPathMapperTest.java | 2 +- .../config/application/ConfigServiceCompTest.java | 2 +- .../config/dataprovider/ConfigDAOJsonTest.java | 2 +- .../config/dataprovider/mapper/ConfigFlagMapperTest.java | 1 + .../dataprovider/mapper/ConfigJsonV2MapperTest.java | 2 +- .../config/entrypoint/ConfigJsonV1Test.java | 2 +- .../config/entrypoint/JsonConfigsTest.java | 4 ++-- .../dnsproxyserver/config/flags/ConfigFlagTest.java | 2 +- .../dnsproxyserver/server/rest/EnvResourceCompTest.java | 2 +- src/test/java/testing/ContextSupplier.java | 2 +- src/test/java/testing/templates/ConfigFlagTemplates.java | 2 +- src/test/java/testing/templates/ConfigJsonTemplates.java | 2 +- 40 files changed, 64 insertions(+), 61 deletions(-) rename src/main/java/com/mageddo/dnsproxyserver/config/{ => cmdargs}/dataprovider/ConfigDAOCmdArgs.java (70%) rename src/main/java/com/mageddo/dnsproxyserver/config/{ => cmdargs}/dataprovider/mapper/ConfigFlagMapper.java (88%) rename src/main/java/com/mageddo/dnsproxyserver/config/{ => cmdargs}/dataprovider/vo/ConfigFlag.java (99%) rename src/main/java/com/mageddo/dnsproxyserver/config/{ => cmdargs}/dataprovider/vo/package-info.java (60%) rename src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/{ConfigFieldsValuesMapper.java => LogLevelMapper.java} (95%) rename src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/{ => dataprovider}/ConfigDAOJson.java (86%) rename src/main/java/com/mageddo/dnsproxyserver/config/{ => jsonv1v2}/dataprovider/JsonConfigs.java (96%) rename src/main/java/com/mageddo/dnsproxyserver/config/{ => jsonv1v2}/dataprovider/PersistentConfigDAOJson.java (93%) rename src/main/java/com/mageddo/dnsproxyserver/config/{ => jsonv1v2}/dataprovider/predicate/EntryPredicate.java (89%) rename src/main/java/com/mageddo/dnsproxyserver/config/{ => jsonv1v2}/dataprovider/predicate/EnvPredicate.java (79%) rename src/main/java/com/mageddo/dnsproxyserver/config/{ => jsonv1v2}/dataprovider/predicate/JsonEnvPredicate.java (85%) rename src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/{ => mapper}/ConfigJsonV1EnvsMapper.java (94%) rename src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/{ => mapper}/ConfigJsonV2EnvsMapper.java (96%) rename src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/{ => mapper}/ConfigJsonV2Mapper.java (95%) diff --git a/src/main/java/com/mageddo/dnsproxyserver/App.java b/src/main/java/com/mageddo/dnsproxyserver/App.java index e372c8261..43b59cd18 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/App.java +++ b/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.cmdargs.dataprovider.ConfigDAOCmdArgs; +import com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.vo.ConfigFlag; import com.mageddo.dnsproxyserver.di.Context; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderService.java b/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderService.java index 3a312da2e..ce1dd79fc 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderService.java +++ b/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.cmdargs.dataprovider.ConfigDAOCmdArgs; import com.mageddo.dnsproxyserver.config.legacyenv.ConfigDAOLegacyEnv; import com.mageddo.dnsproxyserver.config.legacyenv.ConfigEnv; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigFlag; +import com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.vo.ConfigFlag; import com.mageddo.dnsproxyserver.utils.ObjectUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigPathMapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigPathMapper.java index 19f3b600f..6253fca4c 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigPathMapper.java +++ b/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.cmdargs.dataprovider.vo.ConfigFlag; import com.mageddo.utils.Files; import com.mageddo.utils.Runtime; import com.mageddo.utils.Tests; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOCmdArgs.java b/src/main/java/com/mageddo/dnsproxyserver/config/cmdargs/dataprovider/ConfigDAOCmdArgs.java similarity index 70% rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOCmdArgs.java rename to src/main/java/com/mageddo/dnsproxyserver/config/cmdargs/dataprovider/ConfigDAOCmdArgs.java index e34053fc2..1867bbba2 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOCmdArgs.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/cmdargs/dataprovider/ConfigDAOCmdArgs.java @@ -1,8 +1,9 @@ -package com.mageddo.dnsproxyserver.config.dataprovider; +package com.mageddo.dnsproxyserver.config.cmdargs.dataprovider; import com.mageddo.dnsproxyserver.config.Config; -import com.mageddo.dnsproxyserver.config.dataprovider.mapper.ConfigFlagMapper; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigFlag; +import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAO; +import com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.mapper.ConfigFlagMapper; +import com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.vo.ConfigFlag; import lombok.RequiredArgsConstructor; import javax.inject.Inject; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigFlagMapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/cmdargs/dataprovider/mapper/ConfigFlagMapper.java similarity index 88% rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigFlagMapper.java rename to src/main/java/com/mageddo/dnsproxyserver/config/cmdargs/dataprovider/mapper/ConfigFlagMapper.java index eeec7c799..821766a7f 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigFlagMapper.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/cmdargs/dataprovider/mapper/ConfigFlagMapper.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.dataprovider.mapper; +package com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.mapper; import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsproxyserver.config.Log; @@ -7,7 +7,8 @@ import com.mageddo.dnsproxyserver.config.SolverRemote; import com.mageddo.dnsproxyserver.config.SolverStub; import com.mageddo.dnsproxyserver.config.SolverSystem; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigFlag; +import com.mageddo.dnsproxyserver.config.dataprovider.mapper.LogLevelMapper; +import com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.vo.ConfigFlag; import com.mageddo.dnsproxyserver.utils.Booleans; import com.mageddo.utils.Files; @@ -25,7 +26,7 @@ public static Config toConfig(ConfigFlag config) { .log(Log .builder() .file(config.getLogToFile()) - .level(ConfigFieldsValuesMapper.mapLogLevelFrom(config.getLogLevel())) + .level(LogLevelMapper.mapLogLevelFrom(config.getLogLevel())) .build() ) .defaultDns(Config.DefaultDns.builder() diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigFlag.java b/src/main/java/com/mageddo/dnsproxyserver/config/cmdargs/dataprovider/vo/ConfigFlag.java similarity index 99% rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigFlag.java rename to src/main/java/com/mageddo/dnsproxyserver/config/cmdargs/dataprovider/vo/ConfigFlag.java index 17f803b39..cfbe8d892 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigFlag.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/cmdargs/dataprovider/vo/ConfigFlag.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.dataprovider.vo; +package com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.vo; import com.fasterxml.jackson.annotation.JsonIgnore; import com.mageddo.dnsproxyserver.config.dataprovider.ConfigPropDAO; @@ -15,7 +15,6 @@ import java.nio.file.Paths; import java.util.concurrent.Callable; - @Getter @NoArgsConstructor public class ConfigFlag implements Callable { diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/package-info.java b/src/main/java/com/mageddo/dnsproxyserver/config/cmdargs/dataprovider/vo/package-info.java similarity index 60% rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/package-info.java rename to src/main/java/com/mageddo/dnsproxyserver/config/cmdargs/dataprovider/vo/package-info.java index 283c74d35..17a20621e 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/package-info.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/cmdargs/dataprovider/vo/package-info.java @@ -1,9 +1,9 @@ @Reflection( - scanPackage = "com.mageddo.dnsproxyserver.config.dataprovider.vo", + scanPackage = "com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.vo", publicConstructors = true, constructors = true, declaredConstructors = true, publicMethods = true, declaredMethods = true, publicFields = true, declaredFields = true ) -package com.mageddo.dnsproxyserver.config.dataprovider.vo; +package com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.vo; import nativeimage.Reflection; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/configurator/module/ModuleConfigDAO.java b/src/main/java/com/mageddo/dnsproxyserver/config/configurator/module/ModuleConfigDAO.java index 3ec6754a6..fe6401903 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/configurator/module/ModuleConfigDAO.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/configurator/module/ModuleConfigDAO.java @@ -2,9 +2,9 @@ import com.mageddo.di.InstanceImpl; import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAO; -import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOCmdArgs; +import com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.ConfigDAOCmdArgs; import com.mageddo.dnsproxyserver.config.legacyenv.ConfigDAOLegacyEnv; -import com.mageddo.dnsproxyserver.config.jsonv1v2.ConfigDAOJson; +import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.ConfigDAOJson; import dagger.Module; import dagger.Provides; import dagger.multibindings.ElementsIntoSet; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigFieldsValuesMapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/LogLevelMapper.java similarity index 95% rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigFieldsValuesMapper.java rename to src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/LogLevelMapper.java index 5a6f33e5b..eb2631728 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigFieldsValuesMapper.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/LogLevelMapper.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.StringUtils; @Slf4j -public class ConfigFieldsValuesMapper { +public class LogLevelMapper { public static LogLevel mapLogLevelFrom(String logLevelName) { final var level = EnumUtils.getEnumIgnoreCase(LogLevel.class, logLevelName); if (StringUtils.isNotBlank(logLevelName) && level == null) { diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java b/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java index 6dafab6a5..30a25b41d 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java @@ -2,9 +2,9 @@ import com.mageddo.di.InstanceImpl; import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAO; -import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOCmdArgs; +import com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.ConfigDAOCmdArgs; import com.mageddo.dnsproxyserver.config.legacyenv.ConfigDAOLegacyEnv; -import com.mageddo.dnsproxyserver.config.jsonv1v2.ConfigDAOJson; +import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.ConfigDAOJson; import dagger.Module; import dagger.Provides; import dagger.multibindings.ElementsIntoSet; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/ConfigDAOJson.java b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/ConfigDAOJson.java similarity index 86% rename from src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/ConfigDAOJson.java rename to src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/ConfigDAOJson.java index 1fe95c7ae..eb4e10f02 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/ConfigDAOJson.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/ConfigDAOJson.java @@ -1,9 +1,9 @@ -package com.mageddo.dnsproxyserver.config.jsonv1v2; +package com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider; import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsproxyserver.config.application.ConfigFileFinderService; import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAO; -import com.mageddo.dnsproxyserver.config.dataprovider.JsonConfigs; +import com.mageddo.dnsproxyserver.config.jsonv1v2.mapper.ConfigJsonV2Mapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/JsonConfigs.java b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/JsonConfigs.java similarity index 96% rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/JsonConfigs.java rename to src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/JsonConfigs.java index 30ed9e749..723875fcc 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/JsonConfigs.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/JsonConfigs.java @@ -1,9 +1,9 @@ -package com.mageddo.dnsproxyserver.config.dataprovider; +package com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider; import com.fasterxml.jackson.databind.JsonNode; import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsproxyserver.config.application.Configs; -import com.mageddo.dnsproxyserver.config.jsonv1v2.ConfigJsonV2Mapper; +import com.mageddo.dnsproxyserver.config.jsonv1v2.mapper.ConfigJsonV2Mapper; import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJson; import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV1; import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/PersistentConfigDAOJson.java b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/PersistentConfigDAOJson.java similarity index 93% rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/PersistentConfigDAOJson.java rename to src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/PersistentConfigDAOJson.java index 2df196ffc..b0b922e52 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/PersistentConfigDAOJson.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/PersistentConfigDAOJson.java @@ -1,10 +1,11 @@ -package com.mageddo.dnsproxyserver.config.dataprovider; +package com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider; import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsproxyserver.config.application.Configs; -import com.mageddo.dnsproxyserver.config.dataprovider.predicate.EntryPredicate; -import com.mageddo.dnsproxyserver.config.dataprovider.predicate.EnvPredicate; -import com.mageddo.dnsproxyserver.config.dataprovider.predicate.JsonEnvPredicate; +import com.mageddo.dnsproxyserver.config.dataprovider.PersistentConfigDAO; +import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.predicate.EntryPredicate; +import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.predicate.EnvPredicate; +import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.predicate.JsonEnvPredicate; import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2; import com.mageddo.dnsproxyserver.solver.HostnameQuery; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/predicate/EntryPredicate.java b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/predicate/EntryPredicate.java similarity index 89% rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/predicate/EntryPredicate.java rename to src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/predicate/EntryPredicate.java index cb560c85f..6c5a5694c 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/predicate/EntryPredicate.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/predicate/EntryPredicate.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.dataprovider.predicate; +package com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.predicate; import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/predicate/EnvPredicate.java b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/predicate/EnvPredicate.java similarity index 79% rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/predicate/EnvPredicate.java rename to src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/predicate/EnvPredicate.java index 0e9a1b366..6b20fa313 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/predicate/EnvPredicate.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/predicate/EnvPredicate.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.dataprovider.predicate; +package com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.predicate; import com.mageddo.dnsproxyserver.config.Config; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/predicate/JsonEnvPredicate.java b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/predicate/JsonEnvPredicate.java similarity index 85% rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/predicate/JsonEnvPredicate.java rename to src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/predicate/JsonEnvPredicate.java index 388afcbcb..af9c67041 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/predicate/JsonEnvPredicate.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/predicate/JsonEnvPredicate.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.dataprovider.predicate; +package com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.predicate; import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/ConfigJsonV1EnvsMapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/mapper/ConfigJsonV1EnvsMapper.java similarity index 94% rename from src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/ConfigJsonV1EnvsMapper.java rename to src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/mapper/ConfigJsonV1EnvsMapper.java index e9034e2f5..c107a1bc1 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/ConfigJsonV1EnvsMapper.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/mapper/ConfigJsonV1EnvsMapper.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.jsonv1v2; +package com.mageddo.dnsproxyserver.config.jsonv1v2.mapper; import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV1; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/ConfigJsonV2EnvsMapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/mapper/ConfigJsonV2EnvsMapper.java similarity index 96% rename from src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/ConfigJsonV2EnvsMapper.java rename to src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/mapper/ConfigJsonV2EnvsMapper.java index 9338b8b87..ee7fc86c3 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/ConfigJsonV2EnvsMapper.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/mapper/ConfigJsonV2EnvsMapper.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.jsonv1v2; +package com.mageddo.dnsproxyserver.config.jsonv1v2.mapper; import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/ConfigJsonV2Mapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/mapper/ConfigJsonV2Mapper.java similarity index 95% rename from src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/ConfigJsonV2Mapper.java rename to src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/mapper/ConfigJsonV2Mapper.java index 750b99800..e68efd1c9 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/ConfigJsonV2Mapper.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/mapper/ConfigJsonV2Mapper.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.jsonv1v2; +package com.mageddo.dnsproxyserver.config.jsonv1v2.mapper; import com.mageddo.dnsproxyserver.config.CanaryRateThresholdCircuitBreakerStrategyConfig; import com.mageddo.dnsproxyserver.config.CircuitBreakerStrategyConfig; @@ -10,7 +10,7 @@ import com.mageddo.dnsproxyserver.config.SolverRemote; import com.mageddo.dnsproxyserver.config.SolverStub; import com.mageddo.dnsproxyserver.config.StaticThresholdCircuitBreakerStrategyConfig; -import com.mageddo.dnsproxyserver.config.dataprovider.mapper.ConfigFieldsValuesMapper; +import com.mageddo.dnsproxyserver.config.dataprovider.mapper.LogLevelMapper; import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJson; import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2; import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2.CanaryRateThresholdCircuitBreaker; @@ -46,8 +46,8 @@ public static Config toConfig(ConfigJson json, Path configFileAbsolutePath) { ) .log(Log .builder() - .level(ConfigFieldsValuesMapper.mapLogLevelFrom(json.getLogLevel())) - .file(ConfigFieldsValuesMapper.mapLogFileFrom(json.getLogFile())) + .level(LogLevelMapper.mapLogLevelFrom(json.getLogLevel())) + .file(LogLevelMapper.mapLogFileFrom(json.getLogFile())) .build() ) .configPath(configFileAbsolutePath) diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/ConfigJsonV1.java b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/ConfigJsonV1.java index 2713d3576..85abd83d7 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/ConfigJsonV1.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/ConfigJsonV1.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.mageddo.dnsproxyserver.config.Config; -import com.mageddo.dnsproxyserver.config.jsonv1v2.ConfigJsonV1EnvsMapper; +import com.mageddo.dnsproxyserver.config.jsonv1v2.mapper.ConfigJsonV1EnvsMapper; import com.mageddo.dnsserver.SimpleServer; import com.mageddo.net.IpAddr; import lombok.Data; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/ConfigJsonV2.java b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/ConfigJsonV2.java index 5afde24cd..3f77e6d69 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/ConfigJsonV2.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/ConfigJsonV2.java @@ -11,7 +11,7 @@ import com.mageddo.dnsproxyserver.config.CircuitBreakerStrategyConfig; import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsproxyserver.config.Config.Entry.Type; -import com.mageddo.dnsproxyserver.config.jsonv1v2.ConfigJsonV2EnvsMapper; +import com.mageddo.dnsproxyserver.config.jsonv1v2.mapper.ConfigJsonV2EnvsMapper; import com.mageddo.dnsserver.SimpleServer; import com.mageddo.net.IP; import com.mageddo.net.IpAddr; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/legacyenv/ConfigEnvMapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/legacyenv/ConfigEnvMapper.java index b51611df2..545f4471a 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/legacyenv/ConfigEnvMapper.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/legacyenv/ConfigEnvMapper.java @@ -7,7 +7,7 @@ import com.mageddo.dnsproxyserver.config.SolverRemote; import com.mageddo.dnsproxyserver.config.SolverStub; import com.mageddo.dnsproxyserver.config.SolverSystem; -import com.mageddo.dnsproxyserver.config.dataprovider.mapper.ConfigFieldsValuesMapper; +import com.mageddo.dnsproxyserver.config.dataprovider.mapper.LogLevelMapper; import com.mageddo.dnsproxyserver.utils.Booleans; public class ConfigEnvMapper { @@ -21,7 +21,7 @@ public static Config toConfig(ConfigEnv config) { .log(Log .builder() .file(config.getLogFile()) - .level(ConfigFieldsValuesMapper.mapLogLevelFrom(config.getLogLevel())) + .level(LogLevelMapper.mapLogLevelFrom(config.getLogLevel())) .build() ) .defaultDns(Config.DefaultDns diff --git a/src/main/java/com/mageddo/dnsproxyserver/dataprovider/LogSettingsDAOSlf4j.java b/src/main/java/com/mageddo/dnsproxyserver/dataprovider/LogSettingsDAOSlf4j.java index 36b5b7553..a678e91ca 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/dataprovider/LogSettingsDAOSlf4j.java +++ b/src/main/java/com/mageddo/dnsproxyserver/dataprovider/LogSettingsDAOSlf4j.java @@ -3,7 +3,7 @@ import ch.qos.logback.classic.Level; import com.mageddo.commons.io.IoUtils; import com.mageddo.dnsproxyserver.config.Config; -import com.mageddo.dnsproxyserver.config.dataprovider.mapper.ConfigFieldsValuesMapper; +import com.mageddo.dnsproxyserver.config.dataprovider.mapper.LogLevelMapper; import com.mageddo.logback.LogbackUtils; import lombok.extern.slf4j.Slf4j; @@ -19,7 +19,7 @@ public class LogSettingsDAOSlf4j implements LogSettingsDAO { @Override public void setupLogFile(Config config) { - final var logFile = ConfigFieldsValuesMapper.mapLogFileFrom(config.getLogFile()); + final var logFile = LogLevelMapper.mapLogFileFrom(config.getLogFile()); if (logFile == null) { disableLogging(); } else if (isLogFileConfig(logFile)) { diff --git a/src/main/java/com/mageddo/dnsproxyserver/di/module/ModuleDao.java b/src/main/java/com/mageddo/dnsproxyserver/di/module/ModuleDao.java index c0b2f6425..eb2a13d3b 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/di/module/ModuleDao.java +++ b/src/main/java/com/mageddo/dnsproxyserver/di/module/ModuleDao.java @@ -1,7 +1,7 @@ package com.mageddo.dnsproxyserver.di.module; import com.mageddo.dnsproxyserver.config.dataprovider.PersistentConfigDAO; -import com.mageddo.dnsproxyserver.config.dataprovider.PersistentConfigDAOJson; +import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.PersistentConfigDAOJson; import com.mageddo.dnsproxyserver.docker.dataprovider.ContainerFacade; import com.mageddo.dnsproxyserver.docker.dataprovider.ContainerFacadeDefault; import com.mageddo.dnsproxyserver.docker.dataprovider.DockerNetworkFacade; diff --git a/src/test/java/com/mageddo/dnsproxyserver/AppIntTest.java b/src/test/java/com/mageddo/dnsproxyserver/AppIntTest.java index 42b7ec126..06c6f8db4 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/AppIntTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/AppIntTest.java @@ -4,7 +4,7 @@ import com.mageddo.commons.exec.ProcessesWatchDog; import com.mageddo.dns.utils.Messages; import com.mageddo.dnsproxyserver.config.application.Configs; -import com.mageddo.dnsproxyserver.config.dataprovider.JsonConfigs; +import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.JsonConfigs; import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJson; import com.mageddo.dnsproxyserver.sandbox.Instance; import com.mageddo.dnsproxyserver.sandbox.Sandbox; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/ConfigTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/ConfigTest.java index 45251acd1..2c10b5b8e 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/ConfigTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/ConfigTest.java @@ -1,8 +1,8 @@ package com.mageddo.dnsproxyserver.config; import com.mageddo.dnsproxyserver.config.application.Configs; -import com.mageddo.dnsproxyserver.config.dataprovider.JsonConfigs; -import com.mageddo.dnsproxyserver.config.jsonv1v2.ConfigJsonV2Mapper; +import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.JsonConfigs; +import com.mageddo.dnsproxyserver.config.jsonv1v2.mapper.ConfigJsonV2Mapper; import com.mageddo.utils.Files; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/PersistentConfigDAOJsonTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/PersistentConfigDAOJsonTest.java index 409ea3c78..bac306e61 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/PersistentConfigDAOJsonTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/PersistentConfigDAOJsonTest.java @@ -1,7 +1,7 @@ package com.mageddo.dnsproxyserver.config; import com.mageddo.dnsproxyserver.config.Config.Entry.Type; -import com.mageddo.dnsproxyserver.config.dataprovider.PersistentConfigDAOJson; +import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.PersistentConfigDAOJson; import com.mageddo.dnsproxyserver.solver.HostnameQuery; import testing.templates.EnvTemplates; import testing.templates.HostnameQueryTemplates; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderServiceTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderServiceTest.java index 575eeb618..22e43e8d0 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderServiceTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderServiceTest.java @@ -1,6 +1,6 @@ package com.mageddo.dnsproxyserver.config.application; -import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOCmdArgs; +import com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.ConfigDAOCmdArgs; import com.mageddo.dnsproxyserver.config.legacyenv.ConfigDAOLegacyEnv; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigPathMapperTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigPathMapperTest.java index 95b06db2c..b5f8d2ce9 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigPathMapperTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigPathMapperTest.java @@ -1,6 +1,6 @@ package com.mageddo.dnsproxyserver.config.application; -import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOCmdArgs; +import com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.ConfigDAOCmdArgs; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; import testing.templates.ConfigFlagTemplates; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigServiceCompTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigServiceCompTest.java index 745afbb52..fc732041d 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigServiceCompTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigServiceCompTest.java @@ -2,7 +2,7 @@ import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsproxyserver.config.LogLevel; -import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOCmdArgs; +import com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.ConfigDAOCmdArgs; import com.mageddo.dnsproxyserver.config.di.Context; import dagger.sheath.junit.DaggerTest; import lombok.SneakyThrows; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOJsonTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOJsonTest.java index 64f926f8d..d1375dfa0 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOJsonTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOJsonTest.java @@ -1,6 +1,6 @@ package com.mageddo.dnsproxyserver.config.dataprovider; -import com.mageddo.dnsproxyserver.config.jsonv1v2.ConfigDAOJson; +import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.ConfigDAOJson; import lombok.SneakyThrows; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigFlagMapperTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigFlagMapperTest.java index 1e4500dba..819fc25d5 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigFlagMapperTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigFlagMapperTest.java @@ -1,5 +1,6 @@ package com.mageddo.dnsproxyserver.config.dataprovider.mapper; +import com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.mapper.ConfigFlagMapper; import org.junit.jupiter.api.Test; import testing.templates.ConfigFlagTemplates; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2MapperTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2MapperTest.java index 5d512cbc1..db35618a2 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2MapperTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2MapperTest.java @@ -2,7 +2,7 @@ import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJson; -import com.mageddo.dnsproxyserver.config.jsonv1v2.ConfigJsonV2Mapper; +import com.mageddo.dnsproxyserver.config.jsonv1v2.mapper.ConfigJsonV2Mapper; import org.junit.jupiter.api.Test; import testing.templates.ConfigJsonTemplates; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/ConfigJsonV1Test.java b/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/ConfigJsonV1Test.java index 19c156b2a..1e5a33382 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/ConfigJsonV1Test.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/ConfigJsonV1Test.java @@ -1,6 +1,6 @@ package com.mageddo.dnsproxyserver.config.entrypoint; -import com.mageddo.dnsproxyserver.config.dataprovider.JsonConfigs; +import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.JsonConfigs; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/JsonConfigsTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/JsonConfigsTest.java index 45290f9d6..554d43da0 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/JsonConfigsTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/JsonConfigsTest.java @@ -1,6 +1,6 @@ package com.mageddo.dnsproxyserver.config.entrypoint; -import com.mageddo.dnsproxyserver.config.dataprovider.JsonConfigs; +import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.JsonConfigs; import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2; import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2.CanaryRateThresholdCircuitBreaker; import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2.StaticThresholdCircuitBreaker; @@ -12,7 +12,7 @@ import java.nio.file.Path; import java.time.Duration; -import static com.mageddo.dnsproxyserver.config.dataprovider.JsonConfigs.findVersion; +import static com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.JsonConfigs.findVersion; import static com.mageddo.utils.TestUtils.readAndSortJson; import static com.mageddo.utils.TestUtils.readAsStream; import static com.mageddo.utils.TestUtils.readSortDonWriteNullsAndExcludeFields; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/flags/ConfigFlagTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/flags/ConfigFlagTest.java index 93d92a68f..deaa8630f 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/flags/ConfigFlagTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/flags/ConfigFlagTest.java @@ -1,7 +1,7 @@ package com.mageddo.dnsproxyserver.config.flags; import com.mageddo.commons.regex.Regexes; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigFlag; +import com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.vo.ConfigFlag; import org.junit.jupiter.api.Test; import java.io.PrintWriter; diff --git a/src/test/java/com/mageddo/dnsproxyserver/server/rest/EnvResourceCompTest.java b/src/test/java/com/mageddo/dnsproxyserver/server/rest/EnvResourceCompTest.java index 1e43596b4..2a5efd899 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/server/rest/EnvResourceCompTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/server/rest/EnvResourceCompTest.java @@ -1,7 +1,7 @@ package com.mageddo.dnsproxyserver.server.rest; import com.mageddo.dnsproxyserver.config.application.Configs; -import com.mageddo.dnsproxyserver.config.dataprovider.JsonConfigs; +import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.JsonConfigs; import dagger.sheath.junit.DaggerTest; import io.restassured.http.ContentType; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/testing/ContextSupplier.java b/src/test/java/testing/ContextSupplier.java index b6f8d93af..51e99f8a6 100644 --- a/src/test/java/testing/ContextSupplier.java +++ b/src/test/java/testing/ContextSupplier.java @@ -1,7 +1,7 @@ package testing; import com.mageddo.dnsproxyserver.config.application.Configs; -import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOCmdArgs; +import com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.ConfigDAOCmdArgs; import com.mageddo.dnsproxyserver.di.Context; import com.mageddo.net.SocketUtils; diff --git a/src/test/java/testing/templates/ConfigFlagTemplates.java b/src/test/java/testing/templates/ConfigFlagTemplates.java index b96c71045..c5a72057e 100644 --- a/src/test/java/testing/templates/ConfigFlagTemplates.java +++ b/src/test/java/testing/templates/ConfigFlagTemplates.java @@ -1,6 +1,6 @@ package testing.templates; -import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigFlag; +import com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.vo.ConfigFlag; import java.nio.file.Path; diff --git a/src/test/java/testing/templates/ConfigJsonTemplates.java b/src/test/java/testing/templates/ConfigJsonTemplates.java index d74dbe4ca..519b0f4e8 100644 --- a/src/test/java/testing/templates/ConfigJsonTemplates.java +++ b/src/test/java/testing/templates/ConfigJsonTemplates.java @@ -1,6 +1,6 @@ package testing.templates; -import com.mageddo.dnsproxyserver.config.dataprovider.JsonConfigs; +import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.JsonConfigs; import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJson; import com.mageddo.utils.TestUtils; From bb83c1ab6b844153a33c39be1d9d2a9c10d1593c Mon Sep 17 00:00:00 2001 From: Elvis de Freitas Date: Mon, 31 Mar 2025 10:13:45 -0300 Subject: [PATCH 07/13] refactoring --- src/main/java/com/mageddo/dnsproxyserver/App.java | 4 ++-- .../application/ConfigFileFinderService.java | 8 ++++---- .../config/application/ConfigPathMapper.java | 2 +- .../configurator/module/ModuleConfigDAO.java | 6 +++--- .../config/di/module/ModuleConfigDAO.java | 6 +++--- .../cmdargs}/ConfigDAOCmdArgs.java | 6 +++--- .../cmdargs}/mapper/ConfigFlagMapper.java | 4 ++-- .../cmdargs}/vo/ConfigFlag.java | 2 +- .../cmdargs}/vo/package-info.java | 2 +- .../jsonv1v2/dataprovider/ConfigDAOJson.java | 4 ++-- .../jsonv1v2/dataprovider/JsonConfigs.java | 14 +++++++------- .../dataprovider/PersistentConfigDAOJson.java | 10 +++++----- .../dataprovider/predicate/EntryPredicate.java | 4 ++-- .../dataprovider/predicate/EnvPredicate.java | 2 +- .../dataprovider/predicate/JsonEnvPredicate.java | 4 ++-- .../jsonv1v2/mapper/ConfigJsonV1EnvsMapper.java | 4 ++-- .../jsonv1v2/mapper/ConfigJsonV2EnvsMapper.java | 4 ++-- .../jsonv1v2/mapper/ConfigJsonV2Mapper.java | 10 +++++----- .../{ => provider}/jsonv1v2/vo/ConfigJson.java | 2 +- .../{ => provider}/jsonv1v2/vo/ConfigJsonV1.java | 4 ++-- .../{ => provider}/jsonv1v2/vo/ConfigJsonV2.java | 4 ++-- .../{ => provider}/jsonv1v2/vo/package-info.java | 2 +- .../legacyenv/ConfigDAOLegacyEnv.java | 2 +- .../config/{ => provider}/legacyenv/ConfigEnv.java | 2 +- .../{ => provider}/legacyenv/ConfigEnvMapper.java | 2 +- .../dnsproxyserver/di/module/ModuleDao.java | 2 +- .../sandbox/BinaryFromGradleTestsSandbox.java | 2 +- .../com/mageddo/dnsproxyserver/AppIntTest.java | 4 ++-- .../mageddo/dnsproxyserver/config/ConfigTest.java | 4 ++-- .../config/PersistentConfigDAOJsonTest.java | 2 +- .../application/ConfigFileFinderServiceTest.java | 4 ++-- .../config/application/ConfigPathMapperTest.java | 2 +- .../config/application/ConfigServiceCompTest.java | 2 +- .../config/dataprovider/ConfigDAOJsonTest.java | 2 +- .../dataprovider/mapper/ConfigEnvMapperTest.java | 2 +- .../dataprovider/mapper/ConfigFlagMapperTest.java | 2 +- .../mapper/ConfigJsonV2MapperTest.java | 4 ++-- .../config/entrypoint/ConfigJsonV1Test.java | 2 +- .../config/entrypoint/JsonConfigsTest.java | 10 +++++----- .../config/flags/ConfigFlagTest.java | 2 +- .../linux/DnsConfiguratorLinuxTest.java | 2 +- .../server/rest/EnvResourceCompTest.java | 2 +- src/test/java/testing/ContextSupplier.java | 2 +- .../testing/templates/ConfigFlagArgsTemplates.java | 2 +- .../testing/templates/ConfigFlagTemplates.java | 2 +- .../testing/templates/ConfigJsonTemplates.java | 4 ++-- .../java/testing/templates/ConfigTemplates.java | 2 +- .../templates/config/ConfigEnvTemplates.java | 2 +- 48 files changed, 89 insertions(+), 89 deletions(-) rename src/main/java/com/mageddo/dnsproxyserver/config/{cmdargs/dataprovider => provider/cmdargs}/ConfigDAOCmdArgs.java (76%) rename src/main/java/com/mageddo/dnsproxyserver/config/{cmdargs/dataprovider => provider/cmdargs}/mapper/ConfigFlagMapper.java (94%) rename src/main/java/com/mageddo/dnsproxyserver/config/{cmdargs/dataprovider => provider/cmdargs}/vo/ConfigFlag.java (99%) rename src/main/java/com/mageddo/dnsproxyserver/config/{cmdargs/dataprovider => provider/cmdargs}/vo/package-info.java (81%) rename src/main/java/com/mageddo/dnsproxyserver/config/{ => provider}/jsonv1v2/dataprovider/ConfigDAOJson.java (85%) rename src/main/java/com/mageddo/dnsproxyserver/config/{ => provider}/jsonv1v2/dataprovider/JsonConfigs.java (87%) rename src/main/java/com/mageddo/dnsproxyserver/config/{ => provider}/jsonv1v2/dataprovider/PersistentConfigDAOJson.java (92%) rename src/main/java/com/mageddo/dnsproxyserver/config/{ => provider}/jsonv1v2/dataprovider/predicate/EntryPredicate.java (78%) rename src/main/java/com/mageddo/dnsproxyserver/config/{ => provider}/jsonv1v2/dataprovider/predicate/EnvPredicate.java (77%) rename src/main/java/com/mageddo/dnsproxyserver/config/{ => provider}/jsonv1v2/dataprovider/predicate/JsonEnvPredicate.java (69%) rename src/main/java/com/mageddo/dnsproxyserver/config/{ => provider}/jsonv1v2/mapper/ConfigJsonV1EnvsMapper.java (87%) rename src/main/java/com/mageddo/dnsproxyserver/config/{ => provider}/jsonv1v2/mapper/ConfigJsonV2EnvsMapper.java (91%) rename src/main/java/com/mageddo/dnsproxyserver/config/{ => provider}/jsonv1v2/mapper/ConfigJsonV2Mapper.java (92%) rename src/main/java/com/mageddo/dnsproxyserver/config/{ => provider}/jsonv1v2/vo/ConfigJson.java (94%) rename src/main/java/com/mageddo/dnsproxyserver/config/{ => provider}/jsonv1v2/vo/ConfigJsonV1.java (95%) rename src/main/java/com/mageddo/dnsproxyserver/config/{ => provider}/jsonv1v2/vo/ConfigJsonV2.java (97%) rename src/main/java/com/mageddo/dnsproxyserver/config/{ => provider}/jsonv1v2/vo/package-info.java (81%) rename src/main/java/com/mageddo/dnsproxyserver/config/{ => provider}/legacyenv/ConfigDAOLegacyEnv.java (90%) rename src/main/java/com/mageddo/dnsproxyserver/config/{ => provider}/legacyenv/ConfigEnv.java (98%) rename src/main/java/com/mageddo/dnsproxyserver/config/{ => provider}/legacyenv/ConfigEnvMapper.java (97%) diff --git a/src/main/java/com/mageddo/dnsproxyserver/App.java b/src/main/java/com/mageddo/dnsproxyserver/App.java index 43b59cd18..31ac24fb4 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/App.java +++ b/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.cmdargs.dataprovider.ConfigDAOCmdArgs; -import com.mageddo.dnsproxyserver.config.cmdargs.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; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderService.java b/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderService.java index ce1dd79fc..9bc6bfebd 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderService.java +++ b/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.cmdargs.dataprovider.ConfigDAOCmdArgs; -import com.mageddo.dnsproxyserver.config.legacyenv.ConfigDAOLegacyEnv; -import com.mageddo.dnsproxyserver.config.legacyenv.ConfigEnv; -import com.mageddo.dnsproxyserver.config.cmdargs.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; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigPathMapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigPathMapper.java index 6253fca4c..c5cc740ea 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigPathMapper.java +++ b/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.cmdargs.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; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/configurator/module/ModuleConfigDAO.java b/src/main/java/com/mageddo/dnsproxyserver/config/configurator/module/ModuleConfigDAO.java index fe6401903..d97c43c08 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/configurator/module/ModuleConfigDAO.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/configurator/module/ModuleConfigDAO.java @@ -2,9 +2,9 @@ import com.mageddo.di.InstanceImpl; import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAO; -import com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.ConfigDAOCmdArgs; -import com.mageddo.dnsproxyserver.config.legacyenv.ConfigDAOLegacyEnv; -import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.ConfigDAOJson; +import com.mageddo.dnsproxyserver.config.provider.cmdargs.ConfigDAOCmdArgs; +import com.mageddo.dnsproxyserver.config.provider.legacyenv.ConfigDAOLegacyEnv; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.ConfigDAOJson; import dagger.Module; import dagger.Provides; import dagger.multibindings.ElementsIntoSet; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java b/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java index 30a25b41d..5e3ff3da3 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java @@ -2,9 +2,9 @@ import com.mageddo.di.InstanceImpl; import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAO; -import com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.ConfigDAOCmdArgs; -import com.mageddo.dnsproxyserver.config.legacyenv.ConfigDAOLegacyEnv; -import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.ConfigDAOJson; +import com.mageddo.dnsproxyserver.config.provider.cmdargs.ConfigDAOCmdArgs; +import com.mageddo.dnsproxyserver.config.provider.legacyenv.ConfigDAOLegacyEnv; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.ConfigDAOJson; import dagger.Module; import dagger.Provides; import dagger.multibindings.ElementsIntoSet; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/cmdargs/dataprovider/ConfigDAOCmdArgs.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/ConfigDAOCmdArgs.java similarity index 76% rename from src/main/java/com/mageddo/dnsproxyserver/config/cmdargs/dataprovider/ConfigDAOCmdArgs.java rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/ConfigDAOCmdArgs.java index 1867bbba2..1510babb8 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/cmdargs/dataprovider/ConfigDAOCmdArgs.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/ConfigDAOCmdArgs.java @@ -1,9 +1,9 @@ -package com.mageddo.dnsproxyserver.config.cmdargs.dataprovider; +package com.mageddo.dnsproxyserver.config.provider.cmdargs; import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAO; -import com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.mapper.ConfigFlagMapper; -import com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.vo.ConfigFlag; +import com.mageddo.dnsproxyserver.config.provider.cmdargs.mapper.ConfigFlagMapper; +import com.mageddo.dnsproxyserver.config.provider.cmdargs.vo.ConfigFlag; import lombok.RequiredArgsConstructor; import javax.inject.Inject; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/cmdargs/dataprovider/mapper/ConfigFlagMapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/mapper/ConfigFlagMapper.java similarity index 94% rename from src/main/java/com/mageddo/dnsproxyserver/config/cmdargs/dataprovider/mapper/ConfigFlagMapper.java rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/mapper/ConfigFlagMapper.java index 821766a7f..0cdbc47ac 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/cmdargs/dataprovider/mapper/ConfigFlagMapper.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/mapper/ConfigFlagMapper.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.mapper; +package com.mageddo.dnsproxyserver.config.provider.cmdargs.mapper; import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsproxyserver.config.Log; @@ -8,7 +8,7 @@ import com.mageddo.dnsproxyserver.config.SolverStub; import com.mageddo.dnsproxyserver.config.SolverSystem; import com.mageddo.dnsproxyserver.config.dataprovider.mapper.LogLevelMapper; -import com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.vo.ConfigFlag; +import com.mageddo.dnsproxyserver.config.provider.cmdargs.vo.ConfigFlag; import com.mageddo.dnsproxyserver.utils.Booleans; import com.mageddo.utils.Files; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/cmdargs/dataprovider/vo/ConfigFlag.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/ConfigFlag.java similarity index 99% rename from src/main/java/com/mageddo/dnsproxyserver/config/cmdargs/dataprovider/vo/ConfigFlag.java rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/ConfigFlag.java index cfbe8d892..0233add0a 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/cmdargs/dataprovider/vo/ConfigFlag.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/ConfigFlag.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.vo; +package com.mageddo.dnsproxyserver.config.provider.cmdargs.vo; import com.fasterxml.jackson.annotation.JsonIgnore; import com.mageddo.dnsproxyserver.config.dataprovider.ConfigPropDAO; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/cmdargs/dataprovider/vo/package-info.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/package-info.java similarity index 81% rename from src/main/java/com/mageddo/dnsproxyserver/config/cmdargs/dataprovider/vo/package-info.java rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/package-info.java index 17a20621e..373851dd5 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/cmdargs/dataprovider/vo/package-info.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/package-info.java @@ -4,6 +4,6 @@ publicMethods = true, declaredMethods = true, publicFields = true, declaredFields = true ) -package com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.vo; +package com.mageddo.dnsproxyserver.config.provider.cmdargs.vo; import nativeimage.Reflection; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/ConfigDAOJson.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/ConfigDAOJson.java similarity index 85% rename from src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/ConfigDAOJson.java rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/ConfigDAOJson.java index eb4e10f02..74fbf1fa9 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/ConfigDAOJson.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/ConfigDAOJson.java @@ -1,9 +1,9 @@ -package com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider; +package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider; import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsproxyserver.config.application.ConfigFileFinderService; import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAO; -import com.mageddo.dnsproxyserver.config.jsonv1v2.mapper.ConfigJsonV2Mapper; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.mapper.ConfigJsonV2Mapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/JsonConfigs.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/JsonConfigs.java similarity index 87% rename from src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/JsonConfigs.java rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/JsonConfigs.java index 723875fcc..c36945110 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/JsonConfigs.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/JsonConfigs.java @@ -1,14 +1,14 @@ -package com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider; +package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider; import com.fasterxml.jackson.databind.JsonNode; import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsproxyserver.config.application.Configs; -import com.mageddo.dnsproxyserver.config.jsonv1v2.mapper.ConfigJsonV2Mapper; -import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJson; -import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV1; -import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2; -import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2.Entry; -import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2.Env; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.mapper.ConfigJsonV2Mapper; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJson; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV1; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2.Entry; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2.Env; import com.mageddo.json.JsonUtils; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/PersistentConfigDAOJson.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/PersistentConfigDAOJson.java similarity index 92% rename from src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/PersistentConfigDAOJson.java rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/PersistentConfigDAOJson.java index b0b922e52..aed323e86 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/PersistentConfigDAOJson.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/PersistentConfigDAOJson.java @@ -1,12 +1,12 @@ -package com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider; +package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider; import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsproxyserver.config.application.Configs; import com.mageddo.dnsproxyserver.config.dataprovider.PersistentConfigDAO; -import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.predicate.EntryPredicate; -import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.predicate.EnvPredicate; -import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.predicate.JsonEnvPredicate; -import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.predicate.EntryPredicate; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.predicate.EnvPredicate; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.predicate.JsonEnvPredicate; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2; import com.mageddo.dnsproxyserver.solver.HostnameQuery; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/predicate/EntryPredicate.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/predicate/EntryPredicate.java similarity index 78% rename from src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/predicate/EntryPredicate.java rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/predicate/EntryPredicate.java index 6c5a5694c..408987cfc 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/predicate/EntryPredicate.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/predicate/EntryPredicate.java @@ -1,7 +1,7 @@ -package com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.predicate; +package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.predicate; import com.mageddo.dnsproxyserver.config.Config; -import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2; import java.util.Objects; import java.util.function.Predicate; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/predicate/EnvPredicate.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/predicate/EnvPredicate.java similarity index 77% rename from src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/predicate/EnvPredicate.java rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/predicate/EnvPredicate.java index 6b20fa313..0ac307616 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/predicate/EnvPredicate.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/predicate/EnvPredicate.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.predicate; +package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.predicate; import com.mageddo.dnsproxyserver.config.Config; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/predicate/JsonEnvPredicate.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/predicate/JsonEnvPredicate.java similarity index 69% rename from src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/predicate/JsonEnvPredicate.java rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/predicate/JsonEnvPredicate.java index af9c67041..5ebadc411 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/dataprovider/predicate/JsonEnvPredicate.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/predicate/JsonEnvPredicate.java @@ -1,6 +1,6 @@ -package com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.predicate; +package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.predicate; -import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2; import org.apache.commons.lang3.StringUtils; import java.util.function.Predicate; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/mapper/ConfigJsonV1EnvsMapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV1EnvsMapper.java similarity index 87% rename from src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/mapper/ConfigJsonV1EnvsMapper.java rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV1EnvsMapper.java index c107a1bc1..34cc3d812 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/mapper/ConfigJsonV1EnvsMapper.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV1EnvsMapper.java @@ -1,7 +1,7 @@ -package com.mageddo.dnsproxyserver.config.jsonv1v2.mapper; +package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.mapper; import com.mageddo.dnsproxyserver.config.Config; -import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV1; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV1; import com.mageddo.net.IpAddr; import java.util.List; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/mapper/ConfigJsonV2EnvsMapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV2EnvsMapper.java similarity index 91% rename from src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/mapper/ConfigJsonV2EnvsMapper.java rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV2EnvsMapper.java index ee7fc86c3..6886d77f2 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/mapper/ConfigJsonV2EnvsMapper.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV2EnvsMapper.java @@ -1,7 +1,7 @@ -package com.mageddo.dnsproxyserver.config.jsonv1v2.mapper; +package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.mapper; import com.mageddo.dnsproxyserver.config.Config; -import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2; import com.mageddo.net.IP; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/mapper/ConfigJsonV2Mapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV2Mapper.java similarity index 92% rename from src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/mapper/ConfigJsonV2Mapper.java rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV2Mapper.java index e68efd1c9..cfbc55487 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/mapper/ConfigJsonV2Mapper.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV2Mapper.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.jsonv1v2.mapper; +package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.mapper; import com.mageddo.dnsproxyserver.config.CanaryRateThresholdCircuitBreakerStrategyConfig; import com.mageddo.dnsproxyserver.config.CircuitBreakerStrategyConfig; @@ -11,10 +11,10 @@ import com.mageddo.dnsproxyserver.config.SolverStub; import com.mageddo.dnsproxyserver.config.StaticThresholdCircuitBreakerStrategyConfig; import com.mageddo.dnsproxyserver.config.dataprovider.mapper.LogLevelMapper; -import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJson; -import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2; -import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2.CanaryRateThresholdCircuitBreaker; -import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2.StaticThresholdCircuitBreaker; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJson; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2.CanaryRateThresholdCircuitBreaker; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2.StaticThresholdCircuitBreaker; import com.mageddo.dnsproxyserver.utils.Booleans; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/ConfigJson.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/ConfigJson.java similarity index 94% rename from src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/ConfigJson.java rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/ConfigJson.java index 5bf093521..e938ff7f1 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/ConfigJson.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/ConfigJson.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.jsonv1v2.vo; +package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo; import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsserver.SimpleServer; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/ConfigJsonV1.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/ConfigJsonV1.java similarity index 95% rename from src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/ConfigJsonV1.java rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/ConfigJsonV1.java index 85abd83d7..419c51ca6 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/ConfigJsonV1.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/ConfigJsonV1.java @@ -1,9 +1,9 @@ -package com.mageddo.dnsproxyserver.config.jsonv1v2.vo; +package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.mageddo.dnsproxyserver.config.Config; -import com.mageddo.dnsproxyserver.config.jsonv1v2.mapper.ConfigJsonV1EnvsMapper; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.mapper.ConfigJsonV1EnvsMapper; import com.mageddo.dnsserver.SimpleServer; import com.mageddo.net.IpAddr; import lombok.Data; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/ConfigJsonV2.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/ConfigJsonV2.java similarity index 97% rename from src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/ConfigJsonV2.java rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/ConfigJsonV2.java index 3f77e6d69..d21d3e1db 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/ConfigJsonV2.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/ConfigJsonV2.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.jsonv1v2.vo; +package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; @@ -11,7 +11,7 @@ import com.mageddo.dnsproxyserver.config.CircuitBreakerStrategyConfig; import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsproxyserver.config.Config.Entry.Type; -import com.mageddo.dnsproxyserver.config.jsonv1v2.mapper.ConfigJsonV2EnvsMapper; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.mapper.ConfigJsonV2EnvsMapper; import com.mageddo.dnsserver.SimpleServer; import com.mageddo.net.IP; import com.mageddo.net.IpAddr; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/package-info.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/package-info.java similarity index 81% rename from src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/package-info.java rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/package-info.java index 6dc863b06..8793b5a1a 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/jsonv1v2/vo/package-info.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/package-info.java @@ -4,6 +4,6 @@ publicMethods = true, declaredMethods = true, publicFields = true, declaredFields = true ) -package com.mageddo.dnsproxyserver.config.jsonv1v2.vo; +package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo; import nativeimage.Reflection; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/legacyenv/ConfigDAOLegacyEnv.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigDAOLegacyEnv.java similarity index 90% rename from src/main/java/com/mageddo/dnsproxyserver/config/legacyenv/ConfigDAOLegacyEnv.java rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigDAOLegacyEnv.java index c8c5eb94a..dd63a4f38 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/legacyenv/ConfigDAOLegacyEnv.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigDAOLegacyEnv.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.legacyenv; +package com.mageddo.dnsproxyserver.config.provider.legacyenv; import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAO; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/legacyenv/ConfigEnv.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigEnv.java similarity index 98% rename from src/main/java/com/mageddo/dnsproxyserver/config/legacyenv/ConfigEnv.java rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigEnv.java index 63df42963..b528d3364 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/legacyenv/ConfigEnv.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigEnv.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.legacyenv; +package com.mageddo.dnsproxyserver.config.provider.legacyenv; import com.mageddo.dnsproxyserver.utils.Envs; import com.mageddo.http.UriUtils; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/legacyenv/ConfigEnvMapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigEnvMapper.java similarity index 97% rename from src/main/java/com/mageddo/dnsproxyserver/config/legacyenv/ConfigEnvMapper.java rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigEnvMapper.java index 545f4471a..13699152e 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/legacyenv/ConfigEnvMapper.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigEnvMapper.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.legacyenv; +package com.mageddo.dnsproxyserver.config.provider.legacyenv; import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsproxyserver.config.Log; diff --git a/src/main/java/com/mageddo/dnsproxyserver/di/module/ModuleDao.java b/src/main/java/com/mageddo/dnsproxyserver/di/module/ModuleDao.java index eb2a13d3b..04c2de163 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/di/module/ModuleDao.java +++ b/src/main/java/com/mageddo/dnsproxyserver/di/module/ModuleDao.java @@ -1,7 +1,7 @@ package com.mageddo.dnsproxyserver.di.module; import com.mageddo.dnsproxyserver.config.dataprovider.PersistentConfigDAO; -import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.PersistentConfigDAOJson; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.PersistentConfigDAOJson; import com.mageddo.dnsproxyserver.docker.dataprovider.ContainerFacade; import com.mageddo.dnsproxyserver.docker.dataprovider.ContainerFacadeDefault; import com.mageddo.dnsproxyserver.docker.dataprovider.DockerNetworkFacade; diff --git a/src/main/java/com/mageddo/dnsproxyserver/sandbox/BinaryFromGradleTestsSandbox.java b/src/main/java/com/mageddo/dnsproxyserver/sandbox/BinaryFromGradleTestsSandbox.java index d37d0346d..540f45c90 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/sandbox/BinaryFromGradleTestsSandbox.java +++ b/src/main/java/com/mageddo/dnsproxyserver/sandbox/BinaryFromGradleTestsSandbox.java @@ -3,7 +3,7 @@ import com.mageddo.commons.exec.CommandLines; import com.mageddo.commons.exec.NopResultHandler; import com.mageddo.commons.exec.Request; -import com.mageddo.dnsproxyserver.config.legacyenv.ConfigEnv; +import com.mageddo.dnsproxyserver.config.provider.legacyenv.ConfigEnv; import lombok.extern.slf4j.Slf4j; import java.nio.file.Path; diff --git a/src/test/java/com/mageddo/dnsproxyserver/AppIntTest.java b/src/test/java/com/mageddo/dnsproxyserver/AppIntTest.java index 06c6f8db4..e2f320359 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/AppIntTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/AppIntTest.java @@ -4,8 +4,8 @@ import com.mageddo.commons.exec.ProcessesWatchDog; import com.mageddo.dns.utils.Messages; import com.mageddo.dnsproxyserver.config.application.Configs; -import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.JsonConfigs; -import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJson; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.JsonConfigs; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJson; import com.mageddo.dnsproxyserver.sandbox.Instance; import com.mageddo.dnsproxyserver.sandbox.Sandbox; import com.mageddo.dnsproxyserver.server.Starter; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/ConfigTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/ConfigTest.java index 2c10b5b8e..e61409dc0 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/ConfigTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/ConfigTest.java @@ -1,8 +1,8 @@ package com.mageddo.dnsproxyserver.config; import com.mageddo.dnsproxyserver.config.application.Configs; -import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.JsonConfigs; -import com.mageddo.dnsproxyserver.config.jsonv1v2.mapper.ConfigJsonV2Mapper; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.JsonConfigs; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.mapper.ConfigJsonV2Mapper; import com.mageddo.utils.Files; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/PersistentConfigDAOJsonTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/PersistentConfigDAOJsonTest.java index bac306e61..682eef0b8 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/PersistentConfigDAOJsonTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/PersistentConfigDAOJsonTest.java @@ -1,7 +1,7 @@ package com.mageddo.dnsproxyserver.config; import com.mageddo.dnsproxyserver.config.Config.Entry.Type; -import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.PersistentConfigDAOJson; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.PersistentConfigDAOJson; import com.mageddo.dnsproxyserver.solver.HostnameQuery; import testing.templates.EnvTemplates; import testing.templates.HostnameQueryTemplates; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderServiceTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderServiceTest.java index 22e43e8d0..063536b6f 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderServiceTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderServiceTest.java @@ -1,7 +1,7 @@ package com.mageddo.dnsproxyserver.config.application; -import com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.ConfigDAOCmdArgs; -import com.mageddo.dnsproxyserver.config.legacyenv.ConfigDAOLegacyEnv; +import com.mageddo.dnsproxyserver.config.provider.cmdargs.ConfigDAOCmdArgs; +import com.mageddo.dnsproxyserver.config.provider.legacyenv.ConfigDAOLegacyEnv; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigPathMapperTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigPathMapperTest.java index b5f8d2ce9..5cc052dae 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigPathMapperTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigPathMapperTest.java @@ -1,6 +1,6 @@ package com.mageddo.dnsproxyserver.config.application; -import com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.ConfigDAOCmdArgs; +import com.mageddo.dnsproxyserver.config.provider.cmdargs.ConfigDAOCmdArgs; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; import testing.templates.ConfigFlagTemplates; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigServiceCompTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigServiceCompTest.java index fc732041d..62cd9f429 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigServiceCompTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigServiceCompTest.java @@ -2,7 +2,7 @@ import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsproxyserver.config.LogLevel; -import com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.ConfigDAOCmdArgs; +import com.mageddo.dnsproxyserver.config.provider.cmdargs.ConfigDAOCmdArgs; import com.mageddo.dnsproxyserver.config.di.Context; import dagger.sheath.junit.DaggerTest; import lombok.SneakyThrows; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOJsonTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOJsonTest.java index d1375dfa0..88d372c5f 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOJsonTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOJsonTest.java @@ -1,6 +1,6 @@ package com.mageddo.dnsproxyserver.config.dataprovider; -import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.ConfigDAOJson; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.ConfigDAOJson; import lombok.SneakyThrows; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigEnvMapperTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigEnvMapperTest.java index 08e45ee60..03a132f91 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigEnvMapperTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigEnvMapperTest.java @@ -1,6 +1,6 @@ package com.mageddo.dnsproxyserver.config.dataprovider.mapper; -import com.mageddo.dnsproxyserver.config.legacyenv.ConfigEnvMapper; +import com.mageddo.dnsproxyserver.config.provider.legacyenv.ConfigEnvMapper; import org.junit.jupiter.api.Test; import testing.templates.config.ConfigEnvTemplates; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigFlagMapperTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigFlagMapperTest.java index 819fc25d5..c1a54db1f 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigFlagMapperTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigFlagMapperTest.java @@ -1,6 +1,6 @@ package com.mageddo.dnsproxyserver.config.dataprovider.mapper; -import com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.mapper.ConfigFlagMapper; +import com.mageddo.dnsproxyserver.config.provider.cmdargs.mapper.ConfigFlagMapper; import org.junit.jupiter.api.Test; import testing.templates.ConfigFlagTemplates; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2MapperTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2MapperTest.java index db35618a2..1134ca90a 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2MapperTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2MapperTest.java @@ -1,8 +1,8 @@ package com.mageddo.dnsproxyserver.config.dataprovider.mapper; import com.mageddo.dnsproxyserver.config.Config; -import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJson; -import com.mageddo.dnsproxyserver.config.jsonv1v2.mapper.ConfigJsonV2Mapper; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJson; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.mapper.ConfigJsonV2Mapper; import org.junit.jupiter.api.Test; import testing.templates.ConfigJsonTemplates; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/ConfigJsonV1Test.java b/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/ConfigJsonV1Test.java index 1e5a33382..3b4f2e0c3 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/ConfigJsonV1Test.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/ConfigJsonV1Test.java @@ -1,6 +1,6 @@ package com.mageddo.dnsproxyserver.config.entrypoint; -import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.JsonConfigs; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.JsonConfigs; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/JsonConfigsTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/JsonConfigsTest.java index 554d43da0..1e4509a12 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/JsonConfigsTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/JsonConfigsTest.java @@ -1,9 +1,9 @@ package com.mageddo.dnsproxyserver.config.entrypoint; -import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.JsonConfigs; -import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2; -import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2.CanaryRateThresholdCircuitBreaker; -import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJsonV2.StaticThresholdCircuitBreaker; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.JsonConfigs; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2.CanaryRateThresholdCircuitBreaker; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2.StaticThresholdCircuitBreaker; import org.apache.commons.lang3.ClassUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; @@ -12,7 +12,7 @@ import java.nio.file.Path; import java.time.Duration; -import static com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.JsonConfigs.findVersion; +import static com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.JsonConfigs.findVersion; import static com.mageddo.utils.TestUtils.readAndSortJson; import static com.mageddo.utils.TestUtils.readAsStream; import static com.mageddo.utils.TestUtils.readSortDonWriteNullsAndExcludeFields; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/flags/ConfigFlagTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/flags/ConfigFlagTest.java index deaa8630f..355610111 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/flags/ConfigFlagTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/flags/ConfigFlagTest.java @@ -1,7 +1,7 @@ package com.mageddo.dnsproxyserver.config.flags; import com.mageddo.commons.regex.Regexes; -import com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.vo.ConfigFlag; +import com.mageddo.dnsproxyserver.config.provider.cmdargs.vo.ConfigFlag; import org.junit.jupiter.api.Test; import java.io.PrintWriter; diff --git a/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/DnsConfiguratorLinuxTest.java b/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/DnsConfiguratorLinuxTest.java index 48fc2b45c..4b094e1dd 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/DnsConfiguratorLinuxTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/DnsConfiguratorLinuxTest.java @@ -1,6 +1,6 @@ package com.mageddo.dnsproxyserver.dnsconfigurator.linux; -import com.mageddo.dnsproxyserver.config.legacyenv.ConfigEnv; +import com.mageddo.dnsproxyserver.config.provider.legacyenv.ConfigEnv; import com.mageddo.dnsproxyserver.dnsconfigurator.linux.ResolvFile.Type; import testing.templates.IpAddrTemplates; import org.apache.commons.exec.OS; diff --git a/src/test/java/com/mageddo/dnsproxyserver/server/rest/EnvResourceCompTest.java b/src/test/java/com/mageddo/dnsproxyserver/server/rest/EnvResourceCompTest.java index 2a5efd899..ac4de5a9d 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/server/rest/EnvResourceCompTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/server/rest/EnvResourceCompTest.java @@ -1,7 +1,7 @@ package com.mageddo.dnsproxyserver.server.rest; import com.mageddo.dnsproxyserver.config.application.Configs; -import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.JsonConfigs; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.JsonConfigs; import dagger.sheath.junit.DaggerTest; import io.restassured.http.ContentType; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/testing/ContextSupplier.java b/src/test/java/testing/ContextSupplier.java index 51e99f8a6..874a2b917 100644 --- a/src/test/java/testing/ContextSupplier.java +++ b/src/test/java/testing/ContextSupplier.java @@ -1,7 +1,7 @@ package testing; import com.mageddo.dnsproxyserver.config.application.Configs; -import com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.ConfigDAOCmdArgs; +import com.mageddo.dnsproxyserver.config.provider.cmdargs.ConfigDAOCmdArgs; import com.mageddo.dnsproxyserver.di.Context; import com.mageddo.net.SocketUtils; diff --git a/src/test/java/testing/templates/ConfigFlagArgsTemplates.java b/src/test/java/testing/templates/ConfigFlagArgsTemplates.java index 4e560c433..efef01e3a 100644 --- a/src/test/java/testing/templates/ConfigFlagArgsTemplates.java +++ b/src/test/java/testing/templates/ConfigFlagArgsTemplates.java @@ -1,6 +1,6 @@ package testing.templates; -import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJson; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJson; import com.mageddo.net.IpAddr; import com.mageddo.net.SocketUtils; import lombok.Builder; diff --git a/src/test/java/testing/templates/ConfigFlagTemplates.java b/src/test/java/testing/templates/ConfigFlagTemplates.java index c5a72057e..fd675f1a3 100644 --- a/src/test/java/testing/templates/ConfigFlagTemplates.java +++ b/src/test/java/testing/templates/ConfigFlagTemplates.java @@ -1,6 +1,6 @@ package testing.templates; -import com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.vo.ConfigFlag; +import com.mageddo.dnsproxyserver.config.provider.cmdargs.vo.ConfigFlag; import java.nio.file.Path; diff --git a/src/test/java/testing/templates/ConfigJsonTemplates.java b/src/test/java/testing/templates/ConfigJsonTemplates.java index 519b0f4e8..27f9b78d6 100644 --- a/src/test/java/testing/templates/ConfigJsonTemplates.java +++ b/src/test/java/testing/templates/ConfigJsonTemplates.java @@ -1,7 +1,7 @@ package testing.templates; -import com.mageddo.dnsproxyserver.config.jsonv1v2.dataprovider.JsonConfigs; -import com.mageddo.dnsproxyserver.config.jsonv1v2.vo.ConfigJson; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.JsonConfigs; +import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJson; import com.mageddo.utils.TestUtils; public class ConfigJsonTemplates { diff --git a/src/test/java/testing/templates/ConfigTemplates.java b/src/test/java/testing/templates/ConfigTemplates.java index 5b0608e55..def3c3e90 100644 --- a/src/test/java/testing/templates/ConfigTemplates.java +++ b/src/test/java/testing/templates/ConfigTemplates.java @@ -9,7 +9,7 @@ import com.mageddo.dnsproxyserver.config.SolverRemote; import com.mageddo.dnsproxyserver.config.SolverStub; import com.mageddo.dnsproxyserver.config.SolverSystem; -import com.mageddo.dnsproxyserver.config.legacyenv.ConfigEnv; +import com.mageddo.dnsproxyserver.config.provider.legacyenv.ConfigEnv; import com.mageddo.dnsserver.SimpleServer; import com.mageddo.net.IP; diff --git a/src/test/java/testing/templates/config/ConfigEnvTemplates.java b/src/test/java/testing/templates/config/ConfigEnvTemplates.java index 582a6bede..65105eb23 100644 --- a/src/test/java/testing/templates/config/ConfigEnvTemplates.java +++ b/src/test/java/testing/templates/config/ConfigEnvTemplates.java @@ -1,6 +1,6 @@ package testing.templates.config; -import com.mageddo.dnsproxyserver.config.legacyenv.ConfigEnv; +import com.mageddo.dnsproxyserver.config.provider.legacyenv.ConfigEnv; import java.nio.file.Paths; From 216ab27a8f5adcb52f0d5ac89f0f617d4d6d00c3 Mon Sep 17 00:00:00 2001 From: Elvis de Freitas Date: Mon, 31 Mar 2025 10:31:41 -0300 Subject: [PATCH 08/13] refactoring --- .../config/application/ConfigService.java | 6 ++-- .../config/configurator/Context.java | 19 ------------ .../configurator/module/ModuleConfigDAO.java | 31 ------------------- .../config/dataprovider/ConfigPropDAO.java | 15 --------- .../config/dataprovider/VersionDAO.java | 5 +++ .../config/di/module/ModuleConfigDAO.java | 7 +++++ .../config/mapper/ConfigMapper.java | 30 +++++++++--------- .../mapper/LogLevelMapper.java | 2 +- .../cmdargs/mapper/ConfigFlagMapper.java | 2 +- .../provider/cmdargs/vo/ConfigFlag.java | 9 ++++-- .../jsonv1v2/mapper/ConfigJsonV2Mapper.java | 2 +- .../provider/legacyenv/ConfigEnvMapper.java | 2 +- .../config/provider/prop/VersionDAOProp.java | 22 +++++++++++++ .../dataprovider/LogSettingsDAOSlf4j.java | 2 +- .../dnsproxyserver/di/module/ModuleDao.java | 11 ++----- ...perTest.java => ConfigMapperCompTest.java} | 15 ++++++--- 16 files changed, 78 insertions(+), 102 deletions(-) delete mode 100644 src/main/java/com/mageddo/dnsproxyserver/config/configurator/Context.java delete mode 100644 src/main/java/com/mageddo/dnsproxyserver/config/configurator/module/ModuleConfigDAO.java delete mode 100644 src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigPropDAO.java create mode 100644 src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/VersionDAO.java rename src/main/java/com/mageddo/dnsproxyserver/config/{dataprovider => }/mapper/LogLevelMapper.java (92%) create mode 100644 src/main/java/com/mageddo/dnsproxyserver/config/provider/prop/VersionDAOProp.java rename src/test/java/com/mageddo/dnsproxyserver/config/mapper/{ConfigMapperTest.java => ConfigMapperCompTest.java} (76%) diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigService.java b/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigService.java index edb732de9..4e63db25e 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigService.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigService.java @@ -20,19 +20,21 @@ public class ConfigService { private final List configDAOS; + private final ConfigMapper configMapper; @Inject - public ConfigService(Instance configDAOS) { + public ConfigService(Instance 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; } diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/configurator/Context.java b/src/main/java/com/mageddo/dnsproxyserver/config/configurator/Context.java deleted file mode 100644 index 8d6dd1adf..000000000 --- a/src/main/java/com/mageddo/dnsproxyserver/config/configurator/Context.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.mageddo.dnsproxyserver.config.configurator; - - -import com.mageddo.dnsproxyserver.config.application.ConfigService; -import com.mageddo.dnsproxyserver.config.configurator.module.ModuleConfigDAO; -import dagger.Component; - -import javax.inject.Singleton; - -@Singleton -@Component(modules = ModuleConfigDAO.class) -public interface Context { - - static Context create() { - return DaggerContext.create(); - } - - ConfigService configService(); -} diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/configurator/module/ModuleConfigDAO.java b/src/main/java/com/mageddo/dnsproxyserver/config/configurator/module/ModuleConfigDAO.java deleted file mode 100644 index d97c43c08..000000000 --- a/src/main/java/com/mageddo/dnsproxyserver/config/configurator/module/ModuleConfigDAO.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.mageddo.dnsproxyserver.config.configurator.module; - -import com.mageddo.di.InstanceImpl; -import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAO; -import com.mageddo.dnsproxyserver.config.provider.cmdargs.ConfigDAOCmdArgs; -import com.mageddo.dnsproxyserver.config.provider.legacyenv.ConfigDAOLegacyEnv; -import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.ConfigDAOJson; -import dagger.Module; -import dagger.Provides; -import dagger.multibindings.ElementsIntoSet; - -import javax.enterprise.inject.Instance; -import javax.inject.Singleton; -import java.util.Set; - -@Module -public interface ModuleConfigDAO { - @Provides - static Instance multiSourceConfigDAOInstance(Set instances){ - return new InstanceImpl<>(instances); - } - - @Provides - @Singleton - @ElementsIntoSet - static Set configDaos( - ConfigDAOLegacyEnv o1, ConfigDAOCmdArgs o2, ConfigDAOJson o3 - ) { - return Set.of(o1, o2, o3); - } -} diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigPropDAO.java b/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigPropDAO.java deleted file mode 100644 index 8ee780915..000000000 --- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigPropDAO.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.mageddo.dnsproxyserver.config.dataprovider; - -import java.util.Properties; - -import static com.mageddo.commons.io.IoUtils.loadPropertiesFromResources; - -public class ConfigPropDAO { - - private static final Properties resources = loadPropertiesFromResources("/application.properties"); - - public static String getVersion(){ - return resources.getProperty("version", "unknown"); - } - -} diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/VersionDAO.java b/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/VersionDAO.java new file mode 100644 index 000000000..957609812 --- /dev/null +++ b/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/VersionDAO.java @@ -0,0 +1,5 @@ +package com.mageddo.dnsproxyserver.config.dataprovider; + +public interface VersionDAO { + String findVersion(); +} diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java b/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java index 5e3ff3da3..e230db705 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java @@ -2,9 +2,12 @@ import com.mageddo.di.InstanceImpl; import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAO; +import com.mageddo.dnsproxyserver.config.dataprovider.VersionDAO; import com.mageddo.dnsproxyserver.config.provider.cmdargs.ConfigDAOCmdArgs; import com.mageddo.dnsproxyserver.config.provider.legacyenv.ConfigDAOLegacyEnv; import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.ConfigDAOJson; +import com.mageddo.dnsproxyserver.config.provider.prop.VersionDAOProp; +import dagger.Binds; import dagger.Module; import dagger.Provides; import dagger.multibindings.ElementsIntoSet; @@ -28,4 +31,8 @@ static Set configDaos( ) { return Set.of(o1, o2, o3); } + + @Binds + @Singleton + VersionDAO versionDAO(VersionDAOProp impl); } diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/mapper/ConfigMapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/mapper/ConfigMapper.java index 004665e54..7186ffa54 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/mapper/ConfigMapper.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/mapper/ConfigMapper.java @@ -1,21 +1,16 @@ package com.mageddo.dnsproxyserver.config.mapper; -import com.mageddo.dnsproxyserver.config.Config; -import com.mageddo.dnsproxyserver.config.Log; -import com.mageddo.dnsproxyserver.config.Server; -import com.mageddo.dnsproxyserver.config.SolverDocker; -import com.mageddo.dnsproxyserver.config.SolverLocal; -import com.mageddo.dnsproxyserver.config.SolverRemote; -import com.mageddo.dnsproxyserver.config.SolverStub; -import com.mageddo.dnsproxyserver.config.SolverSystem; -import com.mageddo.dnsproxyserver.config.StaticThresholdCircuitBreakerStrategyConfig; -import com.mageddo.dnsproxyserver.config.dataprovider.ConfigPropDAO; +import com.mageddo.dnsproxyserver.config.*; +import com.mageddo.dnsproxyserver.config.dataprovider.VersionDAO; import com.mageddo.dnsproxyserver.config.validator.ConfigValidator; import com.mageddo.dnsproxyserver.utils.Numbers; import com.mageddo.dnsserver.SimpleServer; import com.mageddo.net.IpAddr; +import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.SystemUtils; +import javax.inject.Inject; +import javax.inject.Singleton; import java.net.URI; import java.time.Duration; import java.util.ArrayList; @@ -23,18 +18,21 @@ import java.util.List; import static com.mageddo.dnsproxyserver.utils.ListOfObjectUtils.mapField; -import static com.mageddo.dnsproxyserver.utils.ObjectUtils.firstNonEmptyListRequiring; -import static com.mageddo.dnsproxyserver.utils.ObjectUtils.firstNonNull; -import static com.mageddo.dnsproxyserver.utils.ObjectUtils.firstNonNullRequiring; +import static com.mageddo.dnsproxyserver.utils.ObjectUtils.*; +@Singleton +@RequiredArgsConstructor(onConstructor_ = @Inject) public class ConfigMapper { - public static Config mapFrom(List configs) { + + private final VersionDAO versionDAO; + + public Config mapFrom(List configs) { final var configsWithDefault = new ArrayList<>(configs); configsWithDefault.add(buildDefault()); return mapFrom0(configsWithDefault); } - private static Config mapFrom0(List configs) { + private Config mapFrom0(List configs) { final var config = Config.builder() .server(Server .builder() @@ -44,7 +42,7 @@ private static Config mapFrom0(List configs) { .dnsServerNoEntriesResponseCode(firstNonNullRequiring(mapField(Config::getNoEntriesResponseCode, configs))) .build() ) - .version(ConfigPropDAO.getVersion()) + .version(this.versionDAO.findVersion()) .log(Log .builder() .level(firstNonNullRequiring(mapField(Config::getLogLevel, configs))) diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/LogLevelMapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/mapper/LogLevelMapper.java similarity index 92% rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/LogLevelMapper.java rename to src/main/java/com/mageddo/dnsproxyserver/config/mapper/LogLevelMapper.java index eb2631728..bd17f4592 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/LogLevelMapper.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/mapper/LogLevelMapper.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.dataprovider.mapper; +package com.mageddo.dnsproxyserver.config.mapper; import com.mageddo.dnsproxyserver.config.LogLevel; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/mapper/ConfigFlagMapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/mapper/ConfigFlagMapper.java index 0cdbc47ac..29c2e5500 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/mapper/ConfigFlagMapper.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/mapper/ConfigFlagMapper.java @@ -7,7 +7,7 @@ import com.mageddo.dnsproxyserver.config.SolverRemote; import com.mageddo.dnsproxyserver.config.SolverStub; import com.mageddo.dnsproxyserver.config.SolverSystem; -import com.mageddo.dnsproxyserver.config.dataprovider.mapper.LogLevelMapper; +import com.mageddo.dnsproxyserver.config.mapper.LogLevelMapper; import com.mageddo.dnsproxyserver.config.provider.cmdargs.vo.ConfigFlag; import com.mageddo.dnsproxyserver.utils.Booleans; import com.mageddo.utils.Files; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/ConfigFlag.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/ConfigFlag.java index 0233add0a..7df2eff0d 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/ConfigFlag.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/ConfigFlag.java @@ -1,7 +1,7 @@ package com.mageddo.dnsproxyserver.config.provider.cmdargs.vo; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.mageddo.dnsproxyserver.config.dataprovider.ConfigPropDAO; +import com.mageddo.dnsproxyserver.config.application.Configs; import lombok.Getter; import lombok.NoArgsConstructor; import org.apache.commons.lang3.StringUtils; @@ -244,12 +244,17 @@ public static ConfigFlag parse(String[] args, PrintWriter writer) { @Override public Boolean call() { if (this.version) { - this.commandLine.getOut().write(ConfigPropDAO.getVersion()); + this.commandLine.getOut().write(findVersion()); return true; } return false; } + private static String findVersion() { + return Configs.getInstance() + .getVersion(); + } + @JsonIgnore public Path getConfigFileAsPath() { if (StringUtils.isNotBlank(this.configFilePath)) { diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV2Mapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV2Mapper.java index cfbc55487..3ffa5e89d 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV2Mapper.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV2Mapper.java @@ -10,7 +10,7 @@ import com.mageddo.dnsproxyserver.config.SolverRemote; import com.mageddo.dnsproxyserver.config.SolverStub; import com.mageddo.dnsproxyserver.config.StaticThresholdCircuitBreakerStrategyConfig; -import com.mageddo.dnsproxyserver.config.dataprovider.mapper.LogLevelMapper; +import com.mageddo.dnsproxyserver.config.mapper.LogLevelMapper; import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJson; import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2; import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2.CanaryRateThresholdCircuitBreaker; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigEnvMapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigEnvMapper.java index 13699152e..ced08a03e 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigEnvMapper.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigEnvMapper.java @@ -7,7 +7,7 @@ import com.mageddo.dnsproxyserver.config.SolverRemote; import com.mageddo.dnsproxyserver.config.SolverStub; import com.mageddo.dnsproxyserver.config.SolverSystem; -import com.mageddo.dnsproxyserver.config.dataprovider.mapper.LogLevelMapper; +import com.mageddo.dnsproxyserver.config.mapper.LogLevelMapper; import com.mageddo.dnsproxyserver.utils.Booleans; public class ConfigEnvMapper { diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/provider/prop/VersionDAOProp.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/prop/VersionDAOProp.java new file mode 100644 index 000000000..128cf3f2f --- /dev/null +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/prop/VersionDAOProp.java @@ -0,0 +1,22 @@ +package com.mageddo.dnsproxyserver.config.provider.prop; + +import com.mageddo.dnsproxyserver.config.dataprovider.VersionDAO; +import lombok.NoArgsConstructor; + +import javax.inject.Inject; +import javax.inject.Singleton; +import java.util.Properties; + +import static com.mageddo.commons.io.IoUtils.loadPropertiesFromResources; + +@Singleton +@NoArgsConstructor(onConstructor_ = @Inject) +public class VersionDAOProp implements VersionDAO { + + private static final Properties resources = loadPropertiesFromResources("/application.properties"); + + public String findVersion(){ + return resources.getProperty("version", "unknown"); + } + +} diff --git a/src/main/java/com/mageddo/dnsproxyserver/dataprovider/LogSettingsDAOSlf4j.java b/src/main/java/com/mageddo/dnsproxyserver/dataprovider/LogSettingsDAOSlf4j.java index a678e91ca..aed1352db 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/dataprovider/LogSettingsDAOSlf4j.java +++ b/src/main/java/com/mageddo/dnsproxyserver/dataprovider/LogSettingsDAOSlf4j.java @@ -3,7 +3,7 @@ import ch.qos.logback.classic.Level; import com.mageddo.commons.io.IoUtils; import com.mageddo.dnsproxyserver.config.Config; -import com.mageddo.dnsproxyserver.config.dataprovider.mapper.LogLevelMapper; +import com.mageddo.dnsproxyserver.config.mapper.LogLevelMapper; import com.mageddo.logback.LogbackUtils; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/mageddo/dnsproxyserver/di/module/ModuleDao.java b/src/main/java/com/mageddo/dnsproxyserver/di/module/ModuleDao.java index 04c2de163..22cf7b766 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/di/module/ModuleDao.java +++ b/src/main/java/com/mageddo/dnsproxyserver/di/module/ModuleDao.java @@ -1,19 +1,14 @@ package com.mageddo.dnsproxyserver.di.module; import com.mageddo.dnsproxyserver.config.dataprovider.PersistentConfigDAO; +import com.mageddo.dnsproxyserver.config.dataprovider.VersionDAO; import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.PersistentConfigDAOJson; +import com.mageddo.dnsproxyserver.config.provider.prop.VersionDAOProp; import com.mageddo.dnsproxyserver.docker.dataprovider.ContainerFacade; import com.mageddo.dnsproxyserver.docker.dataprovider.ContainerFacadeDefault; import com.mageddo.dnsproxyserver.docker.dataprovider.DockerNetworkFacade; import com.mageddo.dnsproxyserver.docker.dataprovider.DockerNetworkFacadeDefault; -import com.mageddo.dnsproxyserver.solver.docker.dataprovider.ContainerDAO; -import com.mageddo.dnsproxyserver.solver.docker.dataprovider.ContainerDAODefault; -import com.mageddo.dnsproxyserver.solver.docker.dataprovider.DockerDAO; -import com.mageddo.dnsproxyserver.solver.docker.dataprovider.DockerDAODefault; -import com.mageddo.dnsproxyserver.solver.docker.dataprovider.NetworkDAO; -import com.mageddo.dnsproxyserver.solver.docker.dataprovider.NetworkDAODefault; -import com.mageddo.dnsproxyserver.solver.docker.dataprovider.DpsContainerDAO; -import com.mageddo.dnsproxyserver.solver.docker.dataprovider.DpsContainerDAODefault; +import com.mageddo.dnsproxyserver.solver.docker.dataprovider.*; import dagger.Binds; import dagger.Module; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/mapper/ConfigMapperTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/mapper/ConfigMapperCompTest.java similarity index 76% rename from src/test/java/com/mageddo/dnsproxyserver/config/mapper/ConfigMapperTest.java rename to src/test/java/com/mageddo/dnsproxyserver/config/mapper/ConfigMapperCompTest.java index ebb94f204..19dc3942f 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/mapper/ConfigMapperTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/mapper/ConfigMapperCompTest.java @@ -2,16 +2,23 @@ import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.net.IP; +import dagger.sheath.junit.DaggerTest; import org.junit.jupiter.api.Test; +import testing.ContextSupplier; +import testing.Events; import testing.templates.ConfigTemplates; +import javax.inject.Inject; import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; +@DaggerTest(initializer = ContextSupplier.class, eventsHandler = Events.class) +class ConfigMapperCompTest { -class ConfigMapperTest { + @Inject + ConfigMapper configMapper; @Test void mustMapFromDaoConfigsToCurrentConfig() { @@ -19,7 +26,7 @@ void mustMapFromDaoConfigsToCurrentConfig() { final var config = ConfigTemplates.defaultWithoutId(); // act - final var currentConfig = ConfigMapper.mapFrom(List.of(config)); + final var currentConfig = this.configMapper.mapFrom(List.of(config)); // assert assertNotNull(currentConfig); @@ -32,7 +39,7 @@ void mustMapSolverStub() { final var another = ConfigTemplates.acmeSolverStub(); // act - final var currentConfig = ConfigMapper.mapFrom(List.of(theDefault, another)); + final var currentConfig = this.configMapper.mapFrom(List.of(theDefault, another)); // assert assertNotNull(currentConfig); @@ -48,7 +55,7 @@ void mustMapSolverLocal(){ final var theDefault = ConfigTemplates.defaultWithoutId(); final var another = ConfigTemplates.acmeSolverLocal(); - final var currentConfig = ConfigMapper.mapFrom(List.of(theDefault, another)); + final var currentConfig = this.configMapper.mapFrom(List.of(theDefault, another)); assertNotNull(currentConfig); From af426d755f364df89a14ecbd4ecf12b0ef49d448 Mon Sep 17 00:00:00 2001 From: Elvis de Freitas Date: Mon, 31 Mar 2025 10:49:38 -0300 Subject: [PATCH 09/13] fixing test --- .../config/application/ConfigServiceCompTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigServiceCompTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigServiceCompTest.java index 62cd9f429..fa1fefff4 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigServiceCompTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigServiceCompTest.java @@ -42,7 +42,7 @@ void mustPutDaosInTheExpectedOrder() { final var names = this.service.findConfigNames(); // assert - assertEquals("[ConfigDAOEnv, ConfigDAOJson, ConfigDAOCmdArgs]", names.toString()); + assertEquals("[ConfigDAOLegacyEnv, ConfigDAOJson, ConfigDAOCmdArgs]", names.toString()); } @Test From 08a902b8b1071ce4bcd76366ad0242bfcf3ebd85 Mon Sep 17 00:00:00 2001 From: Elvis de Freitas Date: Mon, 31 Mar 2025 10:53:17 -0300 Subject: [PATCH 10/13] fixing reflection config --- .../dnsproxyserver/config/provider/cmdargs/vo/package-info.java | 2 +- .../config/provider/jsonv1v2/vo/package-info.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/package-info.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/package-info.java index 373851dd5..b399baacc 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/package-info.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/package-info.java @@ -1,5 +1,5 @@ @Reflection( - scanPackage = "com.mageddo.dnsproxyserver.config.cmdargs.dataprovider.vo", + scanPackage = "com.mageddo.dnsproxyserver.config.provider.cmdargs.vo", publicConstructors = true, constructors = true, declaredConstructors = true, publicMethods = true, declaredMethods = true, publicFields = true, declaredFields = true diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/package-info.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/package-info.java index 8793b5a1a..adc3bd8f4 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/package-info.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/package-info.java @@ -1,5 +1,5 @@ @Reflection( - scanPackage = "com.mageddo.dnsproxyserver.config.jsonv1v2.vo", + scanPackage = "com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo", publicConstructors = true, constructors = true, declaredConstructors = true, publicMethods = true, declaredMethods = true, publicFields = true, declaredFields = true From a733ad2a5dc57dd1f5fe6de3909b8399b2f8c917 Mon Sep 17 00:00:00 2001 From: Elvis de Freitas Date: Mon, 31 Mar 2025 11:00:00 -0300 Subject: [PATCH 11/13] refactoring packages --- .../cmdargs}/mapper/ConfigFlagMapperTest.java | 3 +-- .../cmdargs/vo}/ConfigFlagTest.java | 7 ++----- .../jsonv1v2}/dataprovider/ConfigDAOJsonTest.java | 3 +-- .../jsonv1v2/dataprovider}/ConfigJsonV1Test.java | 7 ++----- .../jsonv1v2/dataprovider}/JsonConfigsTest.java | 11 +++-------- .../dataprovider}/PersistentConfigDAOJsonTest.java | 9 ++++----- .../jsonv1v2}/mapper/ConfigJsonV2MapperTest.java | 8 ++------ .../legacyenv}/ConfigEnvMapperTest.java | 3 +-- 8 files changed, 16 insertions(+), 35 deletions(-) rename src/test/java/com/mageddo/dnsproxyserver/config/{dataprovider => provider/cmdargs}/mapper/ConfigFlagMapperTest.java (74%) rename src/test/java/com/mageddo/dnsproxyserver/config/{flags => provider/cmdargs/vo}/ConfigFlagTest.java (85%) rename src/test/java/com/mageddo/dnsproxyserver/config/{ => provider/jsonv1v2}/dataprovider/ConfigDAOJsonTest.java (94%) rename src/test/java/com/mageddo/dnsproxyserver/config/{entrypoint => provider/jsonv1v2/dataprovider}/ConfigJsonV1Test.java (66%) rename src/test/java/com/mageddo/dnsproxyserver/config/{entrypoint => provider/jsonv1v2/dataprovider}/JsonConfigsTest.java (88%) rename src/test/java/com/mageddo/dnsproxyserver/config/{ => provider/jsonv1v2/dataprovider}/PersistentConfigDAOJsonTest.java (94%) rename src/test/java/com/mageddo/dnsproxyserver/config/{dataprovider => provider/jsonv1v2}/mapper/ConfigJsonV2MapperTest.java (84%) rename src/test/java/com/mageddo/dnsproxyserver/config/{dataprovider/mapper => provider/legacyenv}/ConfigEnvMapperTest.java (80%) diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigFlagMapperTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/mapper/ConfigFlagMapperTest.java similarity index 74% rename from src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigFlagMapperTest.java rename to src/test/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/mapper/ConfigFlagMapperTest.java index c1a54db1f..ce8c98a05 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigFlagMapperTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/mapper/ConfigFlagMapperTest.java @@ -1,6 +1,5 @@ -package com.mageddo.dnsproxyserver.config.dataprovider.mapper; +package com.mageddo.dnsproxyserver.config.provider.cmdargs.mapper; -import com.mageddo.dnsproxyserver.config.provider.cmdargs.mapper.ConfigFlagMapper; import org.junit.jupiter.api.Test; import testing.templates.ConfigFlagTemplates; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/flags/ConfigFlagTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/ConfigFlagTest.java similarity index 85% rename from src/test/java/com/mageddo/dnsproxyserver/config/flags/ConfigFlagTest.java rename to src/test/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/ConfigFlagTest.java index 355610111..d235e5d7d 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/flags/ConfigFlagTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/ConfigFlagTest.java @@ -1,16 +1,13 @@ -package com.mageddo.dnsproxyserver.config.flags; +package com.mageddo.dnsproxyserver.config.provider.cmdargs.vo; import com.mageddo.commons.regex.Regexes; -import com.mageddo.dnsproxyserver.config.provider.cmdargs.vo.ConfigFlag; import org.junit.jupiter.api.Test; import java.io.PrintWriter; import java.io.StringWriter; import java.util.regex.Pattern; -import static com.mageddo.utils.TestUtils.readAndSortJson; -import static com.mageddo.utils.TestUtils.readString; -import static com.mageddo.utils.TestUtils.sortJson; +import static com.mageddo.utils.TestUtils.*; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOJsonTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/ConfigDAOJsonTest.java similarity index 94% rename from src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOJsonTest.java rename to src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/ConfigDAOJsonTest.java index 88d372c5f..d50dade61 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOJsonTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/ConfigDAOJsonTest.java @@ -1,6 +1,5 @@ -package com.mageddo.dnsproxyserver.config.dataprovider; +package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider; -import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.ConfigDAOJson; import lombok.SneakyThrows; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/ConfigJsonV1Test.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/ConfigJsonV1Test.java similarity index 66% rename from src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/ConfigJsonV1Test.java rename to src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/ConfigJsonV1Test.java index 3b4f2e0c3..81e8c3a1c 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/ConfigJsonV1Test.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/ConfigJsonV1Test.java @@ -1,15 +1,12 @@ -package com.mageddo.dnsproxyserver.config.entrypoint; +package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider; -import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.JsonConfigs; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; import java.nio.file.Files; import java.nio.file.Path; -import static com.mageddo.utils.TestUtils.readAndSortJson; -import static com.mageddo.utils.TestUtils.readAsStream; -import static com.mageddo.utils.TestUtils.readSortDonWriteNullsAndExcludeFields; +import static com.mageddo.utils.TestUtils.*; import static org.junit.jupiter.api.Assertions.assertEquals; class ConfigJsonV1Test { diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/JsonConfigsTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/JsonConfigsTest.java similarity index 88% rename from src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/JsonConfigsTest.java rename to src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/JsonConfigsTest.java index 1e4509a12..e8f49e16e 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/JsonConfigsTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/JsonConfigsTest.java @@ -1,6 +1,5 @@ -package com.mageddo.dnsproxyserver.config.entrypoint; +package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider; -import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.JsonConfigs; import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2; import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2.CanaryRateThresholdCircuitBreaker; import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2.StaticThresholdCircuitBreaker; @@ -13,12 +12,8 @@ import java.time.Duration; import static com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.JsonConfigs.findVersion; -import static com.mageddo.utils.TestUtils.readAndSortJson; -import static com.mageddo.utils.TestUtils.readAsStream; -import static com.mageddo.utils.TestUtils.readSortDonWriteNullsAndExcludeFields; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static com.mageddo.utils.TestUtils.*; +import static org.junit.jupiter.api.Assertions.*; class JsonConfigsTest { diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/PersistentConfigDAOJsonTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/PersistentConfigDAOJsonTest.java similarity index 94% rename from src/test/java/com/mageddo/dnsproxyserver/config/PersistentConfigDAOJsonTest.java rename to src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/PersistentConfigDAOJsonTest.java index 682eef0b8..b640f6b88 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/PersistentConfigDAOJsonTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/PersistentConfigDAOJsonTest.java @@ -1,20 +1,19 @@ -package com.mageddo.dnsproxyserver.config; +package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider; import com.mageddo.dnsproxyserver.config.Config.Entry.Type; -import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.PersistentConfigDAOJson; import com.mageddo.dnsproxyserver.solver.HostnameQuery; -import testing.templates.EnvTemplates; -import testing.templates.HostnameQueryTemplates; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; +import testing.templates.EnvTemplates; +import testing.templates.HostnameQueryTemplates; -import static testing.templates.EnvTemplates.MAGEDDO_COM_CAMEL_CASE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.Mockito.doReturn; +import static testing.templates.EnvTemplates.MAGEDDO_COM_CAMEL_CASE; @ExtendWith(MockitoExtension.class) class PersistentConfigDAOJsonTest { diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2MapperTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV2MapperTest.java similarity index 84% rename from src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2MapperTest.java rename to src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV2MapperTest.java index 1134ca90a..4885135e4 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2MapperTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV2MapperTest.java @@ -1,8 +1,7 @@ -package com.mageddo.dnsproxyserver.config.dataprovider.mapper; +package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.mapper; import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJson; -import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.mapper.ConfigJsonV2Mapper; import org.junit.jupiter.api.Test; import testing.templates.ConfigJsonTemplates; @@ -10,10 +9,7 @@ import java.nio.file.Paths; import static com.mageddo.dnsproxyserver.config.CircuitBreakerStrategyConfig.Name.CANARY_RATE_THRESHOLD; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.*; class ConfigJsonV2MapperTest { diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigEnvMapperTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigEnvMapperTest.java similarity index 80% rename from src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigEnvMapperTest.java rename to src/test/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigEnvMapperTest.java index 03a132f91..3298298ff 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigEnvMapperTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigEnvMapperTest.java @@ -1,6 +1,5 @@ -package com.mageddo.dnsproxyserver.config.dataprovider.mapper; +package com.mageddo.dnsproxyserver.config.provider.legacyenv; -import com.mageddo.dnsproxyserver.config.provider.legacyenv.ConfigEnvMapper; import org.junit.jupiter.api.Test; import testing.templates.config.ConfigEnvTemplates; From 9b9816d99ddfc290f04ec7933005971f9fdea6eb Mon Sep 17 00:00:00 2001 From: Elvis de Freitas Date: Mon, 31 Mar 2025 11:05:52 -0300 Subject: [PATCH 12/13] [Gradle Release Plugin] - new version commit: '3.32.6-snapshot'. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a0e634818..97c5bfb4f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=3.32.5-snapshot +version=3.32.6-snapshot From e30d8a113203e7a98f3b137e556d93573e18423e Mon Sep 17 00:00:00 2001 From: Elvis de Freitas Date: Mon, 31 Mar 2025 11:06:26 -0300 Subject: [PATCH 13/13] release notes --- RELEASE-NOTES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 0599bd2b4..ca8ca9754 100644 --- a/RELEASE-NOTES.md +++ b/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