From 5c7cf1d884d3bd6fc6f65c73b8158bfbfe25611c Mon Sep 17 00:00:00 2001
From: James McAteer <james.mcateer@ukgreetings.co.uk>
Date: Fri, 19 Jun 2020 15:16:26 +0100
Subject: [PATCH 1/3] Check first for a deliberate setting in any app config
 file before reverting to properties and environment variables

---
 .../drunkendev/web/settings/AppConfig.java    | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/drunkendev/web/settings/AppConfig.java b/src/main/java/com/drunkendev/web/settings/AppConfig.java
index 742f00c..2c5a747 100644
--- a/src/main/java/com/drunkendev/web/settings/AppConfig.java
+++ b/src/main/java/com/drunkendev/web/settings/AppConfig.java
@@ -56,6 +56,7 @@ public class AppConfig implements InitializingBean {
     private final String configSystemEnv;
     private final String homeSystemProp;
     private final String homeSystemEnv;
+    private final String homeConfigProp;
 
     private Properties props;
     private final ClassLoader loader;
@@ -83,6 +84,7 @@ public AppConfig(ClassLoader loader, String appName) {
         configSystemEnv = appNameUc + "_CONFIG";
         homeSystemProp = appNameLc + ".home";
         homeSystemEnv = appNameUc + "_HOME";
+        homeConfigProp = appNameLc + ".home";
         this.loader = loader == null ? AppConfig.class.getClassLoader() : loader;
         LOG.debug("APP NAME: " + appName);
     }
@@ -136,6 +138,7 @@ public String getConfigFile() {
      * This will check int he following order for
      *
      * <ul>
+     *  <li>{@code app.home} config file property</li>
      *  <li>{@code app.home} system property</li>
      *  <li>{@code APP_HOME} environment variable</li>
      *  <li>{@code user.dir} system property</li>
@@ -151,20 +154,24 @@ public String getHomeDir() {
             return homeDir;
         }
 
-        String path = System.getProperty(homeSystemProp);
-        LOG.debug("PATH: (prop:{}) {}", homeSystemProp, path);
+        String path = getPath(homeConfigProp).normalize().toString();
+        LOG.debug("PATH: (config file:{}) {}", homeConfigProp, path);
         if (isBlank(path)) {
-            path = System.getenv(homeSystemEnv);
-            LOG.debug("PATH: (env:{}) {}", homeSystemEnv, path);
+            path = System.getProperty(homeSystemProp);
+            LOG.debug("PATH: (prop:{}) {}", homeSystemProp, path);
             if (isBlank(path)) {
-                path = System.getenv("user.dir");
-                LOG.debug("PATH: user.dir {}", path);
+                path = System.getenv(homeSystemEnv);
+                LOG.debug("PATH: (env:{}) {}", homeSystemEnv, path);
                 if (isBlank(path)) {
-                    path = System.getenv("HOME");
-                    LOG.debug("PATH: HOME {}", path);
+                    path = System.getenv("user.dir");
+                    LOG.debug("PATH: user.dir {}", path);
                     if (isBlank(path)) {
-                        path = Paths.get(".").normalize().toString();
-                        LOG.debug("PATH: {}", path);
+                        path = System.getenv("HOME");
+                        LOG.debug("PATH: HOME {}", path);
+                        if (isBlank(path)) {
+                            path = Paths.get(".").normalize().toString();
+                            LOG.debug("PATH: {}", path);
+                        }
                     }
                 }
             }

From aa5f83ca202d9f8b6e171553867e2e2dc131af56 Mon Sep 17 00:00:00 2001
From: James McAteer <james.mcateer@ukgreetings.co.uk>
Date: Wed, 24 Jun 2020 13:46:35 +0100
Subject: [PATCH 2/3] New method to get app name and tweak to database backup
 location and filename

---
 .../java/com/drunkendev/jdbc/h2/H2DBBackup.java     | 13 +++++++------
 .../java/com/drunkendev/web/settings/AppConfig.java |  4 ++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/drunkendev/jdbc/h2/H2DBBackup.java b/src/main/java/com/drunkendev/jdbc/h2/H2DBBackup.java
index b917ef7..651c450 100644
--- a/src/main/java/com/drunkendev/jdbc/h2/H2DBBackup.java
+++ b/src/main/java/com/drunkendev/jdbc/h2/H2DBBackup.java
@@ -63,21 +63,22 @@ public H2DBBackup(JdbcTemplate jt, AppConfig config) {
     }
 
     /**
-     * Backs up a h2 database to the home directory.
+     * Backs up a h2 database to a target directory.
      *
-     * Backup file will be stored as {@code ${app.home}/backup/app-db-backup-yyyy-MM-dd_hhmm.zip}
+     * Backup folder will first attempt to be set to a config attribute, if
+     * the attribute does not exist the location will default to home dir/backup.
+     * File name will be {@code ${app.name}-db-backup-yyyy-MM-dd_hhmm.zip}
      *
      * @throws  IOException
      *          If the backup file could not be created.
      */
     public void backupDatabase() throws IOException {
-        Path path = Paths.get(config.getHomeDir())
-                .resolve("backup")
+        Path path = config.getPathOrDefault("backup.folder", config.getHomePath().resolve("backup"))
                 .normalize();
         Path p = path
-                .resolve("app-db-backup-" + df.format(LocalDateTime.now()) + ".zip")
+                .resolve(config.getAppName() + "-db-backup-" + df.format(LocalDateTime.now()) + ".zip")
                 .normalize();
-        LOG.debug("Backing up database to {}", p);
+        LOG.info("Backing up database to {}", p);
         Files.createDirectories(path);
 
         long cut = LocalDateTime.now().minusDays(2).toEpochSecond(ZoneOffset.UTC);
diff --git a/src/main/java/com/drunkendev/web/settings/AppConfig.java b/src/main/java/com/drunkendev/web/settings/AppConfig.java
index 2c5a747..a30b342 100644
--- a/src/main/java/com/drunkendev/web/settings/AppConfig.java
+++ b/src/main/java/com/drunkendev/web/settings/AppConfig.java
@@ -181,6 +181,10 @@ public String getHomeDir() {
         return homeDir;
     }
 
+    public String getAppName() {
+        return appNameLc;
+    }
+
     public Path getHomePath() {
         String v = getHomeDir();
         return v == null ? null : Paths.get(v).normalize();

From 31bf6a1fb55c2fd38bb1a2af285b27695ad1ea1d Mon Sep 17 00:00:00 2001
From: James McAteer <james.mcateer@ukgreetings.co.uk>
Date: Fri, 26 Jun 2020 21:38:26 +0100
Subject: [PATCH 3/3] Changed getPath to getString as it was not working right

---
 src/main/java/com/drunkendev/web/settings/AppConfig.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/drunkendev/web/settings/AppConfig.java b/src/main/java/com/drunkendev/web/settings/AppConfig.java
index a30b342..b61af7d 100644
--- a/src/main/java/com/drunkendev/web/settings/AppConfig.java
+++ b/src/main/java/com/drunkendev/web/settings/AppConfig.java
@@ -27,10 +27,13 @@
 import java.nio.file.Paths;
 import java.util.Properties;
 import java.util.Set;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 
+import static java.util.Objects.isNull;
+
 import static org.apache.commons.lang3.BooleanUtils.toBoolean;
 import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
 import static org.apache.commons.lang3.StringUtils.defaultString;
@@ -154,7 +157,7 @@ public String getHomeDir() {
             return homeDir;
         }
 
-        String path = getPath(homeConfigProp).normalize().toString();
+        String path = getString(homeConfigProp);
         LOG.debug("PATH: (config file:{}) {}", homeConfigProp, path);
         if (isBlank(path)) {
             path = System.getProperty(homeSystemProp);