diff --git a/src/main/java/de/tobias/playpad/server/json/JsonCollection.java b/src/main/java/de/tobias/playpad/server/json/JsonCollection.java
index e6e8dcc40c044f0538aa6e575685d8815d5aea56..bde150171834fd9782a2f382b2fecace3f47d2aa 100644
--- a/src/main/java/de/tobias/playpad/server/json/JsonCollection.java
+++ b/src/main/java/de/tobias/playpad/server/json/JsonCollection.java
@@ -5,7 +5,8 @@ import java.lang.annotation.*;
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
@Documented
-public @interface JsonCollection {
+public @interface JsonCollection
+{
/**
* Name of the field for the json.
diff --git a/src/main/java/de/tobias/playpad/server/json/JsonName.java b/src/main/java/de/tobias/playpad/server/json/JsonName.java
index 464aaf3d34f80d8717c07b7c2baaddece0819a85..67bf30c6dc3c12de575df18cbe4a48b91155ac99 100644
--- a/src/main/java/de/tobias/playpad/server/json/JsonName.java
+++ b/src/main/java/de/tobias/playpad/server/json/JsonName.java
@@ -5,7 +5,8 @@ import java.lang.annotation.*;
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
@Documented
-public @interface JsonName {
+public @interface JsonName
+{
/**
* Name of the field for the json.
diff --git a/src/main/java/de/tobias/playpad/server/json/JsonObj.java b/src/main/java/de/tobias/playpad/server/json/JsonObj.java
index 5f49aedaf0781182d60e28bdebab4e7bbd9db25d..f32e0555f9b3c6ee49674a394d7ceef059e472f1 100644
--- a/src/main/java/de/tobias/playpad/server/json/JsonObj.java
+++ b/src/main/java/de/tobias/playpad/server/json/JsonObj.java
@@ -5,7 +5,8 @@ import java.lang.annotation.*;
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
@Documented
-public @interface JsonObj {
+public @interface JsonObj
+{
/**
* Name of the field for the json.
diff --git a/src/main/java/de/tobias/playpad/server/json/JsonParent.java b/src/main/java/de/tobias/playpad/server/json/JsonParent.java
index d01a6491ba6c2b74c63c80c1a1360ee7804583c0..51819ef0b41b05bf4626c3ce36b618b9ae80ec46 100644
--- a/src/main/java/de/tobias/playpad/server/json/JsonParent.java
+++ b/src/main/java/de/tobias/playpad/server/json/JsonParent.java
@@ -5,5 +5,6 @@ import java.lang.annotation.*;
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
@Documented
-public @interface JsonParent {
+public @interface JsonParent
+{
}
diff --git a/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala b/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala
index de3d8fcee038f51128e07f1ac24671c90c097a93..7ccf1bd7570d953e32ea4d4671b63c7c0e4abc60 100644
--- a/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala
+++ b/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala
@@ -18,8 +18,8 @@ import de.tobias.playpad.server.transformer.JsonTransformer
import spark.Spark._
/**
- * Created by tobias on 29.01.17.
- */
+ * Created by tobias on 29.01.17.
+ */
object PlayPadServer extends App {
// Load Config
diff --git a/src/main/scala/de/tobias/playpad/server/account/Account.scala b/src/main/scala/de/tobias/playpad/server/account/Account.scala
index f1cca086229c93c5aa80f51b8615a7dabd695917..a12592ac9465cc13004fc456eb962402ffc5a4a7 100644
--- a/src/main/scala/de/tobias/playpad/server/account/Account.scala
+++ b/src/main/scala/de/tobias/playpad/server/account/Account.scala
@@ -5,13 +5,13 @@ import com.j256.ormlite.field.{DatabaseField, ForeignCollectionField}
import com.j256.ormlite.table.DatabaseTable
/**
- * Created by tobias on 15.02.17.
- */
+ * Created by tobias on 15.02.17.
+ */
@DatabaseTable(tableName = "Account") class Account() {
@DatabaseField(generatedId = true) val id: Int = 0
@DatabaseField(unique = true) var username: String = _ // Mail Address
- @DatabaseField() var password: String = _
+ @DatabaseField var password: String = _
@ForeignCollectionField var sessions: ForeignCollection[Session] = _
def this(username: String, password: String) {
diff --git a/src/main/scala/de/tobias/playpad/server/account/Session.scala b/src/main/scala/de/tobias/playpad/server/account/Session.scala
index 80b46d20ce307c1101d7dfd5188b115631752282..8fa36fb2284fd22b9049e127c52c69cc1ead828e 100644
--- a/src/main/scala/de/tobias/playpad/server/account/Session.scala
+++ b/src/main/scala/de/tobias/playpad/server/account/Session.scala
@@ -9,8 +9,8 @@ import com.j256.ormlite.table.DatabaseTable
import scala.util.Random
/**
- * Created by tobias on 15.02.17.
- */
+ * Created by tobias on 15.02.17.
+ */
@DatabaseTable(tableName = "Session") class Session() {
@DatabaseField(generatedId = true) private val id: Int = 0
@@ -26,6 +26,7 @@ import scala.util.Random
}
def getId: Int = id
+
def getAccount: Account = account
@@ -49,6 +50,7 @@ object Session {
private val length = 100
val alpha = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+
def generateKey(): String = (1 to length).map(_ => alpha(Random.nextInt.abs % alpha.length())).mkString
def getSession(sessionKey: String, sessionDao: Dao[Session, Int]): Option[Session] = {
diff --git a/src/main/scala/de/tobias/playpad/server/json/DurationSerializerHandler.scala b/src/main/scala/de/tobias/playpad/server/json/DurationSerializerHandler.scala
index 29689b9c5da5fe2bb75c8c4640f751a7f01c22d6..8b10f50166495b31d9dab68e4b5e6bf15eb67c5c 100644
--- a/src/main/scala/de/tobias/playpad/server/json/DurationSerializerHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/json/DurationSerializerHandler.scala
@@ -1,8 +1,7 @@
package de.tobias.playpad.server.json
-import javafx.util.Duration
-
import com.google.gson.{JsonElement, JsonPrimitive}
+import javafx.util.Duration
class DurationSerializerHandler extends SerializerHandler {
override def serialize(value: Any): JsonPrimitive = value match {
diff --git a/src/main/scala/de/tobias/playpad/server/logger/LogFilter.scala b/src/main/scala/de/tobias/playpad/server/logger/LogFilter.scala
index 057af1b9095882ca0fcc07b62fd9333a15f8d61f..2454be66d65cba352ce26a2c80c07ff6f2e42e15 100644
--- a/src/main/scala/de/tobias/playpad/server/logger/LogFilter.scala
+++ b/src/main/scala/de/tobias/playpad/server/logger/LogFilter.scala
@@ -5,8 +5,8 @@ import ch.qos.logback.core.filter.Filter
import ch.qos.logback.core.spi.FilterReply
/**
- * Created by tobias on 26.02.17.
- */
+ * Created by tobias on 26.02.17.
+ */
class LogFilter extends Filter[ILoggingEvent] {
override def decide(e: ILoggingEvent): FilterReply = {
if (e.getLoggerName.contains("com.j256.ormlite.table.TableUtils")) {
diff --git a/src/main/scala/de/tobias/playpad/server/plugin/Plugin.scala b/src/main/scala/de/tobias/playpad/server/plugin/Plugin.scala
index 58ddd714cb5ec576293ef488231151dd1ccf3dbb..e08b431ab46441b8bfabf7d17bd756c32cb5b6a2 100644
--- a/src/main/scala/de/tobias/playpad/server/plugin/Plugin.scala
+++ b/src/main/scala/de/tobias/playpad/server/plugin/Plugin.scala
@@ -4,8 +4,8 @@ import com.j256.ormlite.field.DatabaseField
import com.j256.ormlite.table.DatabaseTable
/**
- * Created by tobias on 31.01.17.
- */
+ * Created by tobias on 31.01.17.
+ */
@DatabaseTable(tableName = "Plugin") class Plugin() {
@DatabaseField(generatedId = true) private val id: Int = 0
@DatabaseField var name: String = _
diff --git a/src/main/scala/de/tobias/playpad/server/project/Design.scala b/src/main/scala/de/tobias/playpad/server/project/Design.scala
index c3b664433895609fe274f0e7ea0b602685ead683..6f372cdeed5c23fca4f805be7c8a586f56fa6384 100644
--- a/src/main/scala/de/tobias/playpad/server/project/Design.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/Design.scala
@@ -5,8 +5,8 @@ import java.util.UUID
import de.tobias.playpad.server.json.{JsonName, JsonParent, UUIDSerializerHandler}
/**
- * Created by tobias on 23.02.17.
- */
+ * Created by tobias on 23.02.17.
+ */
class Design {
@JsonName(value = "id", handler = classOf[UUIDSerializerHandler])
diff --git a/src/main/scala/de/tobias/playpad/server/project/Pad.scala b/src/main/scala/de/tobias/playpad/server/project/Pad.scala
index 490b58bc793c8d833bf975054d353542a5e91fb8..555bacb059a33f9562e96602c13923668a72f63c 100644
--- a/src/main/scala/de/tobias/playpad/server/project/Pad.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/Pad.scala
@@ -7,8 +7,8 @@ import de.tobias.playpad.server.project.settings.PadSettings
import de.tobias.playpad.server.sql.{ColumnName, ForeignKey, Id, Table}
/**
- * Created by tobias on 17.02.17.
- */
+ * Created by tobias on 17.02.17.
+ */
@Table("Pad")
class Pad() {
diff --git a/src/main/scala/de/tobias/playpad/server/project/Page.scala b/src/main/scala/de/tobias/playpad/server/project/Page.scala
index fcfa6eec8c8d0c0e7848a437abe644f607d1ac34..fb9aeacac6f9d288811240c3c648ddf6789e8668 100644
--- a/src/main/scala/de/tobias/playpad/server/project/Page.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/Page.scala
@@ -5,8 +5,8 @@ import java.util.UUID
import de.tobias.playpad.server.json._
/**
- * Created by tobias on 17.02.17.
- */
+ * Created by tobias on 17.02.17.
+ */
class Page {
@JsonName(value = "id", handler = classOf[UUIDSerializerHandler])
diff --git a/src/main/scala/de/tobias/playpad/server/project/Path.scala b/src/main/scala/de/tobias/playpad/server/project/Path.scala
index 467de1700165e619e6fe73bf4b526121cb476d67..4aaca1e070fca3e7cd8050d14e453e759cf95ecb 100644
--- a/src/main/scala/de/tobias/playpad/server/project/Path.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/Path.scala
@@ -5,8 +5,8 @@ import java.util.UUID
import de.tobias.playpad.server.json.{JsonName, JsonParent, UUIDSerializerHandler}
/**
- * Created by tobias on 20.02.17.
- */
+ * Created by tobias on 20.02.17.
+ */
class Path {
@JsonName(value = "id", handler = classOf[UUIDSerializerHandler])
diff --git a/src/main/scala/de/tobias/playpad/server/project/Project.scala b/src/main/scala/de/tobias/playpad/server/project/Project.scala
index fc28a9806b76db7e3a1074543801f275c396211c..e7fde48bfc0953215248a3788084cb2578685fd9 100644
--- a/src/main/scala/de/tobias/playpad/server/project/Project.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/Project.scala
@@ -5,8 +5,8 @@ import java.util.UUID
import de.tobias.playpad.server.json.{JsonCollection, JsonName, UUIDSerializerHandler}
/**
- * Created by tobias on 17.02.17.
- */
+ * Created by tobias on 17.02.17.
+ */
class Project {
@JsonName(value = "id", handler = classOf[UUIDSerializerHandler])
diff --git a/src/main/scala/de/tobias/playpad/server/project/loader/sql/DesignLoader.scala b/src/main/scala/de/tobias/playpad/server/project/loader/sql/DesignLoader.scala
index 96b503f0801804e1203b092c4237f126dc1be456..20872ccc0e2a5b7f6568473da5d9eddd6ca9bbb6 100644
--- a/src/main/scala/de/tobias/playpad/server/project/loader/sql/DesignLoader.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/loader/sql/DesignLoader.scala
@@ -7,8 +7,8 @@ import de.tobias.playpad.server.project.utils.SqlDef._
import de.tobias.playpad.server.project.{Design, Pad}
/**
- * Created by tobias on 23.02.17.
- */
+ * Created by tobias on 23.02.17.
+ */
class DesignLoader(val connection: Connection) {
def load(pad: Pad): Design = {
val sql = s"SELECT * FROM $DESIGN WHERE $DESIGN_PAD_REF = ?"
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 aabfb7ad4a53480bddb0adfca450195ca4eadcfa..243eef24f4bd478baaa2d1b057d4c11b4a9200a6 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
@@ -6,9 +6,10 @@ import java.util.UUID
import de.tobias.playpad.server.project.utils.SqlDef._
import de.tobias.playpad.server.project.{Pad, Page}
import de.tobias.playpad.server.sql.SqlSerializer
+
/**
- * Created by tobias on 17.02.17.
- */
+ * Created by tobias on 17.02.17.
+ */
class PadLoader(val connection: Connection) {
def load(page: Page): List[Pad] = {
val sql = s"SELECT * FROM $PAD WHERE $PAD_PAGE_REF = ?"
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 7ce80fa0e5aee425ae4fff4e4d85da8504940c73..2dab58e0bce4f03b029edf3e1e77675cf7d032aa 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
@@ -7,8 +7,8 @@ import de.tobias.playpad.server.project.utils.SqlDef._
import de.tobias.playpad.server.project.{Page, Project}
/**
- * Created by tobias on 17.02.17.
- */
+ * Created by tobias on 17.02.17.
+ */
class PageLoader(val connection: Connection) {
def load(project: Project): List[Page] = {
val sql = s"SELECT * FROM $PAGE WHERE $PAGE_PROJECT_REF = ?"
diff --git a/src/main/scala/de/tobias/playpad/server/project/loader/sql/PathLoader.scala b/src/main/scala/de/tobias/playpad/server/project/loader/sql/PathLoader.scala
index cfc1625095b5cb4fe2adb4b9a8ddc166df6d5bae..fd1278432f9432952e1db1a97d74e5b58f9e70aa 100644
--- a/src/main/scala/de/tobias/playpad/server/project/loader/sql/PathLoader.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/loader/sql/PathLoader.scala
@@ -7,8 +7,8 @@ import de.tobias.playpad.server.project.utils.SqlDef._
import de.tobias.playpad.server.project.{Pad, Path}
/**
- * Created by tobias on 20.02.17.
- */
+ * Created by tobias on 20.02.17.
+ */
class PathLoader(val connection: Connection) {
def load(pad: Pad): List[Path] = {
val sql = s"SELECT * FROM $PATH WHERE $PATH_PAD_REF = ?"
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 47753991d6090ee0c51f6a359818cf4724ed1e6c..920914a7488b7840cdaf078f95aa4308102a94fb 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
@@ -7,8 +7,8 @@ import de.tobias.playpad.server.project.Project
import de.tobias.playpad.server.project.utils.SqlDef._
/**
- * Created by tobias on 17.02.17.
- */
+ * Created by tobias on 17.02.17.
+ */
class ProjectLoader(val connection: Connection) {
def load(id: UUID): List[Project] = {
val sql = s"SELECT * FROM $PROJECT WHERE $PROJECT_ID = ?"
diff --git a/src/main/scala/de/tobias/playpad/server/project/saver/sql/DesignSaver.scala b/src/main/scala/de/tobias/playpad/server/project/saver/sql/DesignSaver.scala
index 3f465bb20dee4d9b5f9983ccaa57bb658c3be06d..e23db0b4bc91974d0b44334acfbf203f35930d57 100644
--- a/src/main/scala/de/tobias/playpad/server/project/saver/sql/DesignSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/saver/sql/DesignSaver.scala
@@ -7,8 +7,8 @@ import de.tobias.playpad.server.project.utils.SqlDef._
import de.tobias.playpad.server.server.SqlHelper
/**
- * Created by tobias on 23.02.17.
- */
+ * Created by tobias on 23.02.17.
+ */
class DesignSaver(val connection: Connection) {
def save(design: Design): Unit = {
SqlHelper.insertOrUpdate(connection, DESIGN, design.id, DESIGN_BACKGROUND_COLOR, design.backgroundColor)
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 1bba34233e1464d025a39848ab853745bcc6910f..aea6cf82aefcd7ebe76fa4d06e9a20e068145963 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
@@ -7,8 +7,8 @@ import de.tobias.playpad.server.project.utils.SqlDef._
import de.tobias.playpad.server.server.SqlHelper
/**
- * Created by tobias on 17.02.17.
- */
+ * Created by tobias on 17.02.17.
+ */
class PadSaver(val connection: Connection) {
def save(pad: Pad): Unit = {
SqlHelper.insertOrUpdate(connection, PAD, pad.id, PAD_NAME, pad.name)
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 ec28b8501dd38410456332e94a55092b45a4630a..6e88cda1d0ccaab58dffdf156e5be039c39bd96f 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
@@ -7,8 +7,8 @@ import de.tobias.playpad.server.project.utils.SqlDef._
import de.tobias.playpad.server.server.SqlHelper
/**
- * Created by tobias on 17.02.17.
- */
+ * Created by tobias on 17.02.17.
+ */
class PageSaver(connection: Connection) {
def save(page: Page): Unit = {
SqlHelper.insertOrUpdate(connection, PAGE, page.id, PAGE_NAME, page.name)
diff --git a/src/main/scala/de/tobias/playpad/server/project/saver/sql/PathSaver.scala b/src/main/scala/de/tobias/playpad/server/project/saver/sql/PathSaver.scala
index ed0e374f339eedb9e307cb371c8113db269dbc42..c7f209222ebd19216e6d1d79351997140883cd72 100644
--- a/src/main/scala/de/tobias/playpad/server/project/saver/sql/PathSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/saver/sql/PathSaver.scala
@@ -7,8 +7,8 @@ import de.tobias.playpad.server.project.utils.SqlDef._
import de.tobias.playpad.server.server.SqlHelper
/**
- * Created by tobias on 20.02.17.
- */
+ * Created by tobias on 20.02.17.
+ */
class PathSaver(val connection: Connection) {
def save(path: Path): Unit = {
SqlHelper.insertOrUpdate(connection, PATH, path.id, PATH_PAD_REF, path.pad.id)
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 8fcd2027e2769b4224bcd43b9aabcec3b552c17e..d72dbbe15a2a11c4fd0e242c22f540cbe017efbf 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
@@ -8,8 +8,8 @@ import de.tobias.playpad.server.project.utils.SqlDef._
import de.tobias.playpad.server.server.SqlHelper
/**
- * Created by tobias on 17.02.17.
- */
+ * Created by tobias on 17.02.17.
+ */
class ProjectSaver(val connection: Connection) {
def save(project: Project): Unit = {
SqlHelper.insertOrUpdate(connection, PROJECT, project.id, PROJECT_NAME, project.name)
@@ -18,7 +18,8 @@ class ProjectSaver(val connection: Connection) {
val pageSaver = new PageSaver(connection)
project.pages.foreach(pageSaver.save)
}
- def delete(project: UUID): Unit = {
+
+ def delete(project: UUID): Unit = {
SqlHelper.delete(connection, PROJECT, project)
}
}
diff --git a/src/main/scala/de/tobias/playpad/server/project/settings/Fade.scala b/src/main/scala/de/tobias/playpad/server/project/settings/Fade.scala
index c1816f1f3fdb3269ec4d62de3a11a48a961cfe0c..2aa834fbc44ee06e3d3ea786722c26fee9e48e4b 100644
--- a/src/main/scala/de/tobias/playpad/server/project/settings/Fade.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/settings/Fade.scala
@@ -1,9 +1,9 @@
package de.tobias.playpad.server.project.settings
import java.util.UUID
-import javafx.util.Duration
import de.tobias.playpad.server.json._
+import javafx.util.Duration
class Fade {
diff --git a/src/main/scala/de/tobias/playpad/server/project/settings/PadSettings.scala b/src/main/scala/de/tobias/playpad/server/project/settings/PadSettings.scala
index 45d3f973672614d7dfc32f6e91a83a27cbffcf7f..f6564b58d9d707bf748c031594e754bb9078f869 100644
--- a/src/main/scala/de/tobias/playpad/server/project/settings/PadSettings.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/settings/PadSettings.scala
@@ -1,10 +1,10 @@
package de.tobias.playpad.server.project.settings
import java.util.UUID
-import javafx.util.Duration
import de.tobias.playpad.server.json._
import de.tobias.playpad.server.project.{Design, Pad}
+import javafx.util.Duration
class PadSettings {
diff --git a/src/main/scala/de/tobias/playpad/server/project/utils/JsonDef.scala b/src/main/scala/de/tobias/playpad/server/project/utils/JsonDef.scala
index dfae49498d199b76bc7f46725834903e79725730..6cf62d4766861a699f5a252345afe843893ac5c3 100644
--- a/src/main/scala/de/tobias/playpad/server/project/utils/JsonDef.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/utils/JsonDef.scala
@@ -1,8 +1,8 @@
package de.tobias.playpad.server.project.utils
/**
- * Created by tobias on 17.02.17.
- */
+ * Created by tobias on 17.02.17.
+ */
object JsonDef {
val PROJECT_ID = "id"
diff --git a/src/main/scala/de/tobias/playpad/server/project/utils/SqlDef.scala b/src/main/scala/de/tobias/playpad/server/project/utils/SqlDef.scala
index ba527fe6f318720971f48830d239f2f841f84503..bf19db595868a141bbac07be78229729ae00af6c 100644
--- a/src/main/scala/de/tobias/playpad/server/project/utils/SqlDef.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/utils/SqlDef.scala
@@ -1,8 +1,8 @@
package de.tobias.playpad.server.project.utils
/**
- * Created by tobias on 17.02.17.
- */
+ * Created by tobias on 17.02.17.
+ */
object SqlDef {
val PROJECT = "Project"
diff --git a/src/main/scala/de/tobias/playpad/server/server/Result.scala b/src/main/scala/de/tobias/playpad/server/server/Result.scala
index 83933be35b145b612cca950dc2c2877a16c6d3df..0d3a207672cba3165dd98cd25eddf17bf4ce3a3f 100644
--- a/src/main/scala/de/tobias/playpad/server/server/Result.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/Result.scala
@@ -1,8 +1,8 @@
package de.tobias.playpad.server.server
/**
- * Created by tobias on 16.02.17.
- */
+ * Created by tobias on 16.02.17.
+ */
class Result {
var status: String = _
diff --git a/src/main/scala/de/tobias/playpad/server/server/SqlHelper.scala b/src/main/scala/de/tobias/playpad/server/server/SqlHelper.scala
index f306ae6d2c166e243d392ffb1c3082803921b2f9..6a397c4e53a084bd51b2466f53efe96608f666ab 100644
--- a/src/main/scala/de/tobias/playpad/server/server/SqlHelper.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/SqlHelper.scala
@@ -5,8 +5,8 @@ import java.sql.{Connection, PreparedStatement}
import java.util.UUID
/**
- * Created by tobias on 17.02.17.
- */
+ * Created by tobias on 17.02.17.
+ */
object SqlHelper {
def insertOrUpdate[T](connection: Connection, table: String, idValue: Int, field: String, value: T): Unit = {
diff --git a/src/main/scala/de/tobias/playpad/server/server/Status.scala b/src/main/scala/de/tobias/playpad/server/server/Status.scala
index 2a44ddff8bfb2e24b0f8a5712029cab42681645e..3e755093ff970f2bbb904fd7a433b1935a9e44c6 100644
--- a/src/main/scala/de/tobias/playpad/server/server/Status.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/Status.scala
@@ -1,8 +1,8 @@
package de.tobias.playpad.server.server
/**
- * Created by tobias on 16.02.17.
- */
+ * Created by tobias on 16.02.17.
+ */
object Status extends Enumeration {
val OK, ERROR = Value
}
diff --git a/src/main/scala/de/tobias/playpad/server/server/account/AccountPost.scala b/src/main/scala/de/tobias/playpad/server/server/account/AccountPost.scala
index 53f12929f0e461deec5ca2a4ccd15e4ecf6a9776..1334f045eb65207f198269cbd64e2a2cd554a8a4 100644
--- a/src/main/scala/de/tobias/playpad/server/server/account/AccountPost.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/account/AccountPost.scala
@@ -8,8 +8,8 @@ import de.tobias.playpad.server.server.{Result, Status}
import spark.{Request, Response, Route}
/**
- * Created by tobias on 15.02.17.
- */
+ * Created by tobias on 15.02.17.
+ */
class AccountPost(accountDao: Dao[Account, Int]) extends Route {
override def handle(request: Request, response: Response): AnyRef = {
diff --git a/src/main/scala/de/tobias/playpad/server/server/account/AccountPut.scala b/src/main/scala/de/tobias/playpad/server/server/account/AccountPut.scala
index 43fa68c03d602f654be461f0bd6fd5e2b7d37f7b..92658be25fcae617562c790378e585a4534e580d 100644
--- a/src/main/scala/de/tobias/playpad/server/server/account/AccountPut.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/account/AccountPut.scala
@@ -8,8 +8,8 @@ import de.tobias.playpad.server.server.{Result, Status}
import spark.{Request, Response, Route}
/**
- * Created by tobias on 15.02.17.
- */
+ * Created by tobias on 15.02.17.
+ */
class AccountPut(accountDao: Dao[Account, Int]) extends Route {
override def handle(request: Request, response: Response): AnyRef = {
diff --git a/src/main/scala/de/tobias/playpad/server/server/account/SessionDelete.scala b/src/main/scala/de/tobias/playpad/server/server/account/SessionDelete.scala
index 644e668d2bd38deaaafecfc69b4aee19c3ad1449..e0d5c7b4055d4646c451cba41accfd44c30820fb 100644
--- a/src/main/scala/de/tobias/playpad/server/server/account/SessionDelete.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/account/SessionDelete.scala
@@ -6,8 +6,8 @@ import de.tobias.playpad.server.server.{Result, Status}
import spark.{Request, Response, Route}
/**
- * Created by tobias on 15.02.17.
- */
+ * Created by tobias on 15.02.17.
+ */
class SessionDelete(accountDao: Dao[Account, Int]) extends Route {
override def handle(request: Request, response: Response): AnyRef = {
diff --git a/src/main/scala/de/tobias/playpad/server/server/account/SessionGet.scala b/src/main/scala/de/tobias/playpad/server/server/account/SessionGet.scala
index 9382f46226b3b3bc9d661144c444de059ed805ab..d9f0a24ad98ad57e850b6194e0e93f015cf76241 100644
--- a/src/main/scala/de/tobias/playpad/server/server/account/SessionGet.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/account/SessionGet.scala
@@ -7,8 +7,8 @@ import de.tobias.playpad.server.server.{Result, Status}
import spark.{Request, Response, Route}
/**
- * Created by tobias on 15.02.17.
- */
+ * Created by tobias on 15.02.17.
+ */
class SessionGet(accountDao: Dao[Account, Int]) extends Route {
override def handle(request: Request, response: Response): AnyRef = {
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 7ae39fc3f926db37c98793e13964bb2a18fc580c..8531218a563c40daed979c8fb9876d3af129bf0d 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
@@ -6,8 +6,8 @@ import de.tobias.playpad.server.server.{Result, Status}
import spark.{Request, Response, Route}
/**
- * Created by tobias on 15.02.17.
- */
+ * Created by tobias on 15.02.17.
+ */
class SessionPost(accountDao: Dao[Account, Int]) extends Route {
override def handle(request: Request, response: Response): AnyRef = {
diff --git a/src/main/scala/de/tobias/playpad/server/server/plugin/PluginGet.scala b/src/main/scala/de/tobias/playpad/server/server/plugin/PluginGet.scala
index 5fb030f9728343fc81e9ffa735c4ef461ed80778..6f528056bf15955dc22650125611c317e412066f 100644
--- a/src/main/scala/de/tobias/playpad/server/server/plugin/PluginGet.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/plugin/PluginGet.scala
@@ -7,8 +7,8 @@ import de.tobias.playpad.server.server.{Result, Status}
import spark.{Request, Response, Route}
/**
- * Created by tobias on 05.02.17.
- */
+ * Created by tobias on 05.02.17.
+ */
class PluginGet(dao: Dao[Plugin, Int]) extends Route {
val gson = new Gson()
diff --git a/src/main/scala/de/tobias/playpad/server/server/plugin/PluginList.scala b/src/main/scala/de/tobias/playpad/server/server/plugin/PluginList.scala
index 50c91a836517eef8670cc928a40cfb15d093e696..54dce56a764e40a8d8470e19620391593405cf11 100644
--- a/src/main/scala/de/tobias/playpad/server/server/plugin/PluginList.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/plugin/PluginList.scala
@@ -6,8 +6,8 @@ import de.tobias.playpad.server.plugin.Plugin
import spark.{Request, Response, Route}
/**
- * Created by tobias on 05.02.17.
- */
+ * Created by tobias on 05.02.17.
+ */
class PluginList(val dao: Dao[Plugin, Int]) extends Route {
val gson = new Gson()
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 689c90d26dd8ef7b9a02b50caca19b21fb1c233a..7a5d4739ff5799ef9b951c5db05934a4ba1db773 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
@@ -11,8 +11,8 @@ import de.tobias.playpad.server.server.{Result, Status}
import spark.{Request, Response, Route}
/**
- * Created by tobias on 17.02.17.
- */
+ * Created by tobias on 17.02.17.
+ */
class ProjectDelete(connection: Connection, sessionDao: Dao[Session, Int]) extends Route {
override def handle(request: Request, response: Response): AnyRef = {
val sessionKey = request.queryParams("session")
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 f11f171ca6367d3ed058f7efe38e29eb8bf63aa4..0c14a84f2791581bdf8165ab8084e60896bc3782 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
@@ -11,8 +11,8 @@ import de.tobias.playpad.server.server.{Result, Status}
import spark.{Request, Response, Route}
/**
- * Created by tobias on 17.02.17.
- */
+ * Created by tobias on 17.02.17.
+ */
class ProjectGet(connection: Connection, sessionDao: Dao[Session, Int]) extends Route {
override def handle(request: Request, response: Response): AnyRef = {
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/ProjectHandler.scala b/src/main/scala/de/tobias/playpad/server/server/project/ProjectHandler.scala
index 997bdd34967b3c34c7928ea8af039214c6aebf88..8a6d0fdeec3a01be51ed22dc7978cd286d91584b 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/ProjectHandler.scala
@@ -13,8 +13,8 @@ import org.eclipse.jetty.websocket.api.annotations.{OnWebSocketClose, OnWebSocke
import scala.collection.{Map, mutable}
/**
- * Created by tobias on 13.02.17.
- */
+ * Created by tobias on 13.02.17.
+ */
@Deprecated
@WebSocket class ProjectHandler(sessionDao: Dao[account.Session, Int], connection: Connection) {
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/ProjectList.scala b/src/main/scala/de/tobias/playpad/server/server/project/ProjectList.scala
index be483ef7cc2b724a90c35d544b3681afaf07e64e..b6ec86789149e392a69f02445b124a1e8155dded 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectList.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/ProjectList.scala
@@ -10,8 +10,8 @@ import de.tobias.playpad.server.server.{Result, Status}
import spark.{Request, Response, Route}
/**
- * Created by tobias on 17.02.17.
- */
+ * Created by tobias on 17.02.17.
+ */
class ProjectList(connection: Connection, sessionDao: Dao[Session, Int]) extends Route {
override def handle(request: Request, response: Response): AnyRef = {
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/ProjectModificationGet.scala b/src/main/scala/de/tobias/playpad/server/server/project/ProjectModificationGet.scala
index 7991d4a0eec607a5a95e30391524c06843b891c0..3f9426a253f6a42f315e39503df7874e29e52b56 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectModificationGet.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/ProjectModificationGet.scala
@@ -10,8 +10,8 @@ import de.tobias.playpad.server.server.{Result, Status}
import spark.{Request, Response, Route}
/**
- * Created by tobias on 01.03.17.
- */
+ * Created by tobias on 01.03.17.
+ */
class ProjectModificationGet(connection: Connection, sessionDao: Dao[Session, Int]) extends Route {
override def handle(request: Request, response: Response): AnyRef = {
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 edb831b6844a181c6f42e6ba05887963c64c1723..71eff6b136cbb2dcfa8d7697c22735f7fd8dd35e 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
@@ -12,8 +12,8 @@ import de.tobias.playpad.server.server.{Result, Status}
import spark.{Request, Response, Route}
/**
- * Created by tobias on 17.02.17.
- */
+ * Created by tobias on 17.02.17.
+ */
class ProjectPost(connection: Connection, sessionDao: Dao[Session, Int]) extends Route {
override def handle(request: Request, response: Response): AnyRef = {
val sessionKey = request.queryParams("session")
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/listener/CollectionAddListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/listener/CollectionAddListener.scala
index 20fda786edce1686b70dd5ef6dbda79ee32a8e9c..a6b1867b7667ce6b974a1cf29fe78184fc853acb 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/listener/CollectionAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/listener/CollectionAddListener.scala
@@ -9,8 +9,8 @@ import de.tobias.playpad.server.server.SqlHelper
import scala.collection.JavaConverters
/**
- * Created by tobias on 18.02.17.
- */
+ * Created by tobias on 18.02.17.
+ */
@Deprecated
class CollectionAddListener extends Listener {
override def onChange(json: JsonObject, connection: Connection): Unit = {
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/listener/CollectionRemoveListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/listener/CollectionRemoveListener.scala
index 9de364042a9f54aff32980c45035a90c27953d77..202f36e1a860b7137e2d61499a041c6daa326f6d 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/listener/CollectionRemoveListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/listener/CollectionRemoveListener.scala
@@ -1,4 +1,5 @@
package de.tobias.playpad.server.server.project.listener
+
import java.sql.Connection
import java.util.UUID
@@ -6,8 +7,8 @@ import com.google.gson.JsonObject
import de.tobias.playpad.server.server.SqlHelper
/**
- * Created by tobias on 18.02.17.
- */
+ * Created by tobias on 18.02.17.
+ */
@Deprecated
class CollectionRemoveListener extends Listener {
override def onChange(json: JsonObject, connection: Connection): Unit = {
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/listener/Listener.scala b/src/main/scala/de/tobias/playpad/server/server/project/listener/Listener.scala
index 76703a03300cb3a55067608ea1070085013708c9..d964ed1a29329bcd3e45a0907f4ca1d057257d0e 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/listener/Listener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/listener/Listener.scala
@@ -5,8 +5,8 @@ import java.sql.Connection
import com.google.gson.JsonObject
/**
- * Created by tobias on 18.02.17.
- */
+ * Created by tobias on 18.02.17.
+ */
@Deprecated
trait Listener {
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/listener/PropertyUpdateListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/listener/PropertyUpdateListener.scala
index 3bc5a2a28c1fdc5b40f9e04b2bbb758d06924ebb..4544e8f57ef88ccccb47850612cde6deceedd0f4 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/listener/PropertyUpdateListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/listener/PropertyUpdateListener.scala
@@ -1,4 +1,5 @@
package de.tobias.playpad.server.server.project.listener
+
import java.sql.Connection
import java.util.UUID
@@ -6,8 +7,8 @@ import com.google.gson.JsonObject
import de.tobias.playpad.server.server.SqlHelper
/**
- * Created by tobias on 18.02.17.
- */
+ * Created by tobias on 18.02.17.
+ */
@Deprecated
class PropertyUpdateListener extends Listener {
override def onChange(json: JsonObject, connection: Connection): Unit = {
@@ -39,7 +40,7 @@ class PropertyUpdateListener extends Listener {
val uuid = UUID.fromString(id)
SqlHelper.insertOrUpdate(connection, className, uuid, field, value)
}
- } else if (valueType == classOf[Integer]){
+ } else if (valueType == classOf[Integer]) {
val value = jsonObject.get("value").getAsInt
if (id.matches("[0-9]*")) {
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala
index fd6f98722bd31a9ac9d83303978db79d3f2ab846..3b476a2987c944c19460b59ddda29f595191c3cd 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala
@@ -21,8 +21,8 @@ import org.eclipse.jetty.websocket.api.annotations.{OnWebSocketClose, OnWebSocke
import scala.collection.{Map, mutable}
/**
- * Created by tobias on 19.02.17.
- */
+ * Created by tobias on 19.02.17.
+ */
@WebSocket class ProjectSyncHandler(sessionDao: Dao[account.Session, Int], connection: Connection) {
val SESSION_KEY_HEADER = "key"
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/Listener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/Listener.scala
index 217ddf9c57140bc603432a4f400d10b04d64721f..3693666f3fad5d583db4da99ced9f0923b8d6ce6 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/Listener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/Listener.scala
@@ -6,8 +6,8 @@ import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
/**
- * Created by tobias on 18.02.17.
- */
+ * Created by tobias on 18.02.17.
+ */
trait Listener {
def onChange(json: JsonObject, connection: Connection, session: Session): Unit
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignAddListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignAddListener.scala
index 4c89fab018e8ac2e39ea831cc422314bb6c5482d..c9d8a29818bb6b6191bbc741c2afcb2a703fd02a 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignAddListener.scala
@@ -10,8 +10,8 @@ import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
- * Created by tobias on 19.02.17.
- */
+ * Created by tobias on 19.02.17.
+ */
class DesignAddListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val designId = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignUpdateListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignUpdateListener.scala
index b937ddd896c439bc02cbc95a5671af3386a9c512..7051119f21d2ee2b296a249304df988ff48b1714 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignUpdateListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignUpdateListener.scala
@@ -10,8 +10,8 @@ import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
- * Created by tobias on 19.02.17.
- */
+ * Created by tobias on 19.02.17.
+ */
class DesignUpdateListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val designId = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadAddListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadAddListener.scala
index d902ef4e30a30579dd805cb8ff9cea8347d220dc..42c9fa13c98107a251901b1a2fb31904ce8e829a 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadAddListener.scala
@@ -10,8 +10,8 @@ import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
- * Created by tobias on 19.02.17.
- */
+ * Created by tobias on 19.02.17.
+ */
class PadAddListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val padId = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadClearListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadClearListener.scala
index 92f29cf1fb1f4c2ab26c764f9dceecd03f385a8b..cb27b921454b6f1ec47391828e8de2620eafe49f 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadClearListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadClearListener.scala
@@ -10,8 +10,8 @@ import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
- * Created by tobias on 19.02.17.
- */
+ * Created by tobias on 19.02.17.
+ */
class PadClearListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val pageId = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadRemoveListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadRemoveListener.scala
index 7e57b723a10bb2f493deb5523b648464876e8a90..3c2e49c9f4291f72f0c660c973548e557e45a763 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadRemoveListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadRemoveListener.scala
@@ -10,8 +10,8 @@ import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
- * Created by tobias on 19.02.17.
- */
+ * Created by tobias on 19.02.17.
+ */
class PadRemoveListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val pageId = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadUpdateListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadUpdateListener.scala
index fe4590e36621e7279a4c055565727d3cad5692f1..29a12023dae12c8152acf4fdf5dc54b1b66083b0 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadUpdateListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadUpdateListener.scala
@@ -10,8 +10,8 @@ import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
- * Created by tobias on 19.02.17.
- */
+ * Created by tobias on 19.02.17.
+ */
class PadUpdateListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val padID = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageAddListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageAddListener.scala
index 1ae87a9c26955754f0bce720b7377e6f41650a94..9d3ac3bbd6940a953a4bbe828d2b052482d71f66 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageAddListener.scala
@@ -10,8 +10,8 @@ import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
- * Created by tobias on 19.02.17.
- */
+ * Created by tobias on 19.02.17.
+ */
class PageAddListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val pageId = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageRemoveListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageRemoveListener.scala
index c9df6256de37f405c7b58a2afea2ead01857556b..81ffce2d20056e5de970b34e7299c63f0b7db611 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageRemoveListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageRemoveListener.scala
@@ -10,8 +10,8 @@ import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
- * Created by tobias on 19.02.17.
- */
+ * Created by tobias on 19.02.17.
+ */
class PageRemoveListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val pageId = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageUpdateListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageUpdateListener.scala
index 7b92ac4255b0316f581355bf2ed2a09d29e9e6bb..24c6234fce03d306b5c2c16ad24233abff06d7be 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageUpdateListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageUpdateListener.scala
@@ -10,8 +10,8 @@ import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
- * Created by tobias on 19.02.17.
- */
+ * Created by tobias on 19.02.17.
+ */
class PageUpdateListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val pageId = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathAddListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathAddListener.scala
index f86ad036480985d6488a0938dcbe710732aab43d..0d08ca24542dbb7ac9ba84ea0c4e69d372b02ff8 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathAddListener.scala
@@ -10,8 +10,8 @@ import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
- * Created by tobias on 19.02.17.
- */
+ * Created by tobias on 19.02.17.
+ */
class PathAddListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val pathId = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathRemoveListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathRemoveListener.scala
index 3705e0cdbd3e90837a2ad07d29869f4c1449a600..400c8ecbcb8a0d9eaf46bc424cccf9e0a6d6fc1f 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathRemoveListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathRemoveListener.scala
@@ -10,8 +10,8 @@ import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
- * Created by tobias on 19.02.17.
- */
+ * Created by tobias on 19.02.17.
+ */
class PathRemoveListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val pageId = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectAddListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectAddListener.scala
index c83326d61b9b56368fcef9e67247c42b85408f3b..8e237c5e2deb541a06e1bda3ae808d42e6a92263 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectAddListener.scala
@@ -10,8 +10,8 @@ import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
- * Created by tobias on 19.02.17.
- */
+ * Created by tobias on 19.02.17.
+ */
class ProjectAddListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val projectId = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectRemoveListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectRemoveListener.scala
index 21656805f7439b7758497281af177cf18b6f625e..c2edae2943ea860f49590d851956e134786ff090 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectRemoveListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectRemoveListener.scala
@@ -10,8 +10,8 @@ import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
- * Created by tobias on 19.02.17.
- */
+ * Created by tobias on 19.02.17.
+ */
class ProjectRemoveListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val projectId = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectUpdateListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectUpdateListener.scala
index 6f8a143de3256aa5b1064a63bd49119e6cf43c92..9c6242ed8bcccfe9a11e9635249dfe0dbe162bc2 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectUpdateListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectUpdateListener.scala
@@ -10,8 +10,8 @@ import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
- * Created by tobias on 19.02.17.
- */
+ * Created by tobias on 19.02.17.
+ */
class ProjectUpdateListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val projectId = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/settings/PropertiesSettingsHandler.scala b/src/main/scala/de/tobias/playpad/server/settings/PropertiesSettingsHandler.scala
index 82271bc6a4274db03474292a0c4858d6d2604c85..4f9a581a6998e8e0fe07288f484d880dd837ba94 100644
--- a/src/main/scala/de/tobias/playpad/server/settings/PropertiesSettingsHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/settings/PropertiesSettingsHandler.scala
@@ -6,8 +6,8 @@ import java.nio.file.{Files, Path}
import java.util.Properties
/**
- * Created by tobias on 05.02.17.
- */
+ * Created by tobias on 05.02.17.
+ */
class PropertiesSettingsHandler extends SettingsLoader with SettingsSaver {
@throws[IOException]
diff --git a/src/main/scala/de/tobias/playpad/server/settings/Settings.scala b/src/main/scala/de/tobias/playpad/server/settings/Settings.scala
index 5deafab8ee5cbd940baee71ca7065ac66a36874d..44dce21729e9b3492d3584a6d57f827db7d06fef 100644
--- a/src/main/scala/de/tobias/playpad/server/settings/Settings.scala
+++ b/src/main/scala/de/tobias/playpad/server/settings/Settings.scala
@@ -1,8 +1,8 @@
package de.tobias.playpad.server.settings
/**
- * Created by tobias on 05.02.17.
- */
+ * Created by tobias on 05.02.17.
+ */
class Settings {
var db_host: String = "localhost"
diff --git a/src/main/scala/de/tobias/playpad/server/settings/SettingsHandler.scala b/src/main/scala/de/tobias/playpad/server/settings/SettingsHandler.scala
index eb0ad12abd831200fbd0142c967ff0440276d301..48be269dd31838f357c1bb4611fe2603d9172176 100644
--- a/src/main/scala/de/tobias/playpad/server/settings/SettingsHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/settings/SettingsHandler.scala
@@ -1,8 +1,8 @@
package de.tobias.playpad.server.settings
/**
- * Created by tobias on 05.02.17.
- */
+ * Created by tobias on 05.02.17.
+ */
object SettingsHandler {
def loader = new PropertiesSettingsHandler()
diff --git a/src/main/scala/de/tobias/playpad/server/settings/SettingsLoader.scala b/src/main/scala/de/tobias/playpad/server/settings/SettingsLoader.scala
index fbf8ee7539d0edc8243840f91b758ab696ecd4af..36a4bdf1940a434f3f8504106f405a7a08a34884 100644
--- a/src/main/scala/de/tobias/playpad/server/settings/SettingsLoader.scala
+++ b/src/main/scala/de/tobias/playpad/server/settings/SettingsLoader.scala
@@ -4,8 +4,8 @@ import java.io.IOException
import java.nio.file.Path
/**
- * Created by tobias on 05.02.17.
- */
+ * Created by tobias on 05.02.17.
+ */
trait SettingsLoader {
@throws[IOException]
diff --git a/src/main/scala/de/tobias/playpad/server/settings/SettingsSaver.scala b/src/main/scala/de/tobias/playpad/server/settings/SettingsSaver.scala
index 6544a9c2004810bc505b1f75393df05360cba8c4..27d37c3e1981264ccae53bc75c61b23e9f511d73 100644
--- a/src/main/scala/de/tobias/playpad/server/settings/SettingsSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/settings/SettingsSaver.scala
@@ -4,8 +4,8 @@ import java.io.IOException
import java.nio.file.Path
/**
- * Created by tobias on 05.02.17.
- */
+ * Created by tobias on 05.02.17.
+ */
trait SettingsSaver {
@throws[IOException]
diff --git a/src/main/scala/de/tobias/playpad/server/sql/SqlResultHandler.scala b/src/main/scala/de/tobias/playpad/server/sql/SqlResultHandler.scala
index cae028ee18c0e532ba23c041f8437429848292cb..329c632e7f545ba6f4e543f0d76fb6b3fd63f68e 100644
--- a/src/main/scala/de/tobias/playpad/server/sql/SqlResultHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/sql/SqlResultHandler.scala
@@ -2,7 +2,7 @@ package de.tobias.playpad.server.sql
trait SqlResultHandler {
- def fromResult(o: Any): Any
+ def fromResult(o: Any): Any
- def toQuery(o: Any): Any
+ def toQuery(o: Any): Any
}
diff --git a/src/main/scala/de/tobias/playpad/server/sql/StringSqlResultHandler.scala b/src/main/scala/de/tobias/playpad/server/sql/StringSqlResultHandler.scala
index e1e501ff6d3fcaac452dfedfbfd44e6202898329..8912cef391c9d4ab10cdd6ba69b5b89a0593b089 100644
--- a/src/main/scala/de/tobias/playpad/server/sql/StringSqlResultHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/sql/StringSqlResultHandler.scala
@@ -1,7 +1,7 @@
package de.tobias.playpad.server.sql
class StringSqlResultHandler extends SqlResultHandler {
- override def fromResult(o: Any): Any = o
+ override def fromResult(o: Any): Any = o
- override def toQuery(o: Any): Any = o
+ override def toQuery(o: Any): Any = o
}
diff --git a/src/main/scala/de/tobias/playpad/server/transformer/JsonTransformer.scala b/src/main/scala/de/tobias/playpad/server/transformer/JsonTransformer.scala
index 1480a1183973026fe525d81c0103e4df0b2efc7b..89dc908f126553935c64aa7f8913b269cb90a686 100644
--- a/src/main/scala/de/tobias/playpad/server/transformer/JsonTransformer.scala
+++ b/src/main/scala/de/tobias/playpad/server/transformer/JsonTransformer.scala
@@ -4,8 +4,8 @@ import com.google.gson.{Gson, JsonObject}
import spark.ResponseTransformer
/**
- * Created by tobias on 05.02.17.
- */
+ * Created by tobias on 05.02.17.
+ */
class JsonTransformer extends ResponseTransformer {
val gson = new Gson()