Skip to content
Snippets Groups Projects
Commit d3fdfbdd authored by Robert Goldmann's avatar Robert Goldmann
Browse files

Fixed #54 - change file type from properties to json for server settings.properties

parent 933bb339
No related branches found
No related tags found
1 merge request!58merge new_database_structure into master
...@@ -6,5 +6,5 @@ ...@@ -6,5 +6,5 @@
"serverPort": 9000, "serverPort": 9000,
"serverSecret": "geheim", "serverSecret": "geheim",
"keystorePath": "", "keystorePath": "",
"keystorePassword": "" "keystorePassword": "geheim"
} }
\ No newline at end of file
...@@ -25,11 +25,11 @@ public class Main ...@@ -25,11 +25,11 @@ public class Main
Logger.error(e1); Logger.error(e1);
} }
if(!Files.exists(Paths.get("settings.properties"))) if(!Files.exists(Paths.get("settings.json")))
{ {
try 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) catch(IOException e)
{ {
......
...@@ -14,7 +14,7 @@ public class Utils ...@@ -14,7 +14,7 @@ public class Utils
Settings settings; Settings settings;
Gson gson = new Gson(); 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); settings = gson.fromJson(settingsJSON, Settings.class);
return settings; return settings;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment