diff --git a/src/de/deadlocker8/budgetmasterserver/server/SparkServer.java b/src/de/deadlocker8/budgetmasterserver/server/SparkServer.java index 93e6a78c3d1684f9eb5e3214f9a43d5e052f5a41..8c76dacaf72d84006eb05fe7556b966b61b7b2fd 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/SparkServer.java +++ b/src/de/deadlocker8/budgetmasterserver/server/SparkServer.java @@ -118,7 +118,7 @@ public class SparkServer // Database get("/database", new DatabaseExport(settings, gson)); - put("/database", new DatabaseImport(handler, settings, gson)); + post("/database", new DatabaseImport(handler, gson)); delete("/database", new DatabaseDelete(handler, settings)); after((request, response) -> { diff --git a/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseDelete.java b/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseDelete.java index 24e50ef9c9519e874381dba116134ff4f9c6d820..7fb2e8496cc75220de6f4859b3b7f119f403821e 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseDelete.java +++ b/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseDelete.java @@ -34,6 +34,6 @@ public class DatabaseDelete implements Route halt(500, "Internal Server Error"); } - return "EIMER"; + return ""; } } \ No newline at end of file diff --git a/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseExport.java b/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseExport.java index 0da86d757a68face190dd8c00d9901593b61a901..7c5c2ad8a7758b1af56a40b34c3cb3604626e0e9 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseExport.java +++ b/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseExport.java @@ -36,6 +36,6 @@ public class DatabaseExport implements Route halt(500, "Internal Server Error"); } - return null; + return ""; } } \ No newline at end of file diff --git a/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseImport.java b/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseImport.java index 0ed9793002491e39c6fd0d6f35d7e6236eb98bf0..d3962efeb2c94105ef23d46f7137c99092d4a00a 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseImport.java +++ b/src/de/deadlocker8/budgetmasterserver/server/database/DatabaseImport.java @@ -2,78 +2,46 @@ package de.deadlocker8.budgetmasterserver.server.database; import static spark.Spark.halt; -import java.util.ArrayList; - -import org.joda.time.DateTime; - import com.google.gson.Gson; -import de.deadlocker8.budgetmaster.logic.NormalPayment; import de.deadlocker8.budgetmasterserver.main.Database; import de.deadlocker8.budgetmasterserver.main.DatabaseHandler; import de.deadlocker8.budgetmasterserver.main.DatabaseImporter; -import de.deadlocker8.budgetmasterserver.main.Settings; -import de.deadlocker8.budgetmasterserver.server.updater.RepeatingPaymentUpdater; import logger.Logger; import spark.Request; import spark.Response; import spark.Route; -public class DatabaseImport implements Route +public class DatabaseImport implements Route { - private DatabaseHandler handler; - private Settings settings; - private Gson gson; + private DatabaseHandler handler; + private Gson gson; - public DatabaseImport(DatabaseHandler handler, Settings settings, Gson gson) + public DatabaseImport(DatabaseHandler handler, Gson gson) { - this.handler = handler; - this.settings = settings; + this.handler = handler; this.gson = gson; } - @Override + @Override public Object handle(Request req, Response res) throws Exception - { - if(!req.queryParams().contains("delete")) - { - halt(400, "Bad Request"); - } - //TODO json input? - String databaseJSON = ""; - - - try - { - boolean delete = Boolean.parseBoolean(req.queryMap("delete").value()); - - -//TODO -// try -// { -// Database database = gson.fromJson(databaseJSON, Database.class); - -// if(delete) -// { -// handler.deleteDatabase(); -// handler = new DatabaseHandler(settings); -// } -// -// DatabaseImporter importer = new DatabaseImporter(handler); -// importer.importDatabase(database); -// return ""; -// } -// catch(Exception e) -// { -// Logger.error(e); -// halt(500, "Internal Server Error"); -// } - } - catch(Exception e) - { - halt(400, "Bad Request"); - } + { + String databaseJSON = req.body(); + + try + { + Database database = gson.fromJson(databaseJSON, Database.class); + + DatabaseImporter importer = new DatabaseImporter(handler); + importer.importDatabase(database); + return ""; + } + catch(Exception e) + { + Logger.error(e); + halt(500, "Internal Server Error"); + } - return null; + return ""; } } \ No newline at end of file