Refactor configuration

1 files changed, 0 insertions, 108 deletions

diff --git a/src/org/traccar/Config.java b/src/org/traccar/Config.java
deleted file mode 100644
index 370123ae1..000000000
--- a/src/org/traccar/Config.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright 2015 - 2017 Anton Tananaev (anton@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.InvalidPropertiesFormatException;
-import java.util.Properties;
-
-public class Config {
-
-    private final Properties properties = new Properties();
-
-    private boolean useEnvironmentVariables;
-
-    void load(String file) throws IOException {
-        try {
-            Properties mainProperties = new Properties();
-            try (InputStream inputStream = new FileInputStream(file)) {
-                mainProperties.loadFromXML(inputStream);
-            }
-
-            String defaultConfigFile = mainProperties.getProperty("config.default");
-            if (defaultConfigFile != null) {
-                try (InputStream inputStream = new FileInputStream(defaultConfigFile)) {
-                    properties.loadFromXML(inputStream);
-                }
-            }
-
-            properties.putAll(mainProperties); // override defaults
-
-            useEnvironmentVariables = Boolean.parseBoolean(System.getenv("CONFIG_USE_ENVIRONMENT_VARIABLES"))
-                    || Boolean.parseBoolean(properties.getProperty("config.useEnvironmentVariables"));
-        } catch (InvalidPropertiesFormatException e) {
-            throw new RuntimeException("Configuration file is not a valid XML document", e);
-        }
-    }
-
-    public boolean hasKey(String key) {
-        return useEnvironmentVariables && System.getenv().containsKey(getEnvironmentVariableName(key))
-                || properties.containsKey(key);
-    }
-
-    public String getString(String key) {
-        if (useEnvironmentVariables) {
-            String value = System.getenv(getEnvironmentVariableName(key));
-            if (value != null && !value.isEmpty()) {
-                return value;
-            }
-        }
-        return properties.getProperty(key);
-    }
-
-    public String getString(String key, String defaultValue) {
-        return hasKey(key) ? getString(key) : defaultValue;
-    }
-
-    public boolean getBoolean(String key) {
-        return Boolean.parseBoolean(getString(key));
-    }
-
-    public int getInteger(String key) {
-        return getInteger(key, 0);
-    }
-
-    public int getInteger(String key, int defaultValue) {
-        return hasKey(key) ? Integer.parseInt(getString(key)) : defaultValue;
-    }
-
-    public long getLong(String key) {
-        return getLong(key, 0);
-    }
-
-    public long getLong(String key, long defaultValue) {
-        return hasKey(key) ? Long.parseLong(getString(key)) : defaultValue;
-    }
-
-    public double getDouble(String key) {
-        return getDouble(key, 0.0);
-    }
-
-    public double getDouble(String key, double defaultValue) {
-        return hasKey(key) ? Double.parseDouble(getString(key)) : defaultValue;
-    }
-
-    public static String getEnvironmentVariableName(String key) {
-        return key.replaceAll("\\.", "_").replaceAll("(\\p{Lu})", "_$1").toUpperCase();
-    }
-
-    public void setString(String key, String value) {
-        properties.put(key, value);
-    }
-
-}