Refactor project related classes

src/main/scala/de/tobias/playpad/server/project/Design.scala → src/main/scala/de/tobias/playpad/server/model/project/Design.scala

-package de.tobias.playpad.server.project
+package de.tobias.playpad.server.model.project
 
 import java.util.UUID
 

src/main/scala/de/tobias/playpad/server/project/Pad.scala → src/main/scala/de/tobias/playpad/server/model/project/Pad.scala

-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._
 
 /**

src/main/scala/de/tobias/playpad/server/project/Page.scala → src/main/scala/de/tobias/playpad/server/model/project/Page.scala

-package de.tobias.playpad.server.project
+package de.tobias.playpad.server.model.project
 
 import java.util.UUID
 

src/main/scala/de/tobias/playpad/server/project/Path.scala → src/main/scala/de/tobias/playpad/server/model/project/Path.scala

-package de.tobias.playpad.server.project
+package de.tobias.playpad.server.model.project
 
 import java.util.UUID
 

src/main/scala/de/tobias/playpad/server/project/Project.scala → src/main/scala/de/tobias/playpad/server/model/project/Project.scala

-package de.tobias.playpad.server.project
+package de.tobias.playpad.server.model.project
 
 import java.util.UUID
 

src/main/scala/de/tobias/playpad/server/project/settings/Fade.scala → src/main/scala/de/tobias/playpad/server/model/project/settings/Fade.scala

-package de.tobias.playpad.server.project.settings
+package de.tobias.playpad.server.model.project.settings
 
 import java.time.Duration
 import java.util.UUID

src/main/scala/de/tobias/playpad/server/project/settings/PadSettings.scala → src/main/scala/de/tobias/playpad/server/model/project/settings/PadSettings.scala

-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 {

src/main/scala/de/tobias/playpad/server/project/utils/JsonDef.scala

-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"
-
-}

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}
 
 /**

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}
 

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}
 
 /**

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}
 
 /**

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}
 

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}

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.

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.

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.

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.

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.

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.