From 8c1b94a5d635bd2ab015816a57be8406c74a5012 Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Wed, 24 Jul 2019 20:48:16 +0200
Subject: [PATCH] Cleanup code
---
.../tobias/playpad/server/PlayPadServer.scala | 24 ++++++++++---------
.../server/server/account/SessionPost.scala | 4 +---
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala b/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala
index 4abe0df..9793391 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 8531218..98b759b 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 = "") {
--
GitLab