From ae1a8dcb81c173b99b2e3613fb2a6bda6e660190 Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Fri, 2 Aug 2019 20:46:10 +0200
Subject: [PATCH] Refactor project related classes
---
.../server/{ => model}/project/Design.scala | 2 +-
.../server/{ => model}/project/Pad.scala | 4 +--
.../server/{ => model}/project/Page.scala | 2 +-
.../server/{ => model}/project/Path.scala | 2 +-
.../server/{ => model}/project/Project.scala | 2 +-
.../{ => model}/project/settings/Fade.scala | 2 +-
.../project/settings/PadSettings.scala | 4 +--
.../server/project/utils/JsonDef.scala | 31 -------------------
.../server/server/project/ProjectDelete.scala | 4 +--
.../server/server/project/ProjectGet.scala | 2 +-
.../server/server/project/ProjectList.scala | 2 +-
.../project/ProjectModificationGet.scala | 2 +-
.../server/server/project/ProjectPost.scala | 4 +--
.../project/sync/ProjectSyncHandler.scala | 2 +-
.../listener/design/DesignAddListener.scala | 2 +-
.../design/DesignUpdateListener.scala | 2 +-
.../sync/listener/pad/PadAddListener.scala | 2 +-
.../sync/listener/pad/PadClearListener.scala | 2 +-
.../sync/listener/pad/PadRemoveListener.scala | 2 +-
.../sync/listener/pad/PadUpdateListener.scala | 2 +-
.../pad/settings/PadSettingsAddListener.scala | 2 +-
.../settings/PadSettingsUpdateListener.scala | 2 +-
.../sync/listener/page/PageAddListener.scala | 2 +-
.../listener/page/PageRemoveListener.scala | 2 +-
.../listener/page/PageUpdateListener.scala | 2 +-
.../sync/listener/path/PathAddListener.scala | 2 +-
.../listener/path/PathRemoveListener.scala | 2 +-
.../listener/project/ProjectAddListener.scala | 2 +-
.../project/ProjectRemoveListener.scala | 2 +-
.../project/ProjectUpdateListener.scala | 2 +-
.../{project/utils => sql}/SqlDef.scala | 2 +-
.../sql => sql/loader}/DesignLoader.scala | 6 ++--
.../loader/sql => sql/loader}/PadLoader.scala | 6 ++--
.../sql => sql/loader}/PageLoader.scala | 6 ++--
.../sql => sql/loader}/PathLoader.scala | 6 ++--
.../sql => sql/loader}/ProjectLoader.scala | 6 ++--
.../saver/sql => sql/saver}/DesignSaver.scala | 6 ++--
.../saver/sql => sql/saver}/PadSaver.scala | 6 ++--
.../saver/sql => sql/saver}/PageSaver.scala | 6 ++--
.../saver/sql => sql/saver}/PathSaver.scala | 6 ++--
.../sql => sql/saver}/ProjectSaver.scala | 6 ++--
41 files changed, 64 insertions(+), 95 deletions(-)
rename src/main/scala/de/tobias/playpad/server/{ => model}/project/Design.scala (90%)
rename src/main/scala/de/tobias/playpad/server/{ => model}/project/Pad.scala (86%)
rename src/main/scala/de/tobias/playpad/server/{ => model}/project/Page.scala (91%)
rename src/main/scala/de/tobias/playpad/server/{ => model}/project/Path.scala (88%)
rename src/main/scala/de/tobias/playpad/server/{ => model}/project/Project.scala (91%)
rename src/main/scala/de/tobias/playpad/server/{ => model}/project/settings/Fade.scala (94%)
rename src/main/scala/de/tobias/playpad/server/{ => model}/project/settings/PadSettings.scala (85%)
delete mode 100644 src/main/scala/de/tobias/playpad/server/project/utils/JsonDef.scala
rename src/main/scala/de/tobias/playpad/server/{project/utils => sql}/SqlDef.scala (95%)
rename src/main/scala/de/tobias/playpad/server/{project/loader/sql => sql/loader}/DesignLoader.scala (82%)
rename src/main/scala/de/tobias/playpad/server/{project/loader/sql => sql/loader}/PadLoader.scala (85%)
rename src/main/scala/de/tobias/playpad/server/{project/loader/sql => sql/loader}/PageLoader.scala (82%)
rename src/main/scala/de/tobias/playpad/server/{project/loader/sql => sql/loader}/PathLoader.scala (81%)
rename src/main/scala/de/tobias/playpad/server/{project/loader/sql => sql/loader}/ProjectLoader.scala (93%)
rename src/main/scala/de/tobias/playpad/server/{project/saver/sql => sql/saver}/DesignSaver.scala (76%)
rename src/main/scala/de/tobias/playpad/server/{project/saver/sql => sql/saver}/PadSaver.scala (83%)
rename src/main/scala/de/tobias/playpad/server/{project/saver/sql => sql/saver}/PageSaver.scala (77%)
rename src/main/scala/de/tobias/playpad/server/{project/saver/sql => sql/saver}/PathSaver.scala (70%)
rename src/main/scala/de/tobias/playpad/server/{project/saver/sql => sql/saver}/ProjectSaver.scala (79%)
diff --git a/src/main/scala/de/tobias/playpad/server/project/Design.scala b/src/main/scala/de/tobias/playpad/server/model/project/Design.scala
similarity index 90%
rename from src/main/scala/de/tobias/playpad/server/project/Design.scala
rename to src/main/scala/de/tobias/playpad/server/model/project/Design.scala
index 2e86b53..ddbcefa 100644
--- a/src/main/scala/de/tobias/playpad/server/project/Design.scala
+++ b/src/main/scala/de/tobias/playpad/server/model/project/Design.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.project
+package de.tobias.playpad.server.model.project
import java.util.UUID
diff --git a/src/main/scala/de/tobias/playpad/server/project/Pad.scala b/src/main/scala/de/tobias/playpad/server/model/project/Pad.scala
similarity index 86%
rename from src/main/scala/de/tobias/playpad/server/project/Pad.scala
rename to src/main/scala/de/tobias/playpad/server/model/project/Pad.scala
index c3ddd95..fef6940 100644
--- a/src/main/scala/de/tobias/playpad/server/project/Pad.scala
+++ b/src/main/scala/de/tobias/playpad/server/model/project/Pad.scala
@@ -1,8 +1,8 @@
-package de.tobias.playpad.server.project
+package de.tobias.playpad.server.model.project
import java.util.UUID
-import de.tobias.playpad.server.project.settings.PadSettings
+import de.tobias.playpad.server.model.project.settings.PadSettings
import de.tobias.playpad.server.utils.json._
/**
diff --git a/src/main/scala/de/tobias/playpad/server/project/Page.scala b/src/main/scala/de/tobias/playpad/server/model/project/Page.scala
similarity index 91%
rename from src/main/scala/de/tobias/playpad/server/project/Page.scala
rename to src/main/scala/de/tobias/playpad/server/model/project/Page.scala
index 3a0755a..614db92 100644
--- a/src/main/scala/de/tobias/playpad/server/project/Page.scala
+++ b/src/main/scala/de/tobias/playpad/server/model/project/Page.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.project
+package de.tobias.playpad.server.model.project
import java.util.UUID
diff --git a/src/main/scala/de/tobias/playpad/server/project/Path.scala b/src/main/scala/de/tobias/playpad/server/model/project/Path.scala
similarity index 88%
rename from src/main/scala/de/tobias/playpad/server/project/Path.scala
rename to src/main/scala/de/tobias/playpad/server/model/project/Path.scala
index 3e98574..4a64485 100644
--- a/src/main/scala/de/tobias/playpad/server/project/Path.scala
+++ b/src/main/scala/de/tobias/playpad/server/model/project/Path.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.project
+package de.tobias.playpad.server.model.project
import java.util.UUID
diff --git a/src/main/scala/de/tobias/playpad/server/project/Project.scala b/src/main/scala/de/tobias/playpad/server/model/project/Project.scala
similarity index 91%
rename from src/main/scala/de/tobias/playpad/server/project/Project.scala
rename to src/main/scala/de/tobias/playpad/server/model/project/Project.scala
index d87fac8..d1de780 100644
--- a/src/main/scala/de/tobias/playpad/server/project/Project.scala
+++ b/src/main/scala/de/tobias/playpad/server/model/project/Project.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.project
+package de.tobias.playpad.server.model.project
import java.util.UUID
diff --git a/src/main/scala/de/tobias/playpad/server/project/settings/Fade.scala b/src/main/scala/de/tobias/playpad/server/model/project/settings/Fade.scala
similarity index 94%
rename from src/main/scala/de/tobias/playpad/server/project/settings/Fade.scala
rename to src/main/scala/de/tobias/playpad/server/model/project/settings/Fade.scala
index ae609b9..f0d16c1 100644
--- a/src/main/scala/de/tobias/playpad/server/project/settings/Fade.scala
+++ b/src/main/scala/de/tobias/playpad/server/model/project/settings/Fade.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.project.settings
+package de.tobias.playpad.server.model.project.settings
import java.time.Duration
import java.util.UUID
diff --git a/src/main/scala/de/tobias/playpad/server/project/settings/PadSettings.scala b/src/main/scala/de/tobias/playpad/server/model/project/settings/PadSettings.scala
similarity index 85%
rename from src/main/scala/de/tobias/playpad/server/project/settings/PadSettings.scala
rename to src/main/scala/de/tobias/playpad/server/model/project/settings/PadSettings.scala
index e378a10..7f53b6f 100644
--- a/src/main/scala/de/tobias/playpad/server/project/settings/PadSettings.scala
+++ b/src/main/scala/de/tobias/playpad/server/model/project/settings/PadSettings.scala
@@ -1,9 +1,9 @@
-package de.tobias.playpad.server.project.settings
+package de.tobias.playpad.server.model.project.settings
import java.time.Duration
import java.util.UUID
-import de.tobias.playpad.server.project.{Design, Pad}
+import de.tobias.playpad.server.model.project.{Design, Pad}
import de.tobias.playpad.server.utils.json._
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
deleted file mode 100644
index 6cf62d4..0000000
--- a/src/main/scala/de/tobias/playpad/server/project/utils/JsonDef.scala
+++ /dev/null
@@ -1,31 +0,0 @@
-package de.tobias.playpad.server.project.utils
-
-/**
- * Created by tobias on 17.02.17.
- */
-object JsonDef {
-
- val PROJECT_ID = "id"
- val PROJECT_NAME = "name"
- val PROJECT_PAGES = "pages"
-
- val PAGE_ID = "id"
- val PAGE_NAME = "name"
- val PAGE_POSITION = "position"
- val PAGE_PADS = "pads"
-
- val PAD_ID = "id"
- val PAD_NAME = "name"
- val PAD_POSITION = "position"
- val PAD_CONTENT_TYPE = "contentType"
- val PAD_PATHS = "paths"
- val PAD_DESIGN = "design"
-
- val PATH_ID = "id"
- val PATH_PATH = "filename"
-
- val DESIGN_ID = "id"
- val DESIGN_BACKGROUND_COLOR = "background_color"
- val DESIGN_PLAY_COLOR = "play_color"
-
-}
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 7a5d473..396e2fd 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
@@ -5,9 +5,9 @@ import java.util.UUID
import com.j256.ormlite.dao.Dao
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.loader.sql.ProjectLoader
-import de.tobias.playpad.server.project.saver.sql.ProjectSaver
import de.tobias.playpad.server.server.{Result, Status}
+import de.tobias.playpad.server.sql.loader.ProjectLoader
+import de.tobias.playpad.server.sql.saver.ProjectSaver
import spark.{Request, Response, Route}
/**
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 0196ecf..070e51c 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
@@ -5,8 +5,8 @@ import java.util.UUID
import com.j256.ormlite.dao.Dao
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.loader.sql.ProjectLoader
import de.tobias.playpad.server.server.{Result, Status}
+import de.tobias.playpad.server.sql.loader.ProjectLoader
import de.tobias.playpad.server.utils.json.JsonSerializer
import spark.{Request, Response, Route}
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 b6ec867..addedaa 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
@@ -5,8 +5,8 @@ import java.sql.Connection
import com.google.gson.{JsonArray, JsonObject}
import com.j256.ormlite.dao.Dao
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.loader.sql.ProjectLoader
import de.tobias.playpad.server.server.{Result, Status}
+import de.tobias.playpad.server.sql.loader.ProjectLoader
import spark.{Request, Response, Route}
/**
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 3f9426a..c34618c 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
@@ -5,8 +5,8 @@ import java.sql.Connection
import com.google.gson.{JsonArray, JsonObject}
import com.j256.ormlite.dao.Dao
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.loader.sql.ProjectLoader
import de.tobias.playpad.server.server.{Result, Status}
+import de.tobias.playpad.server.sql.loader.ProjectLoader
import spark.{Request, Response, Route}
/**
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 9c11cdc..ad71984 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
@@ -5,9 +5,9 @@ import java.sql.Connection
import com.google.gson.JsonParser
import com.j256.ormlite.dao.Dao
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.Project
-import de.tobias.playpad.server.project.saver.sql.ProjectSaver
+import de.tobias.playpad.server.model.project.Project
import de.tobias.playpad.server.server.{Result, Status}
+import de.tobias.playpad.server.sql.saver.ProjectSaver
import de.tobias.playpad.server.utils.json.JsonSerializer
import spark.{Request, Response, Route}
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 a653df8..a87c457 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
@@ -7,9 +7,9 @@ import com.google.gson.{JsonObject, JsonParser}
import com.j256.ormlite.dao.Dao
import de.tobias.playpad.server.account
import de.tobias.playpad.server.account.Account
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
import io.github.classgraph.ClassGraph
import org.eclipse.jetty.websocket.api.Session
import org.eclipse.jetty.websocket.api.annotations.{OnWebSocketClose, OnWebSocketConnect, OnWebSocketMessage, WebSocket}
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 cc38412..86cb7bc 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
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
/**
* Created by tobias on 19.02.17.
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 caf05f0..8167400 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
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef._
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef._
/**
* Created by tobias on 19.02.17.
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 79bbbd0..163528a 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
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
/**
* Created by tobias on 19.02.17.
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 89d1ca4..3c4d74f 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
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
/**
* Created by tobias on 19.02.17.
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 8c6cf3f..9173e5e 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
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
/**
* Created by tobias on 19.02.17.
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 860eac4..ab528e1 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
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
/**
* Created by tobias on 19.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/settings/PadSettingsAddListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/settings/PadSettingsAddListener.scala
index 0e53a76..99ec1ea 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/settings/PadSettingsAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/settings/PadSettingsAddListener.scala
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
@SyncListener("pad-settings-add")
class PadSettingsAddListener extends Listener {
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/settings/PadSettingsUpdateListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/settings/PadSettingsUpdateListener.scala
index d23f15a..dc3585f 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/settings/PadSettingsUpdateListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/settings/PadSettingsUpdateListener.scala
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
@SyncListener("pad-settings-update")
class PadSettingsUpdateListener extends Listener {
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 f2fee8f..f4df6a1 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
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
/**
* Created by tobias on 19.02.17.
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 a4497db..ca42900 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
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
/**
* Created by tobias on 19.02.17.
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 45699b6..6b067c1 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
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
/**
* Created by tobias on 19.02.17.
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 60493fb..fe85bbd 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
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
/**
* Created by tobias on 19.02.17.
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 4bfe43f..8a4d54a 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
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
/**
* Created by tobias on 19.02.17.
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 bc0b81a..8ec793d 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
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
/**
* Created by tobias on 19.02.17.
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 d11853b..133fdab 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
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
/**
* Created by tobias on 19.02.17.
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 8db8133..7b8957d 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
@@ -5,10 +5,10 @@ import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
-import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+import de.tobias.playpad.server.sql.SqlDef
/**
* Created by tobias on 19.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/project/utils/SqlDef.scala b/src/main/scala/de/tobias/playpad/server/sql/SqlDef.scala
similarity index 95%
rename from src/main/scala/de/tobias/playpad/server/project/utils/SqlDef.scala
rename to src/main/scala/de/tobias/playpad/server/sql/SqlDef.scala
index bf19db5..a33ce10 100644
--- a/src/main/scala/de/tobias/playpad/server/project/utils/SqlDef.scala
+++ b/src/main/scala/de/tobias/playpad/server/sql/SqlDef.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.project.utils
+package de.tobias.playpad.server.sql
/**
* Created by tobias on 17.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/project/loader/sql/DesignLoader.scala b/src/main/scala/de/tobias/playpad/server/sql/loader/DesignLoader.scala
similarity index 82%
rename from src/main/scala/de/tobias/playpad/server/project/loader/sql/DesignLoader.scala
rename to src/main/scala/de/tobias/playpad/server/sql/loader/DesignLoader.scala
index 20872cc..076b56d 100644
--- a/src/main/scala/de/tobias/playpad/server/project/loader/sql/DesignLoader.scala
+++ b/src/main/scala/de/tobias/playpad/server/sql/loader/DesignLoader.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.project.loader.sql
+package de.tobias.playpad.server.sql.loader
import java.sql.Connection
import java.util.UUID
-import de.tobias.playpad.server.project.utils.SqlDef._
-import de.tobias.playpad.server.project.{Design, Pad}
+import de.tobias.playpad.server.model.project.{Design, Pad}
+import de.tobias.playpad.server.sql.SqlDef._
/**
* Created by tobias on 23.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/project/loader/sql/PadLoader.scala b/src/main/scala/de/tobias/playpad/server/sql/loader/PadLoader.scala
similarity index 85%
rename from src/main/scala/de/tobias/playpad/server/project/loader/sql/PadLoader.scala
rename to src/main/scala/de/tobias/playpad/server/sql/loader/PadLoader.scala
index 4976e6a..6ab9c22 100644
--- a/src/main/scala/de/tobias/playpad/server/project/loader/sql/PadLoader.scala
+++ b/src/main/scala/de/tobias/playpad/server/sql/loader/PadLoader.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.project.loader.sql
+package de.tobias.playpad.server.sql.loader
import java.sql.Connection
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.model.project.{Pad, Page}
+import de.tobias.playpad.server.sql.SqlDef._
/**
* Created by tobias on 17.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/project/loader/sql/PageLoader.scala b/src/main/scala/de/tobias/playpad/server/sql/loader/PageLoader.scala
similarity index 82%
rename from src/main/scala/de/tobias/playpad/server/project/loader/sql/PageLoader.scala
rename to src/main/scala/de/tobias/playpad/server/sql/loader/PageLoader.scala
index 2dab58e..e7f9668 100644
--- a/src/main/scala/de/tobias/playpad/server/project/loader/sql/PageLoader.scala
+++ b/src/main/scala/de/tobias/playpad/server/sql/loader/PageLoader.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.project.loader.sql
+package de.tobias.playpad.server.sql.loader
import java.sql.Connection
import java.util.UUID
-import de.tobias.playpad.server.project.utils.SqlDef._
-import de.tobias.playpad.server.project.{Page, Project}
+import de.tobias.playpad.server.model.project.{Page, Project}
+import de.tobias.playpad.server.sql.SqlDef._
/**
* Created by tobias on 17.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/project/loader/sql/PathLoader.scala b/src/main/scala/de/tobias/playpad/server/sql/loader/PathLoader.scala
similarity index 81%
rename from src/main/scala/de/tobias/playpad/server/project/loader/sql/PathLoader.scala
rename to src/main/scala/de/tobias/playpad/server/sql/loader/PathLoader.scala
index fd12784..51866de 100644
--- a/src/main/scala/de/tobias/playpad/server/project/loader/sql/PathLoader.scala
+++ b/src/main/scala/de/tobias/playpad/server/sql/loader/PathLoader.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.project.loader.sql
+package de.tobias.playpad.server.sql.loader
import java.sql.Connection
import java.util.UUID
-import de.tobias.playpad.server.project.utils.SqlDef._
-import de.tobias.playpad.server.project.{Pad, Path}
+import de.tobias.playpad.server.model.project.{Pad, Path}
+import de.tobias.playpad.server.sql.SqlDef._
/**
* Created by tobias on 20.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/project/loader/sql/ProjectLoader.scala b/src/main/scala/de/tobias/playpad/server/sql/loader/ProjectLoader.scala
similarity index 93%
rename from src/main/scala/de/tobias/playpad/server/project/loader/sql/ProjectLoader.scala
rename to src/main/scala/de/tobias/playpad/server/sql/loader/ProjectLoader.scala
index 920914a..d82b49a 100644
--- a/src/main/scala/de/tobias/playpad/server/project/loader/sql/ProjectLoader.scala
+++ b/src/main/scala/de/tobias/playpad/server/sql/loader/ProjectLoader.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.project.loader.sql
+package de.tobias.playpad.server.sql.loader
import java.sql.Connection
import java.util.UUID
-import de.tobias.playpad.server.project.Project
-import de.tobias.playpad.server.project.utils.SqlDef._
+import de.tobias.playpad.server.model.project.Project
+import de.tobias.playpad.server.sql.SqlDef._
/**
* Created by tobias on 17.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/project/saver/sql/DesignSaver.scala b/src/main/scala/de/tobias/playpad/server/sql/saver/DesignSaver.scala
similarity index 76%
rename from src/main/scala/de/tobias/playpad/server/project/saver/sql/DesignSaver.scala
rename to src/main/scala/de/tobias/playpad/server/sql/saver/DesignSaver.scala
index e23db0b..aa14357 100644
--- a/src/main/scala/de/tobias/playpad/server/project/saver/sql/DesignSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/sql/saver/DesignSaver.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.project.saver.sql
+package de.tobias.playpad.server.sql.saver
import java.sql.Connection
-import de.tobias.playpad.server.project.Design
-import de.tobias.playpad.server.project.utils.SqlDef._
+import de.tobias.playpad.server.model.project.Design
import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.sql.SqlDef._
/**
* Created by tobias on 23.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/project/saver/sql/PadSaver.scala b/src/main/scala/de/tobias/playpad/server/sql/saver/PadSaver.scala
similarity index 83%
rename from src/main/scala/de/tobias/playpad/server/project/saver/sql/PadSaver.scala
rename to src/main/scala/de/tobias/playpad/server/sql/saver/PadSaver.scala
index aea6cf8..8dcfa04 100644
--- a/src/main/scala/de/tobias/playpad/server/project/saver/sql/PadSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/sql/saver/PadSaver.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.project.saver.sql
+package de.tobias.playpad.server.sql.saver
import java.sql.Connection
-import de.tobias.playpad.server.project.Pad
-import de.tobias.playpad.server.project.utils.SqlDef._
+import de.tobias.playpad.server.model.project.Pad
import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.sql.SqlDef._
/**
* Created by tobias on 17.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/project/saver/sql/PageSaver.scala b/src/main/scala/de/tobias/playpad/server/sql/saver/PageSaver.scala
similarity index 77%
rename from src/main/scala/de/tobias/playpad/server/project/saver/sql/PageSaver.scala
rename to src/main/scala/de/tobias/playpad/server/sql/saver/PageSaver.scala
index 6e88cda..4400703 100644
--- a/src/main/scala/de/tobias/playpad/server/project/saver/sql/PageSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/sql/saver/PageSaver.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.project.saver.sql
+package de.tobias.playpad.server.sql.saver
import java.sql.Connection
-import de.tobias.playpad.server.project.Page
-import de.tobias.playpad.server.project.utils.SqlDef._
+import de.tobias.playpad.server.model.project.Page
import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.sql.SqlDef._
/**
* Created by tobias on 17.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/project/saver/sql/PathSaver.scala b/src/main/scala/de/tobias/playpad/server/sql/saver/PathSaver.scala
similarity index 70%
rename from src/main/scala/de/tobias/playpad/server/project/saver/sql/PathSaver.scala
rename to src/main/scala/de/tobias/playpad/server/sql/saver/PathSaver.scala
index c7f2092..1ee0d9c 100644
--- a/src/main/scala/de/tobias/playpad/server/project/saver/sql/PathSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/sql/saver/PathSaver.scala
@@ -1,10 +1,10 @@
-package de.tobias.playpad.server.project.saver.sql
+package de.tobias.playpad.server.sql.saver
import java.sql.Connection
-import de.tobias.playpad.server.project.Path
-import de.tobias.playpad.server.project.utils.SqlDef._
+import de.tobias.playpad.server.model.project.Path
import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.sql.SqlDef._
/**
* Created by tobias on 20.02.17.
diff --git a/src/main/scala/de/tobias/playpad/server/project/saver/sql/ProjectSaver.scala b/src/main/scala/de/tobias/playpad/server/sql/saver/ProjectSaver.scala
similarity index 79%
rename from src/main/scala/de/tobias/playpad/server/project/saver/sql/ProjectSaver.scala
rename to src/main/scala/de/tobias/playpad/server/sql/saver/ProjectSaver.scala
index 10e7cd6..0415e41 100644
--- a/src/main/scala/de/tobias/playpad/server/project/saver/sql/ProjectSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/sql/saver/ProjectSaver.scala
@@ -1,11 +1,11 @@
-package de.tobias.playpad.server.project.saver.sql
+package de.tobias.playpad.server.sql.saver
import java.sql.Connection
import java.util.UUID
-import de.tobias.playpad.server.project.Project
-import de.tobias.playpad.server.project.utils.SqlDef._
+import de.tobias.playpad.server.model.project.Project
import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.sql.SqlDef._
/**
* Created by tobias on 17.02.17.
--
GitLab