diff --git a/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala b/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala index 4abe0df47fbe365ee41b2cdaa5047a70a6f7f862..97933915fc8a441768685239c3a90d9378dc3e13 100644 --- a/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala +++ b/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala @@ -75,22 +75,24 @@ object PlayPadServer extends App { webSocket("/project", new ProjectSyncHandler(sessionDao, databaseConnection)) // Project - get("/projects/:id", new ProjectGet(databaseConnection, sessionDao), new JsonTransformer) - get("/projects", new ProjectList(databaseConnection, sessionDao), new JsonTransformer) - post("/projects", new ProjectPost(databaseConnection, sessionDao), new JsonTransformer) - delete("/projects", new ProjectDelete(databaseConnection, sessionDao), new JsonTransformer) + private val transformer = new JsonTransformer + + get("/projects/:id", new ProjectGet(databaseConnection, sessionDao), transformer) + get("/projects", new ProjectList(databaseConnection, sessionDao), transformer) + post("/projects", new ProjectPost(databaseConnection, sessionDao), transformer) + delete("/projects", new ProjectDelete(databaseConnection, sessionDao), transformer) // Plugins - get("/plugins/:id", new PluginGet(pluginDao), new JsonTransformer) - get("/plugins", new PluginList(pluginDao), new JsonTransformer) + get("/plugins/:id", new PluginGet(pluginDao), transformer) + get("/plugins", new PluginList(pluginDao), transformer) // Account - post("/accounts", new AccountPost(accountDao), new JsonTransformer) - put("/accounts", new AccountPut(accountDao), new JsonTransformer) + post("/accounts", new AccountPost(accountDao), transformer) + put("/accounts", new AccountPut(accountDao), transformer) - post("/sessions", new SessionPost(accountDao), new JsonTransformer) - delete("/sessions", new SessionDelete(accountDao), new JsonTransformer) - get("/sessions", new SessionGet(accountDao), new JsonTransformer) + post("/sessions", new SessionPost(accountDao), transformer) + delete("/sessions", new SessionDelete(accountDao), transformer) + get("/sessions", new SessionGet(accountDao), transformer) SettingsHandler.saver.save(settings, settingsPath) diff --git a/src/main/scala/de/tobias/playpad/server/server/account/SessionPost.scala b/src/main/scala/de/tobias/playpad/server/server/account/SessionPost.scala index 8531218a563c40daed979c8fb9876d3af129bf0d..98b759bab1b962076ca6ecc6f7e9109b23faadc3 100644 --- a/src/main/scala/de/tobias/playpad/server/server/account/SessionPost.scala +++ b/src/main/scala/de/tobias/playpad/server/server/account/SessionPost.scala @@ -33,9 +33,7 @@ class SessionPost(accountDao: Dao[Account, Int]) extends Route { } } - private class SessionPostResult { - var status: String = _ - var message: String = _ + private class SessionPostResult extends Result { var key: String = _ def this(status: Status.Value, key: String, message: String = "") {