Feat/440 refactoring (#447)

* refactoring package and names

* refactoring package and names

* isolation app from dataprovider

* refactrogin

* refactoring

* fixing compiling errors

* fixing compiling errors

* refactoring tests

* creating dao strategy to find configs

* partially refactoring to build config based on multiple sources

* refactoring

* refactoring

* configuring dagger

* fixing test

* implementing env mapper

* implementing the mapping

* mapping is done

* refactoring

* adjusting test

* refactoring package

* fixing test

* fixing test

* fixing config template defaults

* adjusting test isolation to unit test

* domain object validation

* refactoring rename

* refactoring rename

* testing daos order

* updating javadoc

* release notes

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

Author: mageddo

RELEASE-NOTES.md

@@ -1,3 +1,6 @@
+## 3.17.3
+* DPS Config module refactoring due #440, see #447 
+
 ## 3.17.2
 * Fixing regression, leading with no ipv6 response, see #446
 

gradle.properties

@@ -1 +1 @@
-version=3.17.2-snapshot
+version=3.17.3-snapshot

src/main/java/com/mageddo/di/CDIImpl.java

@@ -0,0 +1,62 @@
+package com.mageddo.di;
+
+import com.mageddo.dnsproxyserver.di.Context;
+import lombok.RequiredArgsConstructor;
+
+import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.CDI;
+import javax.enterprise.util.TypeLiteral;
+import java.lang.annotation.Annotation;
+import java.util.Iterator;
+
+@RequiredArgsConstructor
+public class CDIImpl extends CDI<Object> {
+
+  private final Context context;
+
+  @Override
+  public BeanManager getBeanManager() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public Instance<Object> select(Annotation... qualifiers) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public <U extends Object> Instance<U> select(Class<U> subtype, Annotation... qualifiers) {
+    return new InstanceImpl<>(this.context.get(subtype));
+  }
+
+  @Override
+  public <U extends Object> Instance<U> select(TypeLiteral<U> subtype, Annotation... qualifiers) {
+    return new InstanceImpl<>(this.context.get(subtype.getRawType()));
+  }
+
+  @Override
+  public boolean isUnsatisfied() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public boolean isAmbiguous() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public void destroy(Object instance) {
+
+  }
+
+  @Override
+  public Iterator<Object> iterator() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public Context get() {
+    return this.context;
+  }
+}

…eddo/dnsproxyserver/di/InstanceImpl.java …in/java/com/mageddo/di/InstanceImpl.javasrc/main/java/com/mageddo/dnsproxyserver/di/InstanceImpl.java renamed to src/main/java/com/mageddo/di/InstanceImpl.java src/main/java/com/mageddo/dnsproxyserver/di/InstanceImpl.java renamed to src/main/java/com/mageddo/di/InstanceImpl.java

@@ -1,15 +1,20 @@
-package com.mageddo.dnsproxyserver.di;
+package com.mageddo.di;
 
 import javax.enterprise.inject.Instance;
 import javax.enterprise.util.TypeLiteral;
 import java.lang.annotation.Annotation;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 
 public class InstanceImpl<T> implements Instance<T> {
 
   private final Collection<T> values;
 
+  public InstanceImpl(T instance){
+    this.values = Collections.singleton(instance);
+  }
+
   public InstanceImpl(Collection<T> values) {
     this.values = values;
   }

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

@@ -1,13 +1,22 @@
 package com.mageddo.dnsproxyserver;
 
-import com.mageddo.dnsproxyserver.config.Configs;
+import com.mageddo.dnsproxyserver.application.AppSettings;
+import com.mageddo.dnsproxyserver.config.Config;
+import com.mageddo.dnsproxyserver.config.application.Configs;
+import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOCmdArgs;
 import com.mageddo.dnsproxyserver.di.Context;
+import org.apache.commons.lang3.BooleanUtils;
 
 public class App {
   public static void main(String[] args) {
 
-    final var config = Configs.getInstance(args);
-    AppSettings.setup(config);
+    ConfigDAOCmdArgs.setArgs(args);
+
+    final var config = Configs.getInstance();
+
+    checkExitCommands(config);
+
+    new AppSettings().setupLogs(config);
 
     final var context = Context.create();
 
@@ -16,6 +25,11 @@ public static void main(String[] args) {
     context.start();
 
     // todo install as service
+  }
 
+  static void checkExitCommands(Config config) {
+    if (BooleanUtils.isTrue(config.isHelpCmd()) || config.isVersionCmd()) {
+      System.exit(0);
+    }
   }
 }

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

@@ -0,0 +1,26 @@
+package com.mageddo.dnsproxyserver.application;
+
+import com.mageddo.dnsproxyserver.config.Config;
+import com.mageddo.dnsproxyserver.dataprovider.LogSettingsDAO;
+import com.mageddo.dnsproxyserver.dataprovider.LogSettingsDAOSlf4j;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.inject.Singleton;
+
+@Slf4j
+@RequiredArgsConstructor
+@Singleton
+public class AppSettings {
+
+  /**
+   * Injetando na mão, pois precisa ser feito antes de iniciar o contexto.
+    */
+  private final LogSettingsDAO logSettingsDAO = new LogSettingsDAOSlf4j();
+
+  public void setupLogs(Config config) {
+    this.logSettingsDAO.setupLogFile(config);
+    this.logSettingsDAO.setupLogLevel(config);
+  }
+
+}

src/main/java/com/mageddo/dnsproxyserver/application/AppSettings.java

@@ -1,6 +1,5 @@
 package com.mageddo.dnsproxyserver.config;
 
-import com.mageddo.dnsproxyserver.config.entrypoint.LogLevel;
 import com.mageddo.dnsproxyserver.server.dns.SimpleServer;
 import com.mageddo.net.IP;
 import com.mageddo.net.IpAddr;
@@ -26,70 +25,57 @@
 import static com.mageddo.commons.lang.Objects.mapOrNull;
 
 /**
- * Domain object which owns the configs.
  *
- * @see com.mageddo.dnsproxyserver.config.entrypoint.ConfigJson
- * @see com.mageddo.dnsproxyserver.config.entrypoint.ConfigFlag
- * @see com.mageddo.dnsproxyserver.config.entrypoint.ConfigEnv
+ * @see com.mageddo.dnsproxyserver.config.application.ConfigService
  */
 @Value
-@Builder
+@Builder(toBuilder = true)
 public class Config {
 
-  @NonNull
   private String version;
 
-  @NonNull
   @Builder.Default
   private List<IpAddr> remoteDnsServers = new ArrayList<>();
 
-  @NonNull
   private Integer webServerPort;
 
-  @NonNull
   private Integer dnsServerPort;
 
-  @NonNull
   private Boolean defaultDns;
 
   private LogLevel logLevel;
 
-  @NonNull
   private String logFile;
 
-  @NonNull
   private Boolean registerContainerNames;
 
-  @NonNull
   private String hostMachineHostname;
 
-  @NonNull
   private String domain;
 
-  @NonNull
   private Boolean mustConfigureDpsNetwork;
 
-  @NonNull
   private Boolean dpsNetworkAutoConnect;
 
-  @NonNull
   private Path configPath;
 
-  @NonNull
   private String resolvConfPaths;
 
-  @NonNull
   private SimpleServer.Protocol serverProtocol;
 
   private URI dockerHost;
 
-  private boolean resolvConfOverrideNameServers;
+  private Boolean resolvConfOverrideNameServers;
 
-  private boolean noRemoteServers;
+  private Boolean noRemoteServers;
 
-  private int noEntriesResponseCode;
+  private Integer noEntriesResponseCode;
 
-  private boolean dockerSolverHostMachineFallbackActive;
+  private Boolean dockerSolverHostMachineFallbackActive;
+
+  private boolean helpCmd;
+
+  private boolean versionCmd;
 
   public void resetConfigFile() {
     try {
@@ -184,7 +170,7 @@ public enum Type {
       private final int type;
 
       public boolean isNot(Type... types) {
-        return Types.isNot(this.type, types);
+        return ConfigEntryTypes.isNot(this.type, types);
       }
 
       public static Type of(Integer code) {
@@ -217,7 +203,7 @@ public IP.Version toVersion() {
       }
 
       public boolean isAddressSolving() {
-        return Types.is(this, Config.Entry.Type.A, Config.Entry.Type.AAAA);
+        return ConfigEntryTypes.is(this, Config.Entry.Type.A, Config.Entry.Type.AAAA);
       }
     }
   }

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

@@ -5,7 +5,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-public class Types {
+public class ConfigEntryTypes {
 
   public static boolean isNot(Type current, Type... possible) {
     return !is(current, possible);