From 0e99bf3b80d90d9439cf682e849c9451b170abd6 Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Fri, 17 Feb 2017 20:29:38 +0100
Subject: [PATCH] Move project json saver classes
---
.../server/project/{server => saver}/json/PadSaver.scala | 2 +-
.../server/project/{server => saver}/json/PageSaver.scala | 2 +-
.../server/project/{server => saver}/json/ProjectSaver.scala | 2 +-
src/main/scala/de/tobias/playpad/server/server/SqlHelper.scala | 3 +--
.../de/tobias/playpad/server/server/project/ProjectGet.scala | 2 +-
5 files changed, 5 insertions(+), 6 deletions(-)
rename src/main/scala/de/tobias/playpad/server/project/{server => saver}/json/PadSaver.scala (89%)
rename src/main/scala/de/tobias/playpad/server/project/{server => saver}/json/PageSaver.scala (90%)
rename src/main/scala/de/tobias/playpad/server/project/{server => saver}/json/ProjectSaver.scala (90%)
diff --git a/src/main/scala/de/tobias/playpad/server/project/server/json/PadSaver.scala b/src/main/scala/de/tobias/playpad/server/project/saver/json/PadSaver.scala
similarity index 89%
rename from src/main/scala/de/tobias/playpad/server/project/server/json/PadSaver.scala
rename to src/main/scala/de/tobias/playpad/server/project/saver/json/PadSaver.scala
index eb94451..e375c89 100644
--- a/src/main/scala/de/tobias/playpad/server/project/server/json/PadSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/saver/json/PadSaver.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.project.server.json
+package de.tobias.playpad.server.project.saver.json
import com.google.gson.{JsonElement, JsonObject}
import de.tobias.playpad.server.project.Pad
diff --git a/src/main/scala/de/tobias/playpad/server/project/server/json/PageSaver.scala b/src/main/scala/de/tobias/playpad/server/project/saver/json/PageSaver.scala
similarity index 90%
rename from src/main/scala/de/tobias/playpad/server/project/server/json/PageSaver.scala
rename to src/main/scala/de/tobias/playpad/server/project/saver/json/PageSaver.scala
index b97cc42..8215b67 100644
--- a/src/main/scala/de/tobias/playpad/server/project/server/json/PageSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/saver/json/PageSaver.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.project.server.json
+package de.tobias.playpad.server.project.saver.json
import com.google.gson.{JsonArray, JsonElement, JsonObject}
import de.tobias.playpad.server.project.Page
diff --git a/src/main/scala/de/tobias/playpad/server/project/server/json/ProjectSaver.scala b/src/main/scala/de/tobias/playpad/server/project/saver/json/ProjectSaver.scala
similarity index 90%
rename from src/main/scala/de/tobias/playpad/server/project/server/json/ProjectSaver.scala
rename to src/main/scala/de/tobias/playpad/server/project/saver/json/ProjectSaver.scala
index 18e88a5..32d3772 100644
--- a/src/main/scala/de/tobias/playpad/server/project/server/json/ProjectSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/saver/json/ProjectSaver.scala
@@ -1,4 +1,4 @@
-package de.tobias.playpad.server.project.server.json
+package de.tobias.playpad.server.project.saver.json
import com.google.gson.{JsonArray, JsonObject}
import de.tobias.playpad.server.project.Project
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 0078188..b3973d7 100644
--- a/src/main/scala/de/tobias/playpad/server/server/SqlHelper.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/SqlHelper.scala
@@ -23,8 +23,7 @@ object SqlHelper {
}
private def createQuery[T](connection: Connection, table: String, field: String, value: T): PreparedStatement = {
- val sql = "INSERT INTO " + table + " (id, " + field + ") VALUES(?, ?) " +
- "ON DUPLICATE KEY UPDATE " + field + "=?"
+ val sql = "INSERT INTO %s (id, %s) VALUES(?, ?) ON DUPLICATE KEY UPDATE %s=?".format(table, field, field)
val preparedStatement = connection.prepareStatement(sql)
value match {
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 abf3dcf..ffb8684 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
@@ -6,7 +6,7 @@ import java.util.UUID
import com.j256.ormlite.dao.Dao
import de.tobias.playpad.server.account.Session
import de.tobias.playpad.server.project.loader.ProjectLoader
-import de.tobias.playpad.server.project.server.json.ProjectSaver
+import de.tobias.playpad.server.project.saver.json.ProjectSaver
import de.tobias.playpad.server.server.{Result, Status}
import spark.{Request, Response, Route}
--
GitLab