diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/ConfigParseService.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/ConfigParseService.java index bddceb852..90ce8b1f0 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/ConfigParseService.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/ConfigParseService.java @@ -3,7 +3,7 @@ import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsproxyserver.config.mapper.ConfigMapper; import com.mageddo.dnsproxyserver.config.provider.dataformatv3.mapper.ConfigV3Mapper; -import com.mageddo.dnsproxyserver.config.provider.dataformatv3.parser.Converter; +import com.mageddo.dnsproxyserver.config.provider.dataformatv3.converter.Converter; import lombok.RequiredArgsConstructor; import javax.inject.Inject; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/parser/Converter.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/converter/Converter.java similarity index 95% rename from src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/parser/Converter.java rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/converter/Converter.java index ee09a445a..957815698 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/parser/Converter.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/converter/Converter.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.provider.dataformatv3.parser; +package com.mageddo.dnsproxyserver.config.provider.dataformatv3.converter; import com.mageddo.dnsproxyserver.config.provider.dataformatv3.ConfigV3; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/parser/EnvConverter.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/converter/EnvConverter.java similarity index 97% rename from src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/parser/EnvConverter.java rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/converter/EnvConverter.java index 77691f3c0..d1817e9c3 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/parser/EnvConverter.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/converter/EnvConverter.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.provider.dataformatv3.parser; +package com.mageddo.dnsproxyserver.config.provider.dataformatv3.converter; import com.mageddo.dnsproxyserver.config.provider.dataformatv3.ConfigV3; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/parser/JsonConverter.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/converter/JsonConverter.java similarity index 98% rename from src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/parser/JsonConverter.java rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/converter/JsonConverter.java index 9d45e2c8c..56b9d23ce 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/parser/JsonConverter.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/converter/JsonConverter.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.provider.dataformatv3.parser; +package com.mageddo.dnsproxyserver.config.provider.dataformatv3.converter; import com.mageddo.dnsproxyserver.config.provider.dataformatv3.ConfigV3; import com.mageddo.json.JsonUtils; diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/parser/YamlConverter.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/converter/YamlConverter.java similarity index 98% rename from src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/parser/YamlConverter.java rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/converter/YamlConverter.java index f331320fe..73f9f201c 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/parser/YamlConverter.java +++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/converter/YamlConverter.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.provider.dataformatv3.parser; +package com.mageddo.dnsproxyserver.config.provider.dataformatv3.converter; import com.mageddo.dataformat.yaml.YamlUtils; import com.mageddo.dnsproxyserver.config.provider.dataformatv3.ConfigV3; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/parser/ConverterTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/converter/ConverterTest.java similarity index 98% rename from src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/parser/ConverterTest.java rename to src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/converter/ConverterTest.java index 66c2360d9..4e53969ea 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/parser/ConverterTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/converter/ConverterTest.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.provider.dataformatv3.parser; +package com.mageddo.dnsproxyserver.config.provider.dataformatv3.converter; import com.mageddo.dnsproxyserver.config.provider.dataformatv3.templates.ConfigV3Templates; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/parser/JsonConverterTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/converter/JsonConverterTest.java similarity index 98% rename from src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/parser/JsonConverterTest.java rename to src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/converter/JsonConverterTest.java index 4d190ab11..45439f4a7 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/parser/JsonConverterTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/converter/JsonConverterTest.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.provider.dataformatv3.parser; +package com.mageddo.dnsproxyserver.config.provider.dataformatv3.converter; import com.mageddo.dnsproxyserver.config.provider.dataformatv3.templates.ConfigV3Templates; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/parser/YamlConverterTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/converter/YamlConverterTest.java similarity index 98% rename from src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/parser/YamlConverterTest.java rename to src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/converter/YamlConverterTest.java index 946f29d29..35144d531 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/parser/YamlConverterTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/converter/YamlConverterTest.java @@ -1,4 +1,4 @@ -package com.mageddo.dnsproxyserver.config.provider.dataformatv3.parser; +package com.mageddo.dnsproxyserver.config.provider.dataformatv3.converter; import com.mageddo.dnsproxyserver.config.provider.dataformatv3.templates.ConfigV3Templates; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/templates/ConfigV3Templates.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/templates/ConfigV3Templates.java index cbfd7fc73..4472f2a76 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/templates/ConfigV3Templates.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/templates/ConfigV3Templates.java @@ -1,11 +1,13 @@ package com.mageddo.dnsproxyserver.config.provider.dataformatv3.templates; import com.mageddo.dataformat.yaml.YamlUtils; +import com.mageddo.dnsproxyserver.config.provider.dataformatv3.ConfigV3; +import com.mageddo.dnsproxyserver.config.provider.dataformatv3.converter.JsonConverter; import com.mageddo.json.JsonUtils; public class ConfigV3Templates { - public static String buildYaml(){ + public static String buildYaml() { return YamlUtils.format(""" --- version: 3 @@ -57,7 +59,11 @@ public static String buildYaml(){ """); } - public static String buildJson(){ + public ConfigV3 build() { + return new JsonConverter().parse(buildJson()); + } + + public static String buildJson() { return JsonUtils.prettify(""" { "version": 3,