From 444c868124c6b68e4d68effc0442f01cd8e4890c Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sat, 22 Feb 2020 09:11:37 +1300
Subject: [PATCH] Refactor to use avaje config (#1894)

* Move to use Avaje Config for properties loading
---
 pom.xml                                       |   9 +-
 src/main/java/io/ebean/PrimaryServer.java     |  20 +-
 .../java/io/ebean/config/ServerConfig.java    |   6 +-
 .../ebean/config/properties/LoadContext.java  | 106 ---------
 .../io/ebean/config/properties/Loader.java    | 181 ----------------
 .../config/properties/PropertiesLoader.java   |  74 -------
 .../ebean/config/properties/PropertyEval.java | 205 ------------------
 .../ebean/config/properties/YamlLoader.java   |  58 -----
 .../ebean/config/PropertiesWrapperTest.java   |   5 +-
 .../ebean/config/properties/LoaderTest.java   |  70 ------
 .../config/properties/PropertyEvalTest.java   |  78 -------
 .../transaction/TestAutoCommitDataSource.java |   4 +-
 .../TestExplicitTransactionMode.java          |   4 +-
 13 files changed, 16 insertions(+), 804 deletions(-)
 delete mode 100644 src/main/java/io/ebean/config/properties/LoadContext.java
 delete mode 100644 src/main/java/io/ebean/config/properties/Loader.java
 delete mode 100644 src/main/java/io/ebean/config/properties/PropertiesLoader.java
 delete mode 100644 src/main/java/io/ebean/config/properties/PropertyEval.java
 delete mode 100644 src/main/java/io/ebean/config/properties/YamlLoader.java
 delete mode 100644 src/test/java/io/ebean/config/properties/LoaderTest.java
 delete mode 100644 src/test/java/io/ebean/config/properties/PropertyEvalTest.java

diff --git a/pom.xml b/pom.xml
index 98b51706e..c9c9687e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,13 +62,10 @@
       <scope>provided</scope>
     </dependency>
 
-    <!--
-    Exclude snakeyaml if you desire - it is not strictly required.
-    -->
     <dependency>
-      <groupId>org.yaml</groupId>
-      <artifactId>snakeyaml</artifactId>
-      <version>${snakeyaml.version}</version>
+      <groupId>io.avaje</groupId>
+      <artifactId>config</artifactId>
+      <version>1.0</version>
     </dependency>
 
     <!--
diff --git a/src/main/java/io/ebean/PrimaryServer.java b/src/main/java/io/ebean/PrimaryServer.java
index 9b0140f6f..a4f4fb917 100644
--- a/src/main/java/io/ebean/PrimaryServer.java
+++ b/src/main/java/io/ebean/PrimaryServer.java
@@ -1,6 +1,6 @@
 package io.ebean;
 
-import io.ebean.config.properties.PropertiesLoader;
+import io.avaje.config.Config;
 
 import java.util.Properties;
 
@@ -11,8 +11,6 @@ import java.util.Properties;
  */
 class PrimaryServer {
 
-  private static Properties globalProperties;
-
   private static String defaultServerName;
 
   private static boolean skip;
@@ -43,14 +41,10 @@ class PrimaryServer {
    * Return the default configuration Properties.
    */
   static synchronized Properties getProperties() {
-    if (globalProperties == null) {
-      globalProperties = PropertiesLoader.load();
-    }
     if (defaultServerName == null) {
       defaultServerName = determineDefaultServerName();
     }
-    return globalProperties;
-
+    return Config.asProperties();
   }
 
   /**
@@ -62,15 +56,9 @@ class PrimaryServer {
     defaultServerName = System.getProperty("db", defaultServerName);
     defaultServerName = System.getProperty("ebean_db", defaultServerName);
     if (isEmpty(defaultServerName)) {
-      defaultServerName = System.getProperty("datasource.default");
+      defaultServerName = Config.get("datasource.default", null);
       if (isEmpty(defaultServerName)) {
-        defaultServerName = System.getProperty("ebean.default.datasource");
-        if (isEmpty(defaultServerName)) {
-          defaultServerName = globalProperties.getProperty("datasource.default");
-          if (isEmpty(defaultServerName)) {
-            defaultServerName = globalProperties.getProperty("ebean.default.datasource");
-          }
-        }
+        defaultServerName = Config.get("ebean.default.datasource", null);
       }
     }
     if (defaultServerName == null) {
diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 3c11706ba..9ba10c287 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -1,6 +1,7 @@
 package io.ebean.config;
 
 import com.fasterxml.jackson.core.JsonFactory;
+import io.avaje.config.Config;
 import io.ebean.DatabaseFactory;
 import io.ebean.PersistenceContextScope;
 import io.ebean.Query;
@@ -13,7 +14,6 @@ import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbEncrypt;
 import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.IdType;
-import io.ebean.config.properties.PropertiesLoader;
 import io.ebean.datasource.DataSourceConfig;
 import io.ebean.event.BeanFindController;
 import io.ebean.event.BeanPersistController;
@@ -2746,7 +2746,7 @@ public class ServerConfig {
    * Load settings from ebean.properties.
    */
   public void loadFromProperties() {
-    this.properties = PropertiesLoader.load();
+    this.properties = Config.asProperties();
     configureFromProperties();
   }
 
@@ -2755,7 +2755,7 @@ public class ServerConfig {
    */
   public void loadFromProperties(Properties properties) {
     // keep the properties used for configuration so that these are available for plugins
-    this.properties = PropertiesLoader.eval(properties);
+    this.properties = Config.asConfiguration().eval(properties);
     configureFromProperties();
   }
 
diff --git a/src/main/java/io/ebean/config/properties/LoadContext.java b/src/main/java/io/ebean/config/properties/LoadContext.java
deleted file mode 100644
index 5c5b156c9..000000000
--- a/src/main/java/io/ebean/config/properties/LoadContext.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package io.ebean.config.properties;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-/**
- * Manages the underlying map of properties we are gathering.
- */
-class LoadContext {
-
-  private static final Logger log = LoggerFactory.getLogger(LoadContext.class);
-
-  /**
-   * Map we are loading the properties into.
-   */
-  private final Map<String, String> map = new LinkedHashMap<>();
-
-  /**
-   * Names of resources/files that were loaded.
-   */
-  private final Set<String> loadedResources = new LinkedHashSet<>();
-
-  /**
-   * Return the input stream (maybe null) for the given source.
-   */
-  InputStream resource(String resourcePath, Loader.Source source) {
-
-    InputStream is = null;
-    if (source == Loader.Source.RESOURCE) {
-      is = resourceStream(resourcePath);
-      if (is != null) {
-        loadedResources.add(resourcePath);
-      }
-    } else {
-      File file = new File(resourcePath);
-      if (file.exists()) {
-        try {
-          is = new FileInputStream(file);
-          loadedResources.add("file:" + resourcePath);
-        } catch (FileNotFoundException e) {
-          throw new IllegalStateException(e);
-        }
-      }
-    }
-
-    return is;
-  }
-
-  private InputStream resourceStream(String resourcePath) {
-    InputStream is = getClass().getResourceAsStream("/" + resourcePath);
-    if (is == null) {
-      // search the module path for top level resource
-      is = ClassLoader.getSystemResourceAsStream(resourcePath);
-    }
-    return is;
-  }
-
-  /**
-   * Add a property entry.
-   */
-  void put(String key, String val) {
-    if (val != null) {
-      val = val.trim();
-    }
-    map.put(key, val);
-  }
-
-  /**
-   * Evaluate all the expressions and return as a Properties object.
-   */
-  Properties eval() {
-
-    log.info("loaded properties from {}", loadedResources);
-
-    Properties properties = new Properties();
-
-    for (Map.Entry<String, String> entry : map.entrySet()) {
-      String key = entry.getKey();
-      String value = PropertyEval.eval(entry.getValue());
-      properties.setProperty(key, value);
-    }
-
-    return properties;
-  }
-
-  /**
-   * Read the special properties that can point to an external properties source.
-   */
-  String indirectLocation() {
-    String indirectLocation = map.get("load.properties");
-    if (indirectLocation == null) {
-      indirectLocation = map.get("load.properties.override");
-    }
-    return indirectLocation;
-  }
-}
diff --git a/src/main/java/io/ebean/config/properties/Loader.java b/src/main/java/io/ebean/config/properties/Loader.java
deleted file mode 100644
index 1bbda9184..000000000
--- a/src/main/java/io/ebean/config/properties/Loader.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package io.ebean.config.properties;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Enumeration;
-import java.util.Properties;
-
-/**
- * Loads the configuration from known/expected locations.
- * <p>
- * Defines the loading order of resources and files.
- * </p>
- */
-class Loader {
-
-  private static final Logger log = LoggerFactory.getLogger(Loader.class);
-
-  enum Source {
-    RESOURCE,
-    FILE
-  }
-
-  private final LoadContext loadContext = new LoadContext();
-
-  private YamlLoader yamlLoader;
-
-  Loader() {
-    String skipYaml = System.getProperty("ebeanSkipYaml");
-    if (!"true".equals(skipYaml)) {
-      try {
-        Class<?> exists = Class.forName("org.yaml.snakeyaml.Yaml");
-        if (exists != null) {
-          yamlLoader = new YamlLoader(loadContext);
-        }
-      } catch (Exception e) {
-        // ignored
-      }
-    }
-  }
-
-  /**
-   * Load the configuration with the expected ordering.
-   */
-  void load() {
-
-    loadMain(Source.RESOURCE);
-    // external file configuration overrides the resources configuration
-    loadMain(Source.FILE);
-
-    loadViaSystemProperty();
-    loadViaIndirection();
-
-    // test configuration (if found) overrides main configuration
-    // we should only find these resources when running tests
-    loadTest();
-  }
-
-  /**
-   * Load test configuration.
-   */
-  private void loadTest() {
-    loadProperties("application-test.properties", Source.RESOURCE);
-    loadYaml("application-test.yaml", Source.RESOURCE);
-    loadYaml("application-test.yml", Source.RESOURCE);
-    loadProperties("test-ebean.properties", Source.RESOURCE);
-  }
-
-  /**
-   * Load configuration defined by a <em>load.properties</em> entry in properties file.
-   */
-  private void loadViaIndirection() {
-
-    String location = loadContext.indirectLocation();
-    if (location != null) {
-      location = PropertyEval.eval(location);
-      loadWithExtensionCheck(location);
-    }
-  }
-
-  /**
-   * Load the main configuration for the given source.
-   */
-  private void loadMain(Source source) {
-    loadYaml("application.yaml", source);
-    loadYaml("application.yml", source);
-    loadProperties("application.properties", source);
-    loadProperties("ebean.properties", source);
-  }
-
-  private void loadViaSystemProperty() {
-    String fileName = System.getenv("EBEAN_PROPS_FILE");
-    if (fileName == null) {
-      fileName = System.getProperty("ebean.props.file");
-      if (fileName != null) {
-        loadWithExtensionCheck(fileName);
-      }
-    } else {
-        loadWithExtensionCheck(fileName);
-    }
-  }
-
-  void loadWithExtensionCheck(String fileName) {
-    if (fileName.endsWith("yaml") || fileName.endsWith("yml")) {
-      loadYaml(fileName, Source.FILE);
-    } else if (fileName.endsWith("properties")) {
-      loadProperties(fileName, Source.FILE);
-    } else {
-      throw new IllegalArgumentException("Expecting only yml or properties file but got [" + fileName + "]");
-    }
-  }
-
-  /**
-   * Evaluate all the configuration entries and return as properties.
-   */
-  Properties eval() {
-    return loadContext.eval();
-  }
-
-  void loadYaml(String resourcePath, Source source) {
-    if (yamlLoader != null) {
-      try {
-        try (InputStream is = resource(resourcePath, source)) {
-          yamlLoader.load(is);
-        }
-      } catch (Exception e) {
-        log.warn("Failed to read yml from:" + resourcePath, e);
-      }
-    }
-  }
-
-  void loadProperties(String resourcePath, Source source) {
-    try {
-      try (InputStream is = resource(resourcePath, source)) {
-        if (is != null) {
-          loadProperties(is);
-        }
-      }
-    } catch (Exception e) {
-      log.warn("Failed to read properties from:" + resourcePath, e);
-    }
-  }
-
-  private InputStream resource(String resourcePath, Source source) {
-    return loadContext.resource(resourcePath, source);
-  }
-
-  private void loadProperties(InputStream is) {
-
-    if (is != null) {
-      try {
-        Properties properties = new Properties();
-        properties.load(is);
-        put(properties);
-      } catch (IOException e) {
-        throw new RuntimeException("Failed to load properties?", e);
-      } finally {
-        close(is);
-      }
-    }
-  }
-
-  private void put(Properties properties) {
-    Enumeration<?> enumeration = properties.propertyNames();
-    while (enumeration.hasMoreElements()) {
-      String key = (String) enumeration.nextElement();
-      String property = properties.getProperty(key);
-      loadContext.put(key, property);
-    }
-  }
-
-  private void close(InputStream is) {
-    try {
-      is.close();
-    } catch (IOException e) {
-      log.warn("Error closing input stream for properties", e);
-    }
-  }
-}
diff --git a/src/main/java/io/ebean/config/properties/PropertiesLoader.java b/src/main/java/io/ebean/config/properties/PropertiesLoader.java
deleted file mode 100644
index a9eb27faa..000000000
--- a/src/main/java/io/ebean/config/properties/PropertiesLoader.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package io.ebean.config.properties;
-
-import java.util.Enumeration;
-import java.util.Properties;
-
-/**
- * Loads and evaluates properties and yml configuration.
- */
-public class PropertiesLoader {
-
-  private static Properties properties;
-
-  /**
-   * Provides properties by reading known locations.
-   * <p>
-   * <h3>Main configuration</h3>
-   * <p>
-   * <p>Firstly loads from main resources</p>
-   * <pre>
-   *   - application.properties
-   *   - application.yaml
-   *   - ebean.properties
-   * </pre>
-   * <p>
-   * <p>Then loads from local files</p>
-   * <pre>
-   *   - application.properties
-   *   - application.yaml
-   *   - ebean.properties
-   * </pre>
-   * <p>
-   * <p>Then loads from environment variable <em>EBEAN_PROPS_FILE</em></p>
-   * <p>Then loads from system property <em>ebean.props.file</em></p>
-   * <p>Then loads from <em>load.properties</em></p>
-   * <p>
-   * <h3>Test configuration</h3>
-   * <p>
-   * Once the main configuration is read it will try to read common test configuration.
-   * This will only be successful if the test resources are available (i.e. running tests).
-   * </p>
-   * <p>Loads from test resources</p>
-   * <pre>
-   *   - application-test.properties
-   *   - application-test.yaml
-   *   - test-ebean.properties
-   * </pre>
-   */
-  public static synchronized Properties load() {
-
-    if (properties == null) {
-      Loader loader = new Loader();
-      loader.load();
-      properties = loader.eval();
-    }
-
-    return properties;
-  }
-
-  /**
-   * Return a copy of the properties with 'eval' run on all the values.
-   * This resolves expressions like ${HOME} etc.
-   */
-  public static Properties eval(Properties properties) {
-    Properties evalCopy = new Properties();
-
-    Enumeration<?> names = properties.propertyNames();
-    while (names.hasMoreElements()) {
-      String name = (String)names.nextElement();
-      String value = PropertyEval.eval(properties.getProperty(name));
-      evalCopy.setProperty(name, value);
-    }
-    return evalCopy;
-  }
-}
diff --git a/src/main/java/io/ebean/config/properties/PropertyEval.java b/src/main/java/io/ebean/config/properties/PropertyEval.java
deleted file mode 100644
index 94f49e0e3..000000000
--- a/src/main/java/io/ebean/config/properties/PropertyEval.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package io.ebean.config.properties;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-/**
- * Helper used to evaluate expressions such as ${CATALINA_HOME}.
- * <p>
- * The expressions can contain environment variables, system properties or JNDI
- * properties. JNDI expressions take the form ${jndi:propertyName} where you
- * substitute propertyName with the name of the jndi property you wish to
- * evaluate.
- * </p>
- */
-final class PropertyEval {
-
-  /**
-   * Prefix for looking up JNDI Environment variable.
-   */
-  private static final String JAVA_COMP_ENV = "java:comp/env/";
-
-  /**
-   * Used to detect the start of an expression.
-   */
-  private static final String START = "${";
-
-  /**
-   * Used to detect the end of an expression.
-   */
-  private static final String END = "}";
-
-  /**
-   * Specify the PropertyHolder.
-   */
-  private PropertyEval() {
-  }
-
-  /**
-   * Return the property value evaluating and replacing any expressions such as
-   * ${CATALINA_HOME}.
-   */
-  static String eval(String val) {
-    if (val == null) {
-      return null;
-    }
-    int sp = val.indexOf(START);
-    if (sp > -1) {
-      int ep = val.indexOf(END, sp + 1);
-      if (ep > -1) {
-        return eval(val, sp, ep);
-      }
-    }
-    return val;
-  }
-
-  /**
-   * Convert the expression using JNDI, Environment variables, System Properties
-   * or existing an property in SystemProperties itself.
-   */
-  private static String evaluateExpression(String exp) {
-
-    if (exp.isEmpty()) {
-      return null;
-    }
-    if (isJndiExpression(exp)) {
-      // JNDI property lookup...
-      String val = getJndiProperty(exp);
-      if (val != null) {
-        return val;
-      }
-    }
-    String val = System.getProperty(exp);
-    if (val == null) {
-      val = System.getenv(exp);
-    }
-    return val;
-  }
-
-  private static String eval(String val, int sp, int ep) {
-
-    return new EvalBuffer(val, sp, ep).process();
-  }
-
-
-  private static boolean isJndiExpression(String exp) {
-    return exp.startsWith("JNDI:") || exp.startsWith("jndi:");
-  }
-
-  /**
-   * Returns null if JNDI is not setup or if the property is not found.
-   *
-   * @param key the key of the JNDI Environment property including a JNDI: prefix.
-   */
-  private static String getJndiProperty(String key) {
-
-    try {
-      // remove the JNDI: prefix
-      key = key.substring(5);
-      return (String) getJndiObject(key);
-    } catch (NamingException ex) {
-      return null;
-    }
-  }
-
-  /**
-   * Similar to getProperty but throws NamingException if JNDI is not setup or
-   * if the property is not found.
-   */
-  private static Object getJndiObject(String key) throws NamingException {
-
-    InitialContext ctx = new InitialContext();
-    return ctx.lookup(JAVA_COMP_ENV + key);
-  }
-
-
-  private static class EvalBuffer {
-
-    private final StringBuilder buf = new StringBuilder();
-    private final String original;
-    private int position;
-    private int start;
-    private int end;
-
-    private String expression;
-    private String defaultValue;
-
-    EvalBuffer(String val, int start, int ep) {
-      this.original = val;
-      this.start = start;
-      this.end = ep;
-      this.position = 0;
-      moveToStart();
-    }
-
-    void moveToStart() {
-      if (start > position) {
-        buf.append(original.substring(position, start));
-        position = start;
-      }
-    }
-
-    void parseForDefault() {
-      int colonPos = original.lastIndexOf(':', end);
-      if (colonPos > start) {
-        expression = original.substring(start + START.length(), colonPos);
-        defaultValue = original.substring(colonPos + 1, end);
-      } else {
-        expression = original.substring(start + START.length(), end);
-      }
-    }
-
-    void evaluate() {
-      String eval = evaluateExpression(expression);
-      if (eval != null) {
-        buf.append(eval);
-      } else {
-        if (defaultValue != null) {
-          buf.append(defaultValue);
-        } else {
-          buf.append(START).append(expression).append(END);
-        }
-      }
-    }
-
-    String end() {
-      if (end < original.length() - 1) {
-        buf.append(original.substring(end + 1));
-      }
-      return buf.toString();
-    }
-
-    boolean next() {
-      if (end < original.length()) {
-        int startPos = original.indexOf(START, end + 1);
-        if (startPos > -1) {
-          int endPos = original.indexOf(END, startPos + 1);
-          if (endPos > -1) {
-            if (startPos > end + 1) {
-              buf.append(original.substring(end + 1, startPos));
-            }
-            this.start = startPos;
-            this.end = endPos;
-            return true;
-          }
-        }
-      }
-      return false;
-    }
-
-    private void evalNext() {
-      parseForDefault();
-      evaluate();
-    }
-
-    String process() {
-      evalNext();
-      while (next()) {
-        evalNext();
-      }
-      return end();
-    }
-
-  }
-
-}
diff --git a/src/main/java/io/ebean/config/properties/YamlLoader.java b/src/main/java/io/ebean/config/properties/YamlLoader.java
deleted file mode 100644
index b7157810e..000000000
--- a/src/main/java/io/ebean/config/properties/YamlLoader.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package io.ebean.config.properties;
-
-import org.yaml.snakeyaml.Yaml;
-
-import java.io.InputStream;
-import java.util.Map;
-
-/**
- * Loads configuration from Yml into the load context.
- * <p>
- * Note that this ignores 'lists' so just reads 'maps' and scalar values.
- * </p>
- */
-class YamlLoader {
-
-  private final Yaml yaml = new Yaml();
-
-  private final LoadContext loadContext;
-
-  YamlLoader(LoadContext loadContext) {
-    this.loadContext = loadContext;
-  }
-
-  @SuppressWarnings("unchecked")
-  void load(InputStream is) {
-    if (is != null) {
-      for (Object map : yaml.loadAll(is)) {
-        loadMap((Map<String, Object>)map, null);
-      }
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  void loadMap(Map<String, Object> map, String path) {
-
-    for (Map.Entry<String, Object> entry : map.entrySet()) {
-      String key = entry.getKey();
-      if (path != null) {
-        key = path + "." + key;
-      }
-      Object val = entry.getValue();
-      if (val instanceof Map) {
-        loadMap((Map<String, Object>) val, key);
-      } else  {
-        addScalar(key, val);
-      }
-    }
-  }
-
-  private void addScalar(String key, Object val) {
-    if (val instanceof String) {
-      loadContext.put(key, (String) val);
-    } else if (val instanceof Number || val instanceof Boolean) {
-      loadContext.put(key, val.toString());
-    }
-  }
-
-}
diff --git a/src/test/java/io/ebean/config/PropertiesWrapperTest.java b/src/test/java/io/ebean/config/PropertiesWrapperTest.java
index 180156040..2954f1f9d 100644
--- a/src/test/java/io/ebean/config/PropertiesWrapperTest.java
+++ b/src/test/java/io/ebean/config/PropertiesWrapperTest.java
@@ -1,7 +1,7 @@
 package io.ebean.config;
 
+import io.avaje.config.Config;
 import io.ebean.annotation.Platform;
-import io.ebean.config.properties.PropertiesLoader;
 import org.junit.Test;
 
 import java.util.Properties;
@@ -11,7 +11,6 @@ import static org.junit.Assert.assertNull;
 
 public class PropertiesWrapperTest {
 
-
   @Test
   public void testGetServerName() {
 
@@ -61,7 +60,7 @@ public class PropertiesWrapperTest {
     properties.put("somePath", "${HOME}/hello");
     properties.put("someSystemProp", "/aaa/${java.io.tmpdir}/bbb");
 
-    Properties evalCopy = PropertiesLoader.eval(properties);
+    Properties evalCopy = Config.asConfiguration().eval(properties);
     PropertiesWrapper pw = new PropertiesWrapper("pref", "myserver", evalCopy, null);
 
     assertEquals(42, pw.getInt("someInt", 99));
diff --git a/src/test/java/io/ebean/config/properties/LoaderTest.java b/src/test/java/io/ebean/config/properties/LoaderTest.java
deleted file mode 100644
index 307d18089..000000000
--- a/src/test/java/io/ebean/config/properties/LoaderTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package io.ebean.config.properties;
-
-import org.junit.Test;
-
-import java.util.Properties;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-
-public class LoaderTest {
-
-  @Test
-  public void load() {
-
-    String userName = System.getProperty("user.name");
-    String userHome = System.getProperty("user.home");
-
-    Loader loader = new Loader();
-    loader.loadProperties("test-properties/application.properties", Loader.Source.RESOURCE);
-    loader.loadYaml("test-properties/application.yaml", Loader.Source.RESOURCE);
-
-    loader.loadProperties("test-properties/one.properties", Loader.Source.RESOURCE);
-    loader.loadYaml("test-properties/foo.yml", Loader.Source.RESOURCE);
-
-    Properties properties = loader.eval();
-
-    assertEquals("fromProperties", properties.getProperty("app.fromProperties"));
-    assertEquals("Two", properties.getProperty("app.two"));
-
-    assertEquals("bart", properties.getProperty("eval.withDefault"));
-    assertEquals(userName, properties.getProperty("eval.name"));
-    assertEquals(userHome + "/after", properties.getProperty("eval.home"));
-  }
-
-  @Test
-  public void loadWithExtensionCheck() {
-
-    Loader loader = new Loader();
-    loader.loadWithExtensionCheck("test-dummy.properties");
-    loader.loadWithExtensionCheck("test-dummy.yml");
-    loader.loadWithExtensionCheck("test-dummy2.yaml");
-
-    Properties properties = loader.eval();
-    assertThat(properties.getProperty("dummy.yaml.bar")).isEqualTo("baz");
-    assertThat(properties.getProperty("dummy.yml.foo")).isEqualTo("bar");
-    assertThat(properties.getProperty("dummy.properties.foo")).isEqualTo("bar");
-  }
-
-
-  @Test
-  public void loadYaml() {
-
-    Loader loader = new Loader();
-    loader.loadYaml("test-properties/foo.yml", Loader.Source.RESOURCE);
-    Properties properties = loader.eval();
-
-    assertThat(properties.getProperty("ebean.oracle.password")).isEqualTo("someDefault");
-  }
-
-  @Test
-  public void loadProperties() {
-
-    Loader loader = new Loader();
-    loader.loadProperties("test-properties/one.properties", Loader.Source.RESOURCE);
-    Properties properties = loader.eval();
-
-    assertThat(properties.getProperty("hello")).isEqualTo("there");
-    assertThat(properties.getProperty("name")).isEqualTo("Rob");
-  }
-}
diff --git a/src/test/java/io/ebean/config/properties/PropertyEvalTest.java b/src/test/java/io/ebean/config/properties/PropertyEvalTest.java
deleted file mode 100644
index ac996943b..000000000
--- a/src/test/java/io/ebean/config/properties/PropertyEvalTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package io.ebean.config.properties;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-public class PropertyEvalTest {
-
-	@Test
-	public void eval_null() {
-		assertNull(PropertyEval.eval(null));
-	}
-
-	@Test
-	public void eval_empty() {
-		assertEquals("", PropertyEval.eval(""));
-	}
-
-	@Test
-	public void eval_noExpressions() {
-		assertEquals("basic", PropertyEval.eval("basic"));
-		assertEquals("{basic}", PropertyEval.eval("{basic}"));
-	}
-
-	@Test
-	public void eval_singleExpression() {
-		System.setProperty("foo", "Hello");
-		assertEquals("Hello", PropertyEval.eval("${foo}"));
-		assertEquals("preHello", PropertyEval.eval("pre${foo}"));
-		assertEquals("HelloPost", PropertyEval.eval("${foo}Post"));
-		assertEquals("beforeHelloAfter", PropertyEval.eval("before${foo}After"));
-		System.clearProperty("foo");
-	}
-
-  @Test
-  public void eval_emptyPlaceholder() {
-    assertEquals("${}", PropertyEval.eval("${}"));
-  }
-
-	@Test
-	public void eval_singleExpression_withDefault() {
-
-		System.setProperty("foo", "Hello");
-		assertEquals("Hello", PropertyEval.eval("${foo:bart}"));
-		assertEquals("beforeHelloAfter", PropertyEval.eval("before${foo:bart}After"));
-		assertEquals("preHello", PropertyEval.eval("pre${foo:bart}"));
-		assertEquals("HelloPost", PropertyEval.eval("${foo:bart}Post"));
-
-		System.clearProperty("foo");
-		assertEquals("bart", PropertyEval.eval("${foo:bart}"));
-		assertEquals("before-bart-after", PropertyEval.eval("before-${foo:bart}-after"));
-		assertEquals("pre-bart", PropertyEval.eval("pre-${foo:bart}"));
-		assertEquals("bart-post", PropertyEval.eval("${foo:bart}-post"));
-
-	}
-
-	@Test
-	public void eval_multiExpression_withDefault() {
-
-		assertEquals("num1num2", PropertyEval.eval("${one:num1}${two:num2}"));
-		assertEquals("num1-num2", PropertyEval.eval("${one:num1}-${two:num2}"));
-		assertEquals("num1abnum2", PropertyEval.eval("${one:num1}ab${two:num2}"));
-		assertEquals("anum1bcnum2d", PropertyEval.eval("a${one:num1}bc${two:num2}d"));
-
-		System.setProperty("one", "first");
-		System.setProperty("two", "second");
-
-		assertEquals("firstsecond", PropertyEval.eval("${one:num1}${two:num2}"));
-		assertEquals("first-second", PropertyEval.eval("${one:num1}-${two:num2}"));
-		assertEquals("pre-first-second-post", PropertyEval.eval("pre-${one:num1}-${two:num2}-post"));
-		assertEquals("AfirstBCsecondD", PropertyEval.eval("A${one:num1}BC${two:num2}D"));
-
-
-		System.clearProperty("one");
-		System.clearProperty("two");
-	}
-}
diff --git a/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java b/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java
index ac737164c..77c91fcb6 100644
--- a/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java
+++ b/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java
@@ -1,5 +1,6 @@
 package org.tests.transaction;
 
+import io.avaje.config.Config;
 import io.ebean.BaseTestCase;
 import io.ebean.Database;
 import io.ebean.DatabaseFactory;
@@ -8,7 +9,6 @@ import io.ebean.Transaction;
 import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.config.DatabaseConfig;
-import io.ebean.config.properties.PropertiesLoader;
 import io.ebean.datasource.DataSourceConfig;
 import io.ebean.datasource.DataSourcePool;
 import io.ebean.datasource.pool.ConnectionPool;
@@ -30,7 +30,7 @@ public class TestAutoCommitDataSource extends BaseTestCase {
   @Test
   public void test() throws SQLException {
 
-    Properties properties = PropertiesLoader.load();
+    Properties properties = Config.asProperties();
 
     DataSourceConfig dsConfig = new DataSourceConfig();
     dsConfig.loadSettings(properties, "h2autocommit");//"pg"
diff --git a/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java b/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
index 2b5eb2ee1..65c592d5a 100644
--- a/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
+++ b/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
@@ -1,5 +1,6 @@
 package org.tests.transaction;
 
+import io.avaje.config.Config;
 import io.ebean.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Database;
@@ -10,7 +11,6 @@ import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.JsonConfig;
-import io.ebean.config.properties.PropertiesLoader;
 import io.ebean.datasource.DataSourceConfig;
 import io.ebean.datasource.DataSourcePool;
 import io.ebean.datasource.pool.ConnectionPool;
@@ -35,7 +35,7 @@ public class TestExplicitTransactionMode extends BaseTestCase {
   @Test
   public void test() throws SQLException {
 
-    Properties properties = PropertiesLoader.load();
+    Properties properties = Config.asProperties();
 
     DataSourceConfig dsConfig = new DataSourceConfig();
     dsConfig.loadSettings(properties, "h2autocommit2");