diff --git a/pom.xml b/pom.xml index ce3fbc01a3478d96e70464f9a63cfec445c34e2e..4fba32841c030ab5cc591247549f29f4869b356e 100644 --- a/pom.xml +++ b/pom.xml @@ -7,14 +7,76 @@ <groupId>de.tobias</groupId> <artifactId>playwall-server</artifactId> <version>1.0-SNAPSHOT</version> + + <properties> + <java-version>1.8</java-version> + + <scala-library.version>[2.13.0,)</scala-library.version> + + <spark-core.version>[2.9.0,)</spark-core.version> + <logback-classic.version>[1.2.3,)</logback-classic.version> + + <ormlite-jdbc.version>5.1</ormlite-jdbc.version> + <ormlite-core.version>5.1</ormlite-core.version> + + <junit.version>4.12</junit.version> + </properties> + + <dependencies> + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + <version>${scala-library.version}</version> + </dependency> + + <dependency> + <groupId>com.sparkjava</groupId> + <artifactId>spark-core</artifactId> + <version>${spark-core.version}</version> + </dependency> + + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + <version>${logback-classic.version}</version> + </dependency> + <dependency> + <groupId>com.j256.ormlite</groupId> + <artifactId>ormlite-core</artifactId> + <version>${ormlite-core.version}</version> + </dependency> + <dependency> + <groupId>com.j256.ormlite</groupId> + <artifactId>ormlite-jdbc</artifactId> + <version>${ormlite-jdbc.version}</version> + </dependency> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>6.0.5</version> + </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>LATEST</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.8</source> - <target>1.8</target> + <source>${java-version}</source> + <target>${java-version}</target> </configuration> </plugin> <plugin> @@ -82,56 +144,4 @@ </snapshots> </repository> </repositories> - - <dependencies> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - <version>2.12.4</version> - </dependency> - - <dependency> - <groupId>com.sparkjava</groupId> - <artifactId>spark-core</artifactId> - <version>2.6.0</version> - </dependency> - <dependency> - <groupId>com.sparkjava</groupId> - <artifactId>spark-debug-tools</artifactId> - <version>0.5</version> - </dependency> - - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <version>1.0.13</version> - </dependency> - <dependency> - <groupId>com.j256.ormlite</groupId> - <artifactId>ormlite-core</artifactId> - <version>5.0</version> - </dependency> - <dependency> - <groupId>com.j256.ormlite</groupId> - <artifactId>ormlite-jdbc</artifactId> - <version>5.0</version> - </dependency> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>6.0.5</version> - </dependency> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>LATEST</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> - </dependency> - </dependencies> </project> \ No newline at end of file diff --git a/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala b/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala index 45134dadd1f8e4330535fad2895fef0e8908457f..7ccf1bd7570d953e32ea4d4671b63c7c0e4abc60 100644 --- a/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala +++ b/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala @@ -1,5 +1,8 @@ package de.tobias.playpad.server +import java.nio.file.{Files, Paths} +import java.sql.DriverManager + import com.j256.ormlite.dao.{Dao, DaoManager} import com.j256.ormlite.jdbc.JdbcConnectionSource import com.j256.ormlite.table.TableUtils 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 cdbe74a38d8e16fd416bd1fc165da825135c8b31..8fa36fb2284fd22b9049e127c52c69cc1ead828e 100644 --- a/src/main/scala/de/tobias/playpad/server/account/Session.scala +++ b/src/main/scala/de/tobias/playpad/server/account/Session.scala @@ -1,5 +1,7 @@ package de.tobias.playpad.server.account +import java.sql.Date + import com.j256.ormlite.dao.Dao import com.j256.ormlite.field.DatabaseField import com.j256.ormlite.table.DatabaseTable 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 8a46f3f92a3bbf4396a0268cba90265f3cb93455..8b10f50166495b31d9dab68e4b5e6bf15eb67c5c 100644 --- a/src/main/scala/de/tobias/playpad/server/json/DurationSerializerHandler.scala +++ b/src/main/scala/de/tobias/playpad/server/json/DurationSerializerHandler.scala @@ -1,6 +1,7 @@ package de.tobias.playpad.server.json 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/json/JsonSerializer.scala b/src/main/scala/de/tobias/playpad/server/json/JsonSerializer.scala index af1d27415b2dd75805dcc095bb5e9e73ac0d9e2d..5683ddecad638f5740c569df06c1c2713397f7c0 100644 --- a/src/main/scala/de/tobias/playpad/server/json/JsonSerializer.scala +++ b/src/main/scala/de/tobias/playpad/server/json/JsonSerializer.scala @@ -1,5 +1,7 @@ package de.tobias.playpad.server.json +import java.util + import com.google.gson.{JsonArray, JsonObject} class JsonSerializer { diff --git a/src/main/scala/de/tobias/playpad/server/json/UUIDSerializerHandler.scala b/src/main/scala/de/tobias/playpad/server/json/UUIDSerializerHandler.scala index 8e7d116ba6929e38b6cfbcdc59399fc2a5f2f3a9..51afb490a9e08ab75e60dee6d38392bb15229fad 100644 --- a/src/main/scala/de/tobias/playpad/server/json/UUIDSerializerHandler.scala +++ b/src/main/scala/de/tobias/playpad/server/json/UUIDSerializerHandler.scala @@ -1,5 +1,7 @@ package de.tobias.playpad.server.json +import java.util.UUID + import com.google.gson.{JsonElement, JsonPrimitive} class UUIDSerializerHandler extends SerializerHandler { 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 f79d8116e54ddad69fd12251004fa2a0c760bc12..6f372cdeed5c23fca4f805be7c8a586f56fa6384 100644 --- a/src/main/scala/de/tobias/playpad/server/project/Design.scala +++ b/src/main/scala/de/tobias/playpad/server/project/Design.scala @@ -1,5 +1,7 @@ package de.tobias.playpad.server.project +import java.util.UUID + import de.tobias.playpad.server.json.{JsonName, JsonParent, 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 ab87172fb2a01d53596e7fd8dc51eb01ff779dc8..555bacb059a33f9562e96602c13923668a72f63c 100644 --- a/src/main/scala/de/tobias/playpad/server/project/Pad.scala +++ b/src/main/scala/de/tobias/playpad/server/project/Pad.scala @@ -1,5 +1,7 @@ package de.tobias.playpad.server.project +import java.util.UUID + import de.tobias.playpad.server.json._ import de.tobias.playpad.server.project.settings.PadSettings import de.tobias.playpad.server.sql.{ColumnName, ForeignKey, Id, Table} 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 55d8b0d01895aaceb69362c022b40dcdc69a2688..fb9aeacac6f9d288811240c3c648ddf6789e8668 100644 --- a/src/main/scala/de/tobias/playpad/server/project/Page.scala +++ b/src/main/scala/de/tobias/playpad/server/project/Page.scala @@ -1,5 +1,7 @@ package de.tobias.playpad.server.project +import java.util.UUID + import de.tobias.playpad.server.json._ /** 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 303523813c16d520492512301b2445f4b0ea4b66..4aaca1e070fca3e7cd8050d14e453e759cf95ecb 100644 --- a/src/main/scala/de/tobias/playpad/server/project/Path.scala +++ b/src/main/scala/de/tobias/playpad/server/project/Path.scala @@ -1,5 +1,7 @@ package de.tobias.playpad.server.project +import java.util.UUID + import de.tobias.playpad.server.json.{JsonName, JsonParent, 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 8a68f49fb4ed8a7d82aed045eb8094ec34ee4607..e7fde48bfc0953215248a3788084cb2578685fd9 100644 --- a/src/main/scala/de/tobias/playpad/server/project/Project.scala +++ b/src/main/scala/de/tobias/playpad/server/project/Project.scala @@ -1,5 +1,7 @@ package de.tobias.playpad.server.project +import java.util.UUID + import de.tobias.playpad.server.json.{JsonCollection, JsonName, 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 e1584c539243d58f1b530966e09686c50a2a4db6..20872ccc0e2a5b7f6568473da5d9eddd6ca9bbb6 100644 --- a/src/main/scala/de/tobias/playpad/server/project/loader/sql/DesignLoader.scala +++ b/src/main/scala/de/tobias/playpad/server/project/loader/sql/DesignLoader.scala @@ -1,5 +1,8 @@ package de.tobias.playpad.server.project.loader.sql +import java.sql.Connection +import java.util.UUID + import de.tobias.playpad.server.project.utils.SqlDef._ import de.tobias.playpad.server.project.{Design, Pad} 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 5e4f8092a9e6f8181fd9cbcdc5c7f2f72f152a80..c4318534056bba6874331cd8cf71b6e880c82236 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 @@ -1,5 +1,8 @@ package de.tobias.playpad.server.project.loader.sql +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.sql.SqlSerializer 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 f483961ac36f98f62761b405a9f84a2ad20a23ec..2dab58e0bce4f03b029edf3e1e77675cf7d032aa 100644 --- a/src/main/scala/de/tobias/playpad/server/project/loader/sql/PageLoader.scala +++ b/src/main/scala/de/tobias/playpad/server/project/loader/sql/PageLoader.scala @@ -1,5 +1,8 @@ package de.tobias.playpad.server.project.loader.sql +import java.sql.Connection +import java.util.UUID + import de.tobias.playpad.server.project.utils.SqlDef._ import de.tobias.playpad.server.project.{Page, Project} 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 87c6e860f7a1802e49194f24affd5b9e15a8aee7..fd1278432f9432952e1db1a97d74e5b58f9e70aa 100644 --- a/src/main/scala/de/tobias/playpad/server/project/loader/sql/PathLoader.scala +++ b/src/main/scala/de/tobias/playpad/server/project/loader/sql/PathLoader.scala @@ -1,5 +1,8 @@ package de.tobias.playpad.server.project.loader.sql +import java.sql.Connection +import java.util.UUID + import de.tobias.playpad.server.project.utils.SqlDef._ import de.tobias.playpad.server.project.{Pad, Path} 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 c33dbc4a943d727a0339addcb7cc3ea4b67188e2..920914a7488b7840cdaf078f95aa4308102a94fb 100644 --- a/src/main/scala/de/tobias/playpad/server/project/loader/sql/ProjectLoader.scala +++ b/src/main/scala/de/tobias/playpad/server/project/loader/sql/ProjectLoader.scala @@ -1,5 +1,8 @@ package de.tobias.playpad.server.project.loader.sql +import java.sql.Connection +import java.util.UUID + import de.tobias.playpad.server.project.Project import de.tobias.playpad.server.project.utils.SqlDef._ 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 a72daee8ef825ef92c2ba9db4ad1217eda942e53..e23db0b4bc91974d0b44334acfbf203f35930d57 100644 --- a/src/main/scala/de/tobias/playpad/server/project/saver/sql/DesignSaver.scala +++ b/src/main/scala/de/tobias/playpad/server/project/saver/sql/DesignSaver.scala @@ -1,5 +1,7 @@ package de.tobias.playpad.server.project.saver.sql +import java.sql.Connection + import de.tobias.playpad.server.project.Design import de.tobias.playpad.server.project.utils.SqlDef._ import de.tobias.playpad.server.server.SqlHelper 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 0d7a2dccdbd98debd6d628cf8f43892934b26c70..aea6cf82aefcd7ebe76fa4d06e9a20e068145963 100644 --- a/src/main/scala/de/tobias/playpad/server/project/saver/sql/PadSaver.scala +++ b/src/main/scala/de/tobias/playpad/server/project/saver/sql/PadSaver.scala @@ -1,5 +1,7 @@ package de.tobias.playpad.server.project.saver.sql +import java.sql.Connection + import de.tobias.playpad.server.project.Pad import de.tobias.playpad.server.project.utils.SqlDef._ import de.tobias.playpad.server.server.SqlHelper 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 f2fe852db4ba9b0d18d8a26870557bbd797bb73d..6e88cda1d0ccaab58dffdf156e5be039c39bd96f 100644 --- a/src/main/scala/de/tobias/playpad/server/project/saver/sql/PageSaver.scala +++ b/src/main/scala/de/tobias/playpad/server/project/saver/sql/PageSaver.scala @@ -1,5 +1,7 @@ package de.tobias.playpad.server.project.saver.sql +import java.sql.Connection + import de.tobias.playpad.server.project.Page import de.tobias.playpad.server.project.utils.SqlDef._ import de.tobias.playpad.server.server.SqlHelper 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 c3f412e4c664a8ab390933c9303ebcc783a2afa0..c7f209222ebd19216e6d1d79351997140883cd72 100644 --- a/src/main/scala/de/tobias/playpad/server/project/saver/sql/PathSaver.scala +++ b/src/main/scala/de/tobias/playpad/server/project/saver/sql/PathSaver.scala @@ -1,5 +1,7 @@ package de.tobias.playpad.server.project.saver.sql +import java.sql.Connection + import de.tobias.playpad.server.project.Path import de.tobias.playpad.server.project.utils.SqlDef._ import de.tobias.playpad.server.server.SqlHelper 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 d5443fd578a480edfad8e3904f101f06aa02753b..10e7cd6af13447dc98dad464bf6ff444088f765f 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 @@ -1,5 +1,8 @@ package de.tobias.playpad.server.project.saver.sql +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.server.SqlHelper 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 4543900c79abcc9d2c1a32688b2d290e8692cc8a..2aa834fbc44ee06e3d3ea786722c26fee9e48e4b 100644 --- a/src/main/scala/de/tobias/playpad/server/project/settings/Fade.scala +++ b/src/main/scala/de/tobias/playpad/server/project/settings/Fade.scala @@ -1,6 +1,9 @@ package de.tobias.playpad.server.project.settings +import java.util.UUID + 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 45f681c7240f4880be0f1e9af0ca74c109ae864d..f6564b58d9d707bf748c031594e754bb9078f869 100644 --- a/src/main/scala/de/tobias/playpad/server/project/settings/PadSettings.scala +++ b/src/main/scala/de/tobias/playpad/server/project/settings/PadSettings.scala @@ -1,7 +1,10 @@ package de.tobias.playpad.server.project.settings +import java.util.UUID + 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/server/SqlHelper.scala b/src/main/scala/de/tobias/playpad/server/server/SqlHelper.scala index ae2ea703408006f0700fb16350d28416e91f1049..6a397c4e53a084bd51b2466f53efe96608f666ab 100644 --- a/src/main/scala/de/tobias/playpad/server/server/SqlHelper.scala +++ b/src/main/scala/de/tobias/playpad/server/server/SqlHelper.scala @@ -1,5 +1,9 @@ package de.tobias.playpad.server.server +import java.sql.Types.NULL +import java.sql.{Connection, PreparedStatement} +import java.util.UUID + /** * Created by tobias on 17.02.17. */ 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 2b5825823da28d1d4b46f3c9a39b6d746ef13e3a..1334f045eb65207f198269cbd64e2a2cd554a8a4 100644 --- a/src/main/scala/de/tobias/playpad/server/server/account/AccountPost.scala +++ b/src/main/scala/de/tobias/playpad/server/server/account/AccountPost.scala @@ -1,5 +1,7 @@ package de.tobias.playpad.server.server.account +import java.sql.SQLException + import com.j256.ormlite.dao.Dao import de.tobias.playpad.server.account.Account import de.tobias.playpad.server.server.{Result, Status} 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 f3e044fc7409162ecc5f80fd8801ec964d57123d..92658be25fcae617562c790378e585a4534e580d 100644 --- a/src/main/scala/de/tobias/playpad/server/server/account/AccountPut.scala +++ b/src/main/scala/de/tobias/playpad/server/server/account/AccountPut.scala @@ -1,5 +1,7 @@ package de.tobias.playpad.server.server.account +import java.sql.SQLException + import com.j256.ormlite.dao.Dao import de.tobias.playpad.server.account.Account import de.tobias.playpad.server.server.{Result, Status} 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 76756675089ddeb23fdee53a022942a60b4766b9..7a5d4739ff5799ef9b951c5db05934a4ba1db773 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectDelete.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/ProjectDelete.scala @@ -1,5 +1,8 @@ package de.tobias.playpad.server.server.project +import java.sql.Connection +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 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 c1ab86e2641bffb2de267c3be05bc47439d4d752..0c14a84f2791581bdf8165ab8084e60896bc3782 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectGet.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/ProjectGet.scala @@ -1,5 +1,8 @@ package de.tobias.playpad.server.server.project +import java.sql.Connection +import java.util.UUID + import com.j256.ormlite.dao.Dao import de.tobias.playpad.server.account.Session import de.tobias.playpad.server.json.JsonSerializer 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 194a20a3b633a5f89fc2945f9f766c977596269c..8a6d0fdeec3a01be51ed22dc7978cd286d91584b 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectHandler.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/ProjectHandler.scala @@ -1,5 +1,7 @@ package de.tobias.playpad.server.server.project +import java.sql.Connection + import com.google.gson.{JsonObject, JsonParser} import com.j256.ormlite.dao.Dao import de.tobias.playpad.server.account 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 1bcf449c99bfd93c5ed0c010729e29702acb7643..b6ec86789149e392a69f02445b124a1e8155dded 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectList.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/ProjectList.scala @@ -1,5 +1,7 @@ package de.tobias.playpad.server.server.project +import java.sql.Connection + import com.google.gson.{JsonArray, JsonObject} import com.j256.ormlite.dao.Dao import de.tobias.playpad.server.account.Session 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 713cc25ecac9bbf3a556e37362f8d0a554d9cc4d..3f9426a253f6a42f315e39503df7874e29e52b56 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectModificationGet.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/ProjectModificationGet.scala @@ -1,5 +1,7 @@ package de.tobias.playpad.server.server.project +import java.sql.Connection + import com.google.gson.{JsonArray, JsonObject} import com.j256.ormlite.dao.Dao import de.tobias.playpad.server.account.Session 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 28ddff0583218fc49ab850034f2ae6b790f9493f..71eff6b136cbb2dcfa8d7697c22735f7fd8dd35e 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectPost.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/ProjectPost.scala @@ -1,5 +1,7 @@ package de.tobias.playpad.server.server.project +import java.sql.Connection + import com.google.gson.JsonParser import com.j256.ormlite.dao.Dao import de.tobias.playpad.server.account.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 17fc4c2e1ca30e7284453b4038ddf5be3730b3f5..a6b1867b7667ce6b974a1cf29fe78184fc853acb 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/listener/CollectionAddListener.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/listener/CollectionAddListener.scala @@ -1,5 +1,8 @@ package de.tobias.playpad.server.server.project.listener +import java.sql.Connection +import java.util.UUID + import com.google.gson.{JsonArray, JsonElement, JsonObject} import de.tobias.playpad.server.server.SqlHelper 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 13772d7016806acc87969b2d780f50026a0ef1ea..202f36e1a860b7137e2d61499a041c6daa326f6d 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/listener/CollectionRemoveListener.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/listener/CollectionRemoveListener.scala @@ -1,5 +1,8 @@ package de.tobias.playpad.server.server.project.listener +import java.sql.Connection +import java.util.UUID + import com.google.gson.JsonObject import de.tobias.playpad.server.server.SqlHelper 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 70c1591407ef6dd39f4baa0cf7ba2d468533a021..d964ed1a29329bcd3e45a0907f4ca1d057257d0e 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/listener/Listener.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/listener/Listener.scala @@ -1,5 +1,7 @@ package de.tobias.playpad.server.server.project.listener +import java.sql.Connection + import com.google.gson.JsonObject /** 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 759e22178450bd4e24cbdd45f8000a8388843161..5222d5d5e4dcbc3f640846327863dcae5e748e9a 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,5 +1,8 @@ package de.tobias.playpad.server.server.project.listener +import java.sql.Connection +import java.util.UUID + import com.google.gson.JsonObject import de.tobias.playpad.server.server.SqlHelper 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 63f6cd52db7d9183f70e1e8b5aff25ce29a053a4..3b476a2987c944c19460b59ddda29f595191c3cd 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala @@ -1,5 +1,8 @@ package de.tobias.playpad.server.server.project.sync +import java.sql.Connection +import java.util.UUID + import com.google.gson.{JsonObject, JsonParser} import com.j256.ormlite.dao.Dao import de.tobias.playpad.server.account 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 9407abf69231deab0f0ee7ee067a7ce3f078a3ed..3693666f3fad5d583db4da99ced9f0923b8d6ce6 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/Listener.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/Listener.scala @@ -1,5 +1,7 @@ package de.tobias.playpad.server.server.project.sync.listener +import java.sql.Connection + import com.google.gson.JsonObject import de.tobias.playpad.server.account.Session 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 f92516711e36956a79ca86c6f85d0c3b8db83ac4..c9d8a29818bb6b6191bbc741c2afcb2a703fd02a 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignAddListener.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignAddListener.scala @@ -1,5 +1,8 @@ package de.tobias.playpad.server.server.project.sync.listener.design +import java.sql.Connection +import java.util.UUID + import com.google.gson.JsonObject import de.tobias.playpad.server.account.Session import de.tobias.playpad.server.project.utils.SqlDef 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 1ca60dd3305862ec041a54d008691650d869d5c7..7051119f21d2ee2b296a249304df988ff48b1714 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignUpdateListener.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignUpdateListener.scala @@ -1,5 +1,8 @@ package de.tobias.playpad.server.server.project.sync.listener.design +import java.sql.Connection +import java.util.UUID + import com.google.gson.JsonObject import de.tobias.playpad.server.account.Session import de.tobias.playpad.server.project.utils.SqlDef._ 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 440c5ac4a1f85bd449de5ad7860cc3cc202587df..42c9fa13c98107a251901b1a2fb31904ce8e829a 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadAddListener.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadAddListener.scala @@ -1,5 +1,8 @@ package de.tobias.playpad.server.server.project.sync.listener.pad +import java.sql.Connection +import java.util.UUID + import com.google.gson.JsonObject import de.tobias.playpad.server.account.Session import de.tobias.playpad.server.project.utils.SqlDef 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 b2260cda32b2d7449c2716c125a04dd662deb533..cb27b921454b6f1ec47391828e8de2620eafe49f 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadClearListener.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadClearListener.scala @@ -1,5 +1,8 @@ package de.tobias.playpad.server.server.project.sync.listener.pad +import java.sql.Connection +import java.util.UUID + import com.google.gson.JsonObject import de.tobias.playpad.server.account.Session import de.tobias.playpad.server.project.utils.SqlDef 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 1f8cea293bbe8a40ea631bc6ba70510dcd12d51c..3c2e49c9f4291f72f0c660c973548e557e45a763 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadRemoveListener.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadRemoveListener.scala @@ -1,5 +1,8 @@ package de.tobias.playpad.server.server.project.sync.listener.pad +import java.sql.Connection +import java.util.UUID + import com.google.gson.JsonObject import de.tobias.playpad.server.account.Session import de.tobias.playpad.server.project.utils.SqlDef 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 9fdd71e53d6b0a93fa813c7b22a3962d3acdd6be..29a12023dae12c8152acf4fdf5dc54b1b66083b0 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadUpdateListener.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadUpdateListener.scala @@ -1,5 +1,8 @@ package de.tobias.playpad.server.server.project.sync.listener.pad +import java.sql.Connection +import java.util.UUID + import com.google.gson.JsonObject import de.tobias.playpad.server.account.Session import de.tobias.playpad.server.project.utils.SqlDef 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 b71f2acb46a8fee619b9df130a5bd7db8fd1f662..bb389e10916db0ce6de3a25bb6844815b6a09aed 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 @@ -1,5 +1,8 @@ package de.tobias.playpad.server.server.project.sync.listener.pad.settings +import java.sql.Connection +import java.util.UUID + import com.google.gson.JsonObject import de.tobias.playpad.server.account.Session import de.tobias.playpad.server.project.utils.SqlDef 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 1b5b6cf982cb25ff8b2ee11be34e07734341c1e2..a1b9790a0d6f553c6b1d0fba57509aa8b3edfe50 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 @@ -1,5 +1,8 @@ package de.tobias.playpad.server.server.project.sync.listener.pad.settings +import java.sql.Connection +import java.util.UUID + import com.google.gson.JsonObject import de.tobias.playpad.server.account.Session import de.tobias.playpad.server.project.utils.SqlDef 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 844ef0d105370ee45916bb1c1e52b6f8d1454b46..9d3ac3bbd6940a953a4bbe828d2b052482d71f66 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageAddListener.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageAddListener.scala @@ -1,5 +1,8 @@ package de.tobias.playpad.server.server.project.sync.listener.page +import java.sql.Connection +import java.util.UUID + import com.google.gson.JsonObject import de.tobias.playpad.server.account.Session import de.tobias.playpad.server.project.utils.SqlDef 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 fffd98f4721333f40d96b25d48f5858bf664d832..81ffce2d20056e5de970b34e7299c63f0b7db611 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageRemoveListener.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageRemoveListener.scala @@ -1,5 +1,8 @@ package de.tobias.playpad.server.server.project.sync.listener.page +import java.sql.Connection +import java.util.UUID + import com.google.gson.JsonObject import de.tobias.playpad.server.account.Session import de.tobias.playpad.server.project.utils.SqlDef 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 7398f6286b8f381e884b5d342a7848b5d836be30..24c6234fce03d306b5c2c16ad24233abff06d7be 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageUpdateListener.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageUpdateListener.scala @@ -1,5 +1,8 @@ package de.tobias.playpad.server.server.project.sync.listener.page +import java.sql.Connection +import java.util.UUID + import com.google.gson.JsonObject import de.tobias.playpad.server.account.Session import de.tobias.playpad.server.project.utils.SqlDef 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 adedb18249ffefc666fcc424913cd65b0252f875..0d08ca24542dbb7ac9ba84ea0c4e69d372b02ff8 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathAddListener.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathAddListener.scala @@ -1,5 +1,8 @@ package de.tobias.playpad.server.server.project.sync.listener.path +import java.sql.Connection +import java.util.UUID + import com.google.gson.JsonObject import de.tobias.playpad.server.account.Session import de.tobias.playpad.server.project.utils.SqlDef 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 69304c8a240141bab35e964c7892054513c4cf7c..400c8ecbcb8a0d9eaf46bc424cccf9e0a6d6fc1f 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathRemoveListener.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathRemoveListener.scala @@ -1,5 +1,8 @@ package de.tobias.playpad.server.server.project.sync.listener.path +import java.sql.Connection +import java.util.UUID + import com.google.gson.JsonObject import de.tobias.playpad.server.account.Session import de.tobias.playpad.server.project.utils.SqlDef 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 422b81e6235ed4b48cce5a5b7b4f0e11f3c4ca2c..8e237c5e2deb541a06e1bda3ae808d42e6a92263 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectAddListener.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectAddListener.scala @@ -1,5 +1,8 @@ package de.tobias.playpad.server.server.project.sync.listener.project +import java.sql.Connection +import java.util.UUID + import com.google.gson.JsonObject import de.tobias.playpad.server.account.Session import de.tobias.playpad.server.project.utils.SqlDef 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 b9bdb8795670e991847cf6ddfdbdccf08db43127..c2edae2943ea860f49590d851956e134786ff090 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectRemoveListener.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectRemoveListener.scala @@ -1,5 +1,8 @@ package de.tobias.playpad.server.server.project.sync.listener.project +import java.sql.Connection +import java.util.UUID + import com.google.gson.JsonObject import de.tobias.playpad.server.account.Session import de.tobias.playpad.server.project.utils.SqlDef 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 d110c1283860f40dab68e616db8cf5096750e4b7..9c6242ed8bcccfe9a11e9635249dfe0dbe162bc2 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectUpdateListener.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectUpdateListener.scala @@ -1,5 +1,8 @@ package de.tobias.playpad.server.server.project.sync.listener.project +import java.sql.Connection +import java.util.UUID + import com.google.gson.JsonObject import de.tobias.playpad.server.account.Session import de.tobias.playpad.server.project.utils.SqlDef 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 56297a0a46ee811c9f15cbd9c1ac0f0e03eb3de5..4f9a581a6998e8e0fe07288f484d880dd837ba94 100644 --- a/src/main/scala/de/tobias/playpad/server/settings/PropertiesSettingsHandler.scala +++ b/src/main/scala/de/tobias/playpad/server/settings/PropertiesSettingsHandler.scala @@ -1,5 +1,10 @@ package de.tobias.playpad.server.settings +import java.io.IOException +import java.lang.reflect.Modifier +import java.nio.file.{Files, Path} +import java.util.Properties + /** * Created by tobias on 05.02.17. */ 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 149f697b4e2c1c736f496bad8fa69291a2d1c32e..36a4bdf1940a434f3f8504106f405a7a08a34884 100644 --- a/src/main/scala/de/tobias/playpad/server/settings/SettingsLoader.scala +++ b/src/main/scala/de/tobias/playpad/server/settings/SettingsLoader.scala @@ -1,5 +1,8 @@ package de.tobias.playpad.server.settings +import java.io.IOException +import java.nio.file.Path + /** * Created by tobias on 05.02.17. */ 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 af72f92533d782a06ae70e1048573065fb3297e1..27d37c3e1981264ccae53bc75c61b23e9f511d73 100644 --- a/src/main/scala/de/tobias/playpad/server/settings/SettingsSaver.scala +++ b/src/main/scala/de/tobias/playpad/server/settings/SettingsSaver.scala @@ -1,5 +1,8 @@ package de.tobias.playpad.server.settings +import java.io.IOException +import java.nio.file.Path + /** * Created by tobias on 05.02.17. */ diff --git a/src/main/scala/de/tobias/playpad/server/sql/SqlSerializer.scala b/src/main/scala/de/tobias/playpad/server/sql/SqlSerializer.scala index ecbdbfd734ab47c6ad352aeb46905b44539dfb04..f8f19832bf0c09e81f096513314a899971f5ba9a 100644 --- a/src/main/scala/de/tobias/playpad/server/sql/SqlSerializer.scala +++ b/src/main/scala/de/tobias/playpad/server/sql/SqlSerializer.scala @@ -1,5 +1,8 @@ package de.tobias.playpad.server.sql +import java.sql.{Connection, ResultSet} +import java.util.UUID + class SqlSerializer { def queryObj[T](clazz: Class[T], key: UUID, connection: Connection, keyName: String = null): T = { diff --git a/src/main/scala/de/tobias/playpad/server/sql/UUIDSqlResultHandler.scala b/src/main/scala/de/tobias/playpad/server/sql/UUIDSqlResultHandler.scala index 992ce203a0cb1c24f3e6582a1a994d2e61dbf900..f77c90de02ec03c6cc27c9a71fc793ce00cf28f7 100644 --- a/src/main/scala/de/tobias/playpad/server/sql/UUIDSqlResultHandler.scala +++ b/src/main/scala/de/tobias/playpad/server/sql/UUIDSqlResultHandler.scala @@ -1,5 +1,7 @@ package de.tobias.playpad.server.sql +import java.util.UUID + class UUIDSqlResultHandler extends SqlResultHandler { override def fromResult(o: Any): Any = { o match {