From d3fdfbdd22b38f446353f9ac734e9b51f62f6a2c Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Tue, 28 Mar 2017 18:47:40 +0200
Subject: [PATCH] Fixed #54 - change file type from properties to json for
server settings.properties
---
settings.properties => settings.json | 2 +-
src/de/deadlocker8/budgetmasterserver/main/Main.java | 4 ++--
src/de/deadlocker8/budgetmasterserver/main/Utils.java | 2 +-
.../resources/{settings.properties => settings.json} | 0
4 files changed, 4 insertions(+), 4 deletions(-)
rename settings.properties => settings.json (87%)
rename src/de/deadlocker8/budgetmasterserver/resources/{settings.properties => settings.json} (100%)
diff --git a/settings.properties b/settings.json
similarity index 87%
rename from settings.properties
rename to settings.json
index d2281ffa1..b60e9bf03 100644
--- a/settings.properties
+++ b/settings.json
@@ -6,5 +6,5 @@
"serverPort": 9000,
"serverSecret": "geheim",
"keystorePath": "",
- "keystorePassword": ""
+ "keystorePassword": "geheim"
}
\ No newline at end of file
diff --git a/src/de/deadlocker8/budgetmasterserver/main/Main.java b/src/de/deadlocker8/budgetmasterserver/main/Main.java
index 7db6b448d..32f139cf5 100644
--- a/src/de/deadlocker8/budgetmasterserver/main/Main.java
+++ b/src/de/deadlocker8/budgetmasterserver/main/Main.java
@@ -25,11 +25,11 @@ public class Main
Logger.error(e1);
}
- if(!Files.exists(Paths.get("settings.properties")))
+ if(!Files.exists(Paths.get("settings.json")))
{
try
{
- Files.copy(SparkServer.class.getClassLoader().getResourceAsStream("de/deadlocker8/budgetmasterserver/resources/settings.properties"), Paths.get("settings.properties"));
+ Files.copy(SparkServer.class.getClassLoader().getResourceAsStream("de/deadlocker8/budgetmasterserver/resources/settings.json"), Paths.get("settings.json"));
}
catch(IOException e)
{
diff --git a/src/de/deadlocker8/budgetmasterserver/main/Utils.java b/src/de/deadlocker8/budgetmasterserver/main/Utils.java
index 04772c127..417375ffc 100644
--- a/src/de/deadlocker8/budgetmasterserver/main/Utils.java
+++ b/src/de/deadlocker8/budgetmasterserver/main/Utils.java
@@ -14,7 +14,7 @@ public class Utils
Settings settings;
Gson gson = new Gson();
- settingsJSON = new String(Files.readAllBytes(Paths.get("settings.properties")));
+ settingsJSON = new String(Files.readAllBytes(Paths.get("settings.json")));
settings = gson.fromJson(settingsJSON, Settings.class);
return settings;
}
diff --git a/src/de/deadlocker8/budgetmasterserver/resources/settings.properties b/src/de/deadlocker8/budgetmasterserver/resources/settings.json
similarity index 100%
rename from src/de/deadlocker8/budgetmasterserver/resources/settings.properties
rename to src/de/deadlocker8/budgetmasterserver/resources/settings.json
--
GitLab