From 0e5d0ded50693c036c7bed12efb778794269aff4 Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Wed, 24 Jul 2019 19:12:07 +0200
Subject: [PATCH] Cleanup code
---
.../java/de/tobias/playpad/server/json/JsonCollection.java | 3 ++-
src/main/java/de/tobias/playpad/server/json/JsonName.java | 3 ++-
src/main/java/de/tobias/playpad/server/json/JsonObj.java | 3 ++-
.../java/de/tobias/playpad/server/json/JsonParent.java | 3 ++-
.../scala/de/tobias/playpad/server/PlayPadServer.scala | 4 ++--
.../scala/de/tobias/playpad/server/account/Account.scala | 6 +++---
.../scala/de/tobias/playpad/server/account/Session.scala | 6 ++++--
.../playpad/server/json/DurationSerializerHandler.scala | 3 +--
.../scala/de/tobias/playpad/server/logger/LogFilter.scala | 4 ++--
.../scala/de/tobias/playpad/server/plugin/Plugin.scala | 4 ++--
.../scala/de/tobias/playpad/server/project/Design.scala | 4 ++--
src/main/scala/de/tobias/playpad/server/project/Pad.scala | 4 ++--
src/main/scala/de/tobias/playpad/server/project/Page.scala | 4 ++--
src/main/scala/de/tobias/playpad/server/project/Path.scala | 4 ++--
.../scala/de/tobias/playpad/server/project/Project.scala | 4 ++--
.../playpad/server/project/loader/sql/DesignLoader.scala | 4 ++--
.../playpad/server/project/loader/sql/PadLoader.scala | 5 +++--
.../playpad/server/project/loader/sql/PageLoader.scala | 4 ++--
.../playpad/server/project/loader/sql/PathLoader.scala | 4 ++--
.../playpad/server/project/loader/sql/ProjectLoader.scala | 4 ++--
.../playpad/server/project/saver/sql/DesignSaver.scala | 4 ++--
.../tobias/playpad/server/project/saver/sql/PadSaver.scala | 4 ++--
.../playpad/server/project/saver/sql/PageSaver.scala | 4 ++--
.../playpad/server/project/saver/sql/PathSaver.scala | 4 ++--
.../playpad/server/project/saver/sql/ProjectSaver.scala | 7 ++++---
.../de/tobias/playpad/server/project/settings/Fade.scala | 2 +-
.../playpad/server/project/settings/PadSettings.scala | 2 +-
.../de/tobias/playpad/server/project/utils/JsonDef.scala | 4 ++--
.../de/tobias/playpad/server/project/utils/SqlDef.scala | 4 ++--
.../scala/de/tobias/playpad/server/server/Result.scala | 4 ++--
.../scala/de/tobias/playpad/server/server/SqlHelper.scala | 4 ++--
.../scala/de/tobias/playpad/server/server/Status.scala | 4 ++--
.../tobias/playpad/server/server/account/AccountPost.scala | 4 ++--
.../tobias/playpad/server/server/account/AccountPut.scala | 4 ++--
.../playpad/server/server/account/SessionDelete.scala | 4 ++--
.../tobias/playpad/server/server/account/SessionGet.scala | 4 ++--
.../tobias/playpad/server/server/account/SessionPost.scala | 4 ++--
.../de/tobias/playpad/server/server/plugin/PluginGet.scala | 4 ++--
.../tobias/playpad/server/server/plugin/PluginList.scala | 4 ++--
.../playpad/server/server/project/ProjectDelete.scala | 4 ++--
.../tobias/playpad/server/server/project/ProjectGet.scala | 4 ++--
.../playpad/server/server/project/ProjectHandler.scala | 4 ++--
.../tobias/playpad/server/server/project/ProjectList.scala | 4 ++--
.../server/server/project/ProjectModificationGet.scala | 4 ++--
.../tobias/playpad/server/server/project/ProjectPost.scala | 4 ++--
.../server/project/listener/CollectionAddListener.scala | 4 ++--
.../server/project/listener/CollectionRemoveListener.scala | 5 +++--
.../playpad/server/server/project/listener/Listener.scala | 4 ++--
.../server/project/listener/PropertyUpdateListener.scala | 7 ++++---
.../server/server/project/sync/ProjectSyncHandler.scala | 4 ++--
.../server/server/project/sync/listener/Listener.scala | 4 ++--
.../project/sync/listener/design/DesignAddListener.scala | 4 ++--
.../sync/listener/design/DesignUpdateListener.scala | 4 ++--
.../server/project/sync/listener/pad/PadAddListener.scala | 4 ++--
.../project/sync/listener/pad/PadClearListener.scala | 4 ++--
.../project/sync/listener/pad/PadRemoveListener.scala | 4 ++--
.../project/sync/listener/pad/PadUpdateListener.scala | 4 ++--
.../project/sync/listener/page/PageAddListener.scala | 4 ++--
.../project/sync/listener/page/PageRemoveListener.scala | 4 ++--
.../project/sync/listener/page/PageUpdateListener.scala | 4 ++--
.../project/sync/listener/path/PathAddListener.scala | 4 ++--
.../project/sync/listener/path/PathRemoveListener.scala | 4 ++--
.../project/sync/listener/project/ProjectAddListener.scala | 4 ++--
.../sync/listener/project/ProjectRemoveListener.scala | 4 ++--
.../sync/listener/project/ProjectUpdateListener.scala | 4 ++--
.../server/settings/PropertiesSettingsHandler.scala | 4 ++--
.../scala/de/tobias/playpad/server/settings/Settings.scala | 4 ++--
.../tobias/playpad/server/settings/SettingsHandler.scala | 4 ++--
.../de/tobias/playpad/server/settings/SettingsLoader.scala | 4 ++--
.../de/tobias/playpad/server/settings/SettingsSaver.scala | 4 ++--
.../de/tobias/playpad/server/sql/SqlResultHandler.scala | 4 ++--
.../tobias/playpad/server/sql/StringSqlResultHandler.scala | 4 ++--
.../playpad/server/transformer/JsonTransformer.scala | 4 ++--
73 files changed, 152 insertions(+), 143 deletions(-)
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 e6e8dcc..bde1501 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 464aaf3..67bf30c 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 5f49aed..f32e055 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 d01a649..51819ef 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 de3d8fc..7ccf1bd 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 f1cca08..a12592a 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 80b46d2..8fa36fb 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 29689b9..8b10f50 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 057af1b..2454be6 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 58ddd71..e08b431 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 c3b6644..6f372cd 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 490b58b..555bacb 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 fcfa6ee..fb9aeac 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 467de17..4aaca1e 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 fc28a98..e7fde48 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 96b503f..20872cc 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 aabfb7a..243eef2 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 7ce80fa..2dab58e 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 cfc1625..fd12784 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 4775399..920914a 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 3f465bb..e23db0b 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 1bba342..aea6cf8 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 ec28b85..6e88cda 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 ed0e374..c7f2092 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 8fcd202..d72dbbe 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 c1816f1..2aa834f 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 45d3f97..f6564b5 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 dfae494..6cf62d4 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 ba527fe..bf19db5 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 83933be..0d3a207 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 f306ae6..6a397c4 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 2a44ddf..3e75509 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 53f1292..1334f04 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 43fa68c..92658be 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 644e668..e0d5c7b 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 9382f46..d9f0a24 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 7ae39fc..8531218 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 5fb030f..6f52805 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 50c91a8..54dce56 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 689c90d..7a5d473 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 f11f171..0c14a84 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 997bdd3..8a6d0fd 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 be483ef..b6ec867 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 7991d4a..3f9426a 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 edb831b..71eff6b 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 20fda78..a6b1867 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 9de3640..202f36e 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 76703a0..d964ed1 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 3bc5a2a..4544e8f 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 fd6f987..3b476a2 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 217ddf9..3693666 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 4c89fab..c9d8a29 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 b937ddd..7051119 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 d902ef4..42c9fa1 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 92f29cf..cb27b92 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 7e57b72..3c2e49c 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 fe4590e..29a1202 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 1ae87a9..9d3ac3b 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 c9df625..81ffce2 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 7b92ac4..24c6234 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 f86ad03..0d08ca2 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 3705e0c..400c8ec 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 c83326d..8e237c5 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 2165680..c2edae2 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 6f8a143..9c6242e 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 82271bc..4f9a581 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 5deafab..44dce21 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 eb0ad12..48be269 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 fbf8ee7..36a4bdf 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 6544a9c..27d37c3 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 cae028e..329c632 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 e1e501f..8912cef 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 1480a11..89dc908 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()
--
GitLab