Lesson17 DB_credentials_as_resources

Tanechka · Tanechka · commit 9b8552f6957a · 2017-10-22T19:58:20.000-07:00
diff --git a/config/resumes.properties b/config/resumes.properties
@@ -1,4 +1,6 @@
 storage.dir=C:/projects/basejava/storage
+
+# Replace by Heroku credentials
 db.url=jdbc:postgresql://localhost:5432/resumes
 db.user=postgres
 db.password=postgres
diff --git a/src/ru/javawebinar/basejava/Config.java b/src/ru/javawebinar/basejava/Config.java
@@ -4,13 +4,12 @@
 import ru.javawebinar.basejava.storage.Storage;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 
 public class Config {
-    private static final File PROPS = new File(getHomeDir(), "config\\resumes.properties");
+    private static final String PROPS = "/resumes.properties";
     private static final Config INSTANCE = new Config();
 
     private final File storageDir;
@@ -21,13 +20,13 @@ public static Config get() {
     }
 
     private Config() {
-        try (InputStream is = new FileInputStream(PROPS)) {
+        try (InputStream is = Config.class.getResourceAsStream(PROPS)) {
             Properties props = new Properties();
             props.load(is);
             storageDir = new File(props.getProperty("storage.dir"));
             storage = new SqlStorage(props.getProperty("db.url"), props.getProperty("db.user"), props.getProperty("db.password"));
         } catch (IOException e) {
-            throw new IllegalStateException("Invalid config file " + PROPS.getAbsolutePath());
+            throw new IllegalStateException("Invalid config file " + PROPS);
         }
     }
 
@@ -38,13 +37,4 @@ public File getStorageDir() {
     public Storage getStorage() {
         return storage;
     }
-
-    private static File getHomeDir() {
-        String prop = System.getProperty("homeDir");
-        File homeDir = new File(prop == null ? "." : prop);
-        if (!homeDir.isDirectory()) {
-            throw new IllegalStateException(homeDir + " is not directory");
-        }
-        return homeDir;
-    }
 }
