From 6acef18fe96457b40bb8d6f37836abd636bc1a48 Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Sat, 18 Feb 2017 15:55:31 +0100
Subject: [PATCH] Improved code
---
.../scala/de/tobias/playpad/server/PlayPadServer.scala | 6 ++----
.../playpad/server/project/loader/sql/PadLoader.scala | 4 ++--
.../playpad/server/project/loader/sql/PageLoader.scala | 8 ++++----
.../server/project/loader/sql/ProjectLoader.scala | 10 +++++-----
.../playpad/server/project/saver/sql/PadSaver.scala | 4 ++--
.../playpad/server/project/saver/sql/PageSaver.scala | 8 ++++----
.../server/project/saver/sql/ProjectSaver.scala | 10 +++++-----
.../playpad/server/server/project/ProjectDelete.scala | 9 +++++----
.../playpad/server/server/project/ProjectGet.scala | 4 ++--
.../playpad/server/server/project/ProjectPost.scala | 4 ++--
10 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala b/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala
index d38f169..d7a1a4e 100644
--- a/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala
+++ b/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala
@@ -2,14 +2,12 @@ package de.tobias.playpad.server
import java.nio.file.{Files, Paths}
import java.sql.DriverManager
-import java.util.UUID
import com.j256.ormlite.dao.{Dao, DaoManager}
import com.j256.ormlite.jdbc.JdbcConnectionSource
import com.j256.ormlite.table.TableUtils
import de.tobias.playpad.server.account.{Account, Session}
import de.tobias.playpad.server.plugin.Plugin
-import de.tobias.playpad.server.project.{Design, Pad, Page, Project}
import de.tobias.playpad.server.server.account._
import de.tobias.playpad.server.server.plugin.{PluginGet, PluginList}
import de.tobias.playpad.server.server.project._
@@ -33,7 +31,7 @@ object PlayPadServer extends App {
private val settings = settingsLoader.load(settingsPath)
- private val databaseUrl = "jdbc:mysql://" + settings.db_host + ":" + settings.db_port + "/" + settings.db_database + "?autoReconnect=true&wait_timeout=24"
+ private val databaseUrl = s"jdbc:mysql://${settings.db_host}:${settings.db_port}/${settings.db_database}?autoReconnect=true&wait_timeout=24"
var connectionSource = new JdbcConnectionSource(databaseUrl)
connectionSource.setUsername(settings.db_username)
connectionSource.setPassword(settings.db_password)
@@ -80,7 +78,7 @@ object PlayPadServer extends App {
// DEBUG
exception(classOf[Exception], (exception, _, _) => {
exception.printStackTrace()
- halt(500, "internal error: " + exception.getLocalizedMessage)
+ halt(500, s"internal error: ${exception.getLocalizedMessage}")
})
RouteOverview.enableRouteOverview()
diff --git a/src/main/scala/de/tobias/playpad/server/project/loader/sql/PadLoader.scala b/src/main/scala/de/tobias/playpad/server/project/loader/sql/PadLoader.scala
index aa23225..d97d547 100644
--- a/src/main/scala/de/tobias/playpad/server/project/loader/sql/PadLoader.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/loader/sql/PadLoader.scala
@@ -9,8 +9,8 @@ import de.tobias.playpad.server.project.{Pad, Page}
/**
* Created by tobias on 17.02.17.
*/
-class PadLoader {
- def load(connection: Connection, page: Page): List[Pad] = {
+class PadLoader(val connection: Connection) {
+ def load(page: Page): List[Pad] = {
val sql = s"SELECT * FROM $PAD WHERE $PAD_PAGE_REF = ?"
val preparedStatement = connection.prepareStatement(sql)
preparedStatement.setString(1, page.toString)
diff --git a/src/main/scala/de/tobias/playpad/server/project/loader/sql/PageLoader.scala b/src/main/scala/de/tobias/playpad/server/project/loader/sql/PageLoader.scala
index 526be45..7ce80fa 100644
--- a/src/main/scala/de/tobias/playpad/server/project/loader/sql/PageLoader.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/loader/sql/PageLoader.scala
@@ -9,8 +9,8 @@ import de.tobias.playpad.server.project.{Page, Project}
/**
* Created by tobias on 17.02.17.
*/
-class PageLoader {
- def load(connection: Connection, project: Project): List[Page] = {
+class PageLoader(val connection: Connection) {
+ def load(project: Project): List[Page] = {
val sql = s"SELECT * FROM $PAGE WHERE $PAGE_PROJECT_REF = ?"
val preparedStatement = connection.prepareStatement(sql)
preparedStatement.setString(1, project.id.toString)
@@ -23,8 +23,8 @@ class PageLoader {
page.id = UUID.fromString(result.getString(PAGE_ID))
page.name = result.getString(PAGE_NAME)
- val padLoader = new PadLoader()
- page.pads = padLoader.load(connection, page)
+ val padLoader = new PadLoader(connection)
+ page.pads = padLoader.load(page)
page.project = project
pages = page :: pages
diff --git a/src/main/scala/de/tobias/playpad/server/project/loader/sql/ProjectLoader.scala b/src/main/scala/de/tobias/playpad/server/project/loader/sql/ProjectLoader.scala
index f2bce4a..7504c62 100644
--- a/src/main/scala/de/tobias/playpad/server/project/loader/sql/ProjectLoader.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/loader/sql/ProjectLoader.scala
@@ -9,8 +9,8 @@ import de.tobias.playpad.server.project.utils.SqlDef._
/**
* Created by tobias on 17.02.17.
*/
-class ProjectLoader {
- def load(connection: Connection, id: UUID): List[Project] = {
+class ProjectLoader(val connection: Connection) {
+ def load(id: UUID): List[Project] = {
val sql = s"SELECT * FROM $PROJECT WHERE $PROJECT_ID = ?"
val preparedStatement = connection.prepareStatement(sql)
preparedStatement.setString(1, id.toString)
@@ -24,8 +24,8 @@ class ProjectLoader {
project.name = result.getString(PROJECT_NAME)
project.accountId = result.getInt(PROJECT_ACCOUNT_ID)
- val pageLoader = new PageLoader()
- project.pages = pageLoader.load(connection, project)
+ val pageLoader = new PageLoader(connection)
+ project.pages = pageLoader.load(project)
projects = project :: projects
}
@@ -36,7 +36,7 @@ class ProjectLoader {
projects
}
- def getAccountId(connection: Connection, id: UUID): Int = {
+ def getAccountId(id: UUID): Int = {
val sql = s"SELECT account_id FROM $PROJECT WHERE $PROJECT_ID = ?"
val preparedStatement = connection.prepareStatement(sql)
diff --git a/src/main/scala/de/tobias/playpad/server/project/saver/sql/PadSaver.scala b/src/main/scala/de/tobias/playpad/server/project/saver/sql/PadSaver.scala
index 52204c2..1e35fb0 100644
--- a/src/main/scala/de/tobias/playpad/server/project/saver/sql/PadSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/saver/sql/PadSaver.scala
@@ -9,8 +9,8 @@ import de.tobias.playpad.server.server.SqlHelper
/**
* Created by tobias on 17.02.17.
*/
-class PadSaver {
- def save(connection: Connection, pad: Pad): Unit = {
+class PadSaver(val connection: Connection) {
+ def save(pad: Pad): Unit = {
SqlHelper.insertOrUpdate(connection, PAD, pad.id, PAD_NAME, pad.name)
SqlHelper.insertOrUpdate(connection, PAD, pad.id, PAD_POSITION, pad.position)
SqlHelper.insertOrUpdate(connection, PAD, pad.id, PAD_PAGE, pad.pageIndex)
diff --git a/src/main/scala/de/tobias/playpad/server/project/saver/sql/PageSaver.scala b/src/main/scala/de/tobias/playpad/server/project/saver/sql/PageSaver.scala
index 6abdd60..ec28b85 100644
--- a/src/main/scala/de/tobias/playpad/server/project/saver/sql/PageSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/saver/sql/PageSaver.scala
@@ -9,13 +9,13 @@ import de.tobias.playpad.server.server.SqlHelper
/**
* Created by tobias on 17.02.17.
*/
-class PageSaver {
- def save(connection: Connection, page: Page): Unit = {
+class PageSaver(connection: Connection) {
+ def save(page: Page): Unit = {
SqlHelper.insertOrUpdate(connection, PAGE, page.id, PAGE_NAME, page.name)
SqlHelper.insertOrUpdate(connection, PAGE, page.id, PAGE_POSITION, page.position)
SqlHelper.insertOrUpdate(connection, PAGE, page.id, PAGE_PROJECT_REF, page.project.id)
- val padSaver = new PadSaver
- page.pads.foreach(padSaver.save(connection, _))
+ val padSaver = new PadSaver(connection)
+ page.pads.foreach(padSaver.save)
}
}
diff --git a/src/main/scala/de/tobias/playpad/server/project/saver/sql/ProjectSaver.scala b/src/main/scala/de/tobias/playpad/server/project/saver/sql/ProjectSaver.scala
index be385e4..8fcd202 100644
--- a/src/main/scala/de/tobias/playpad/server/project/saver/sql/ProjectSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/saver/sql/ProjectSaver.scala
@@ -10,15 +10,15 @@ import de.tobias.playpad.server.server.SqlHelper
/**
* Created by tobias on 17.02.17.
*/
-class ProjectSaver {
- def save(connection: Connection, project: Project): Unit = {
+class ProjectSaver(val connection: Connection) {
+ def save(project: Project): Unit = {
SqlHelper.insertOrUpdate(connection, PROJECT, project.id, PROJECT_NAME, project.name)
SqlHelper.insertOrUpdate(connection, PROJECT, project.id, PROJECT_ACCOUNT_ID, project.accountId)
- val pageSaver = new PageSaver
- project.pages.foreach(pageSaver.save(connection, _))
+ val pageSaver = new PageSaver(connection)
+ project.pages.foreach(pageSaver.save)
}
- def delete(connection: Connection, project: UUID): Unit = {
+ def delete(project: UUID): Unit = {
SqlHelper.delete(connection, PROJECT, project)
}
}
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/ProjectDelete.scala b/src/main/scala/de/tobias/playpad/server/server/project/ProjectDelete.scala
index b5a48aa..689c90d 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectDelete.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/ProjectDelete.scala
@@ -21,11 +21,12 @@ class ProjectDelete(connection: Connection, sessionDao: Dao[Session, Int]) exten
case Some(s) =>
val projectId = UUID.fromString(request.queryParams("project"))
- val projectLoader = new ProjectLoader
- val account_id = projectLoader.getAccountId(connection, projectId)
+ val projectLoader = new ProjectLoader(connection)
+ val account_id = projectLoader.getAccountId(projectId)
+
if (account_id == s.getAccount.id) {
- val projectSaver = new ProjectSaver
- projectSaver.delete(connection, projectId)
+ val projectSaver = new ProjectSaver(connection)
+ projectSaver.delete(projectId)
return new Result(Status.OK, "added project")
}
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/ProjectGet.scala b/src/main/scala/de/tobias/playpad/server/server/project/ProjectGet.scala
index 8cf5aef..71f86b8 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectGet.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/ProjectGet.scala
@@ -23,8 +23,8 @@ class ProjectGet(connection: Connection, sessionDao: Dao[Session, Int]) extends
session match {
case Some(s) =>
- val projectLoader = new ProjectLoader()
- val projects = projectLoader.load(connection, UUID.fromString(projectId))
+ val projectLoader = new ProjectLoader(connection)
+ val projects = projectLoader.load(UUID.fromString(projectId))
if (projects.size == 1) {
val project = projects.head
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/ProjectPost.scala b/src/main/scala/de/tobias/playpad/server/server/project/ProjectPost.scala
index bf2365e..93fa8a7 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectPost.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/ProjectPost.scala
@@ -27,8 +27,8 @@ class ProjectPost(connection: Connection, sessionDao: Dao[Session, Int]) extends
val project = projectLoader.load(json)
project.accountId = s.getAccount.id
- val projectSaver = new ProjectSaver
- projectSaver.save(connection, project)
+ val projectSaver = new ProjectSaver(connection)
+ projectSaver.save(project)
new Result(Status.OK, "added project")
case None =>
--
GitLab