#94 : API: optimize core packages structure

compiler/src/main/java/net/cactusthorn/config/compiler/configbuildergenerator/BuildPart.java

@@ -21,9 +21,9 @@
 import net.cactusthorn.config.compiler.GeneratorPart;
 import net.cactusthorn.config.compiler.methodvalidator.MethodInfo;
 import net.cactusthorn.config.compiler.methodvalidator.MethodInfo.StringMethod;
-import net.cactusthorn.config.core.ConfigBuilder;
 import net.cactusthorn.config.core.loader.ConfigHolder;
 import net.cactusthorn.config.core.loader.LoadStrategy;
+import net.cactusthorn.config.core.util.ConfigBuilder;
 
 public class BuildPart implements GeneratorPart {
 

compiler/src/main/java/net/cactusthorn/config/compiler/configbuildergenerator/ConfigBuilderGenerator.java

@@ -15,7 +15,7 @@
 import net.cactusthorn.config.compiler.GeneratorPart;
 import net.cactusthorn.config.compiler.InterfaceInfo;
 import net.cactusthorn.config.compiler.methodvalidator.MethodInfo;
-import net.cactusthorn.config.core.ConfigBuilder;
+import net.cactusthorn.config.core.util.ConfigBuilder;
 
 public final class ConfigBuilderGenerator extends Generator {
 

compiler/src/main/java/net/cactusthorn/config/compiler/configgenerator/ConfigGenerator.java

@@ -12,7 +12,7 @@
 import net.cactusthorn.config.compiler.InterfaceInfo;
 import net.cactusthorn.config.compiler.GeneratorPart;
 import net.cactusthorn.config.compiler.methodvalidator.MethodInfo;
-import net.cactusthorn.config.core.ConfigBuilder;
+import net.cactusthorn.config.core.util.ConfigBuilder;
 
 public final class ConfigGenerator extends Generator {
 

compiler/src/main/java/net/cactusthorn/config/compiler/methodvalidator/DefaultConvertorValidator.java

@@ -19,12 +19,12 @@
 import javax.lang.model.type.TypeMirror;
 
 import net.cactusthorn.config.compiler.ProcessorException;
-import net.cactusthorn.config.core.converter.URIConverter;
-import net.cactusthorn.config.core.converter.URLConverter;
-import net.cactusthorn.config.core.converter.DurationConverter;
-import net.cactusthorn.config.core.converter.InstantConverter;
-import net.cactusthorn.config.core.converter.PathConverter;
-import net.cactusthorn.config.core.converter.PeriodConverter;
+import net.cactusthorn.config.core.converter.standard.DurationConverter;
+import net.cactusthorn.config.core.converter.standard.InstantConverter;
+import net.cactusthorn.config.core.converter.standard.PathConverter;
+import net.cactusthorn.config.core.converter.standard.PeriodConverter;
+import net.cactusthorn.config.core.converter.standard.URIConverter;
+import net.cactusthorn.config.core.converter.standard.URLConverter;
 
 public class DefaultConvertorValidator extends MethodValidatorAncestor {
 

compiler/src/test/resources/test/ConfigConverter.java

@@ -5,7 +5,7 @@
 
 import net.cactusthorn.config.core.Config;
 import net.cactusthorn.config.core.converter.ConverterClass;
-import net.cactusthorn.config.core.converter.DurationConverter;
+import net.cactusthorn.config.core.converter.standard.DurationConverter;
 
 @Config public interface ConfigConverter extends Serializable {
 

compiler/src/test/resources/test/ConfigDefaultConverters.java

@@ -8,7 +8,7 @@
 
 import net.cactusthorn.config.core.Config;
 import net.cactusthorn.config.core.converter.ConverterClass;
-import net.cactusthorn.config.core.converter.DurationConverter;
+import net.cactusthorn.config.core.converter.standard.DurationConverter;
 
 @Config public interface ConfigDefaultConverters {
     Instant instant();

core/src/main/java/net/cactusthorn/config/core/ConfigFactory.java

@@ -17,17 +17,18 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import net.cactusthorn.config.core.loader.ClasspathJarManifestLoader;
-import net.cactusthorn.config.core.loader.ClasspathPropertiesLoader;
-import net.cactusthorn.config.core.loader.ClasspathXMLLoader;
 import net.cactusthorn.config.core.loader.ConfigHolder;
 import net.cactusthorn.config.core.loader.LoadStrategy;
 import net.cactusthorn.config.core.loader.Loader;
 import net.cactusthorn.config.core.loader.Loaders;
-import net.cactusthorn.config.core.loader.SystemEnvLoader;
-import net.cactusthorn.config.core.loader.SystemPropertiesLoader;
-import net.cactusthorn.config.core.loader.UrlPropertiesLoader;
-import net.cactusthorn.config.core.loader.UrlXMLLoader;
+import net.cactusthorn.config.core.loader.standard.ClasspathJarManifestLoader;
+import net.cactusthorn.config.core.loader.standard.ClasspathPropertiesLoader;
+import net.cactusthorn.config.core.loader.standard.ClasspathXMLLoader;
+import net.cactusthorn.config.core.loader.standard.SystemEnvLoader;
+import net.cactusthorn.config.core.loader.standard.SystemPropertiesLoader;
+import net.cactusthorn.config.core.loader.standard.UrlPropertiesLoader;
+import net.cactusthorn.config.core.loader.standard.UrlXMLLoader;
+import net.cactusthorn.config.core.util.ConfigBuilder;
 
 public final class ConfigFactory {
 

core/src/main/java/net/cactusthorn/config/core/converter/DurationConverter.java → core/src/main/java/net/cactusthorn/config/core/converter/standard/DurationConverter.java

@@ -1,11 +1,13 @@
-package net.cactusthorn.config.core.converter;
+package net.cactusthorn.config.core.converter.standard;
 
 import static net.cactusthorn.config.core.util.ApiMessages.*;
 import static net.cactusthorn.config.core.util.ApiMessages.Key.*;
 
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 
+import net.cactusthorn.config.core.converter.Converter;
+
 /**
  *
  * This converter will convert various duration formatted strings over to

core/src/main/java/net/cactusthorn/config/core/converter/InstantConverter.java → core/src/main/java/net/cactusthorn/config/core/converter/standard/InstantConverter.java

@@ -1,7 +1,9 @@
-package net.cactusthorn.config.core.converter;
+package net.cactusthorn.config.core.converter.standard;
 
 import java.time.Instant;
 
+import net.cactusthorn.config.core.converter.Converter;
+
 public class InstantConverter implements Converter<Instant> {
 
     @Override public Instant convert(String value) {

core/src/main/java/net/cactusthorn/config/core/converter/PathConverter.java → core/src/main/java/net/cactusthorn/config/core/converter/standard/PathConverter.java

@@ -1,8 +1,10 @@
-package net.cactusthorn.config.core.converter;
+package net.cactusthorn.config.core.converter.standard;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
+import net.cactusthorn.config.core.converter.Converter;
+
 public class PathConverter implements Converter<Path> {
 
     @Override public Path convert(String value) {

core/src/main/java/net/cactusthorn/config/core/converter/PeriodConverter.java → core/src/main/java/net/cactusthorn/config/core/converter/standard/PeriodConverter.java

@@ -1,10 +1,12 @@
-package net.cactusthorn.config.core.converter;
+package net.cactusthorn.config.core.converter.standard;
 
 import static net.cactusthorn.config.core.util.ApiMessages.msg;
 import static net.cactusthorn.config.core.util.ApiMessages.Key.*;
 
 import java.time.Period;
 
+import net.cactusthorn.config.core.converter.Converter;
+
 public class PeriodConverter implements Converter<Period> {
 
     @Override public Period convert(String value) {

core/src/main/java/net/cactusthorn/config/core/converter/URIConverter.java → core/src/main/java/net/cactusthorn/config/core/converter/standard/URIConverter.java

@@ -1,7 +1,9 @@
-package net.cactusthorn.config.core.converter;
+package net.cactusthorn.config.core.converter.standard;
 
 import java.net.URI;
 
+import net.cactusthorn.config.core.converter.Converter;
+
 public class URIConverter implements Converter<URI> {
 
     @Override public URI convert(String value) {

core/src/main/java/net/cactusthorn/config/core/converter/URLConverter.java → core/src/main/java/net/cactusthorn/config/core/converter/standard/URLConverter.java

@@ -1,6 +1,9 @@
-package net.cactusthorn.config.core.converter;
+package net.cactusthorn.config.core.converter.standard;
 
 import java.net.URL;
+
+import net.cactusthorn.config.core.converter.Converter;
+
 import java.net.MalformedURLException;
 
 public class URLConverter implements Converter<URL> {

core/src/main/java/net/cactusthorn/config/core/loader/ClasspathJarManifestLoader.java → core/src/main/java/net/cactusthorn/config/core/loader/standard/ClasspathJarManifestLoader.java

@@ -1,4 +1,4 @@
-package net.cactusthorn.config.core.loader;
+package net.cactusthorn.config.core.loader.standard;
 
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
@@ -17,6 +17,8 @@
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
+import net.cactusthorn.config.core.loader.Loader;
+
 public class ClasspathJarManifestLoader implements Loader {
 
     private static final Logger LOG = Logger.getLogger(ClasspathJarManifestLoader.class.getName());

core/src/main/java/net/cactusthorn/config/core/loader/ClasspathPropertiesLoader.java → core/src/main/java/net/cactusthorn/config/core/loader/standard/ClasspathPropertiesLoader.java

@@ -1,4 +1,4 @@
-package net.cactusthorn.config.core.loader;
+package net.cactusthorn.config.core.loader.standard;
 
 import static net.cactusthorn.config.core.util.ApiMessages.*;
 import static net.cactusthorn.config.core.util.ApiMessages.Key.*;
@@ -14,6 +14,8 @@
 import java.util.Properties;
 import java.util.logging.Logger;
 
+import net.cactusthorn.config.core.loader.Loader;
+
 public final class ClasspathPropertiesLoader implements Loader {
 
     private static final Logger LOG = Logger.getLogger(ClasspathPropertiesLoader.class.getName());

core/src/main/java/net/cactusthorn/config/core/loader/ClasspathXMLLoader.java → core/src/main/java/net/cactusthorn/config/core/loader/standard/ClasspathXMLLoader.java

@@ -1,4 +1,4 @@
-package net.cactusthorn.config.core.loader;
+package net.cactusthorn.config.core.loader.standard;
 
 import static net.cactusthorn.config.core.util.ApiMessages.msg;
 import static net.cactusthorn.config.core.util.ApiMessages.Key.CANT_LOAD_RESOURCE;
@@ -13,6 +13,7 @@
 import java.util.Map;
 import java.util.logging.Logger;
 
+import net.cactusthorn.config.core.loader.Loader;
 import net.cactusthorn.config.core.util.XMLToMapParser;
 
 public class ClasspathXMLLoader implements Loader {

core/src/main/java/net/cactusthorn/config/core/loader/SystemEnvLoader.java → core/src/main/java/net/cactusthorn/config/core/loader/standard/SystemEnvLoader.java

@@ -1,9 +1,11 @@
-package net.cactusthorn.config.core.loader;
+package net.cactusthorn.config.core.loader.standard;
 
 import java.net.URI;
 import java.util.HashMap;
 import java.util.Map;
 
+import net.cactusthorn.config.core.loader.Loader;
+
 public final class SystemEnvLoader implements Loader {
 
     private static final String SCHEME = "system";

core/src/main/java/net/cactusthorn/config/core/loader/SystemPropertiesLoader.java → core/src/main/java/net/cactusthorn/config/core/loader/standard/SystemPropertiesLoader.java

@@ -1,9 +1,11 @@
-package net.cactusthorn.config.core.loader;
+package net.cactusthorn.config.core.loader.standard;
 
 import java.net.URI;
 import java.util.HashMap;
 import java.util.Map;
 
+import net.cactusthorn.config.core.loader.Loader;
+
 public final class SystemPropertiesLoader implements Loader {
 
     private static final String SCHEME = "system";

core/src/main/java/net/cactusthorn/config/core/loader/UrlPropertiesLoader.java → core/src/main/java/net/cactusthorn/config/core/loader/standard/UrlPropertiesLoader.java

@@ -1,4 +1,4 @@
-package net.cactusthorn.config.core.loader;
+package net.cactusthorn.config.core.loader.standard;
 
 import static net.cactusthorn.config.core.util.ApiMessages.msg;
 import static net.cactusthorn.config.core.util.ApiMessages.Key.CANT_LOAD_RESOURCE;
@@ -14,6 +14,8 @@
 import java.util.Properties;
 import java.util.logging.Logger;
 
+import net.cactusthorn.config.core.loader.Loader;
+
 public final class UrlPropertiesLoader implements Loader {
 
     private static final Logger LOG = Logger.getLogger(UrlPropertiesLoader.class.getName());

core/src/main/java/net/cactusthorn/config/core/loader/UrlXMLLoader.java → core/src/main/java/net/cactusthorn/config/core/loader/standard/UrlXMLLoader.java

@@ -1,4 +1,4 @@
-package net.cactusthorn.config.core.loader;
+package net.cactusthorn.config.core.loader.standard;
 
 import static net.cactusthorn.config.core.util.ApiMessages.msg;
 import static net.cactusthorn.config.core.util.ApiMessages.Key.CANT_LOAD_RESOURCE;
@@ -13,6 +13,7 @@
 import java.util.Map;
 import java.util.logging.Logger;
 
+import net.cactusthorn.config.core.loader.Loader;
 import net.cactusthorn.config.core.util.XMLToMapParser;
 
 public class UrlXMLLoader implements Loader {

core/src/main/java/net/cactusthorn/config/core/ConfigBuilder.java → core/src/main/java/net/cactusthorn/config/core/util/ConfigBuilder.java

@@ -1,4 +1,4 @@
-package net.cactusthorn.config.core;
+package net.cactusthorn.config.core.util;
 
 import java.util.concurrent.ConcurrentHashMap;
 

core/src/test/java/net/cactusthorn/config/core/ConfigBuilder_TestConfig.java

@@ -5,11 +5,13 @@
 import java.lang.String;
 import java.util.HashMap;
 import java.util.Map;
-import net.cactusthorn.config.core.converter.DurationConverter;
+
 import net.cactusthorn.config.core.converter.ToTestConverter;
+import net.cactusthorn.config.core.converter.standard.DurationConverter;
 import net.cactusthorn.config.core.loader.ConfigHolder;
 import net.cactusthorn.config.core.loader.LoadStrategy;
 import net.cactusthorn.config.core.loader.Loaders;
+import net.cactusthorn.config.core.util.ConfigBuilder;
 
 public final class ConfigBuilder_TestConfig extends ConfigBuilder<Config_TestConfig> {
   private static final String[] URIS = new String[] {""};

core/src/test/java/net/cactusthorn/config/core/configoverride/ConfigBuilder_ConfigOverride.java

@@ -5,10 +5,11 @@
 import java.lang.String;
 import java.util.HashMap;
 import java.util.Map;
-import net.cactusthorn.config.core.ConfigBuilder;
+
 import net.cactusthorn.config.core.loader.ConfigHolder;
 import net.cactusthorn.config.core.loader.LoadStrategy;
 import net.cactusthorn.config.core.loader.Loaders;
+import net.cactusthorn.config.core.util.ConfigBuilder;
 
 public final class ConfigBuilder_ConfigOverride extends ConfigBuilder<Config_ConfigOverride> {
   private static final String[] URIS = new String[] {"classpath:config/testconfig2.properties", "classpath:config/testconfig.properties"};

core/src/test/java/net/cactusthorn/config/core/converter/DurationConverterTest.java

@@ -10,6 +10,8 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
+import net.cactusthorn.config.core.converter.standard.DurationConverter;
+
 public class DurationConverterTest {
 
     static Converter<Duration> converter = new DurationConverter();

core/src/test/java/net/cactusthorn/config/core/converter/InstantConverterTest.java

@@ -8,6 +8,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import net.cactusthorn.config.core.converter.standard.InstantConverter;
+
 public class InstantConverterTest {
 
     static Converter<Instant> converter = new InstantConverter();

core/src/test/java/net/cactusthorn/config/core/converter/PathConverterTest.java

@@ -8,6 +8,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import net.cactusthorn.config.core.converter.standard.PathConverter;
+
 public class PathConverterTest {
 
     static Converter<Path> converter = new PathConverter();

core/src/test/java/net/cactusthorn/config/core/converter/PeriodConverterTest.java

@@ -9,6 +9,8 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
+import net.cactusthorn.config.core.converter.standard.PeriodConverter;
+
 public class PeriodConverterTest {
 
     static Converter<Period> converter = new PeriodConverter();

core/src/test/java/net/cactusthorn/config/core/converter/URIConverterTest.java

@@ -7,6 +7,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import net.cactusthorn.config.core.converter.standard.URIConverter;
+
 public class URIConverterTest {
 
     static Converter<URI> converter = new URIConverter();

core/src/test/java/net/cactusthorn/config/core/converter/URLConverterTest.java

@@ -8,6 +8,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import net.cactusthorn.config.core.converter.standard.URLConverter;
+
 public class URLConverterTest {
 
     static Converter<URL> converter = new URLConverter();

core/src/test/java/net/cactusthorn/config/core/loader/ClasspathJarManifestLoaderTest.java

@@ -12,6 +12,8 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import net.cactusthorn.config.core.loader.standard.ClasspathJarManifestLoader;
+
 public class ClasspathJarManifestLoaderTest {
 
     private static final Loader LOADER = new ClasspathJarManifestLoader();

core/src/test/java/net/cactusthorn/config/core/loader/ClasspathPropertiesLoaderTest.java

@@ -13,6 +13,8 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import net.cactusthorn.config.core.loader.standard.ClasspathPropertiesLoader;
+
 public class ClasspathPropertiesLoaderTest {
 
     private static final Loader LOADER = new ClasspathPropertiesLoader();

core/src/test/java/net/cactusthorn/config/core/loader/ClasspathXMLLoaderTest.java

@@ -12,6 +12,8 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import net.cactusthorn.config.core.loader.standard.ClasspathXMLLoader;
+
 public class ClasspathXMLLoaderTest {
 
     @BeforeAll static void setUpLogger() {

core/src/test/java/net/cactusthorn/config/core/loader/SystemEnvLoaderTest.java

@@ -7,6 +7,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import net.cactusthorn.config.core.loader.standard.SystemEnvLoader;
+
 public class SystemEnvLoaderTest {
 
     private static final Loader LOADER = new SystemEnvLoader();

core/src/test/java/net/cactusthorn/config/core/loader/SystemPropertiesLoaderTest.java

@@ -7,6 +7,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import net.cactusthorn.config.core.loader.standard.SystemPropertiesLoader;
+
 public class SystemPropertiesLoaderTest {
 
     private static final Loader LOADER = new SystemPropertiesLoader();