From 899d5bcd8d1420c07b389b99c83eac7fa7605158 Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Wed, 24 Jul 2019 20:22:23 +0200
Subject: [PATCH] Update libraries, fix import errors
---
pom.xml | 118 ++++++++++--------
.../tobias/playpad/server/PlayPadServer.scala | 3 +
.../playpad/server/account/Session.scala | 2 +
.../json/DurationSerializerHandler.scala | 1 +
.../playpad/server/json/JsonSerializer.scala | 2 +
.../server/json/UUIDSerializerHandler.scala | 2 +
.../playpad/server/project/Design.scala | 2 +
.../tobias/playpad/server/project/Pad.scala | 2 +
.../tobias/playpad/server/project/Page.scala | 2 +
.../tobias/playpad/server/project/Path.scala | 2 +
.../playpad/server/project/Project.scala | 2 +
.../project/loader/sql/DesignLoader.scala | 3 +
.../server/project/loader/sql/PadLoader.scala | 3 +
.../project/loader/sql/PageLoader.scala | 3 +
.../project/loader/sql/PathLoader.scala | 3 +
.../project/loader/sql/ProjectLoader.scala | 3 +
.../project/saver/sql/DesignSaver.scala | 2 +
.../server/project/saver/sql/PadSaver.scala | 2 +
.../server/project/saver/sql/PageSaver.scala | 2 +
.../server/project/saver/sql/PathSaver.scala | 2 +
.../project/saver/sql/ProjectSaver.scala | 3 +
.../server/project/settings/Fade.scala | 3 +
.../server/project/settings/PadSettings.scala | 3 +
.../playpad/server/server/SqlHelper.scala | 4 +
.../server/server/account/AccountPost.scala | 2 +
.../server/server/account/AccountPut.scala | 2 +
.../server/server/project/ProjectDelete.scala | 3 +
.../server/server/project/ProjectGet.scala | 3 +
.../server/project/ProjectHandler.scala | 2 +
.../server/server/project/ProjectList.scala | 2 +
.../project/ProjectModificationGet.scala | 2 +
.../server/server/project/ProjectPost.scala | 2 +
.../listener/CollectionAddListener.scala | 3 +
.../listener/CollectionRemoveListener.scala | 3 +
.../server/project/listener/Listener.scala | 2 +
.../listener/PropertyUpdateListener.scala | 3 +
.../project/sync/ProjectSyncHandler.scala | 3 +
.../project/sync/listener/Listener.scala | 2 +
.../listener/design/DesignAddListener.scala | 3 +
.../design/DesignUpdateListener.scala | 3 +
.../sync/listener/pad/PadAddListener.scala | 3 +
.../sync/listener/pad/PadClearListener.scala | 3 +
.../sync/listener/pad/PadRemoveListener.scala | 3 +
.../sync/listener/pad/PadUpdateListener.scala | 3 +
.../pad/settings/PadSettingsAddListener.scala | 3 +
.../settings/PadSettingsUpdateListener.scala | 3 +
.../sync/listener/page/PageAddListener.scala | 3 +
.../listener/page/PageRemoveListener.scala | 3 +
.../listener/page/PageUpdateListener.scala | 3 +
.../sync/listener/path/PathAddListener.scala | 3 +
.../listener/path/PathRemoveListener.scala | 3 +
.../listener/project/ProjectAddListener.scala | 3 +
.../project/ProjectRemoveListener.scala | 3 +
.../project/ProjectUpdateListener.scala | 3 +
.../settings/PropertiesSettingsHandler.scala | 5 +
.../server/settings/SettingsLoader.scala | 3 +
.../server/settings/SettingsSaver.scala | 3 +
.../playpad/server/sql/SqlSerializer.scala | 3 +
.../server/sql/UUIDSqlResultHandler.scala | 2 +
59 files changed, 218 insertions(+), 54 deletions(-)
diff --git a/pom.xml b/pom.xml
index ce3fbc0..4fba328 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 45134da..7ccf1bd 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 cdbe74a..8fa36fb 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 8a46f3f..8b10f50 100644
--- a/src/main/scala/de/tobias/playpad/server/json/DurationSerializerHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/json/DurationSerializerHandler.scala
@@ -1,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 af1d274..5683dde 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 8e7d116..51afb49 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 f79d811..6f372cd 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 ab87172..555bacb 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 55d8b0d..fb9aeac 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 3035238..4aaca1e 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 8a68f49..e7fde48 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 e1584c5..20872cc 100644
--- a/src/main/scala/de/tobias/playpad/server/project/loader/sql/DesignLoader.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/loader/sql/DesignLoader.scala
@@ -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 5e4f809..c431853 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 f483961..2dab58e 100644
--- a/src/main/scala/de/tobias/playpad/server/project/loader/sql/PageLoader.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/loader/sql/PageLoader.scala
@@ -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 87c6e86..fd12784 100644
--- a/src/main/scala/de/tobias/playpad/server/project/loader/sql/PathLoader.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/loader/sql/PathLoader.scala
@@ -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 c33dbc4..920914a 100644
--- a/src/main/scala/de/tobias/playpad/server/project/loader/sql/ProjectLoader.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/loader/sql/ProjectLoader.scala
@@ -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 a72daee..e23db0b 100644
--- a/src/main/scala/de/tobias/playpad/server/project/saver/sql/DesignSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/saver/sql/DesignSaver.scala
@@ -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 0d7a2dc..aea6cf8 100644
--- a/src/main/scala/de/tobias/playpad/server/project/saver/sql/PadSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/saver/sql/PadSaver.scala
@@ -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 f2fe852..6e88cda 100644
--- a/src/main/scala/de/tobias/playpad/server/project/saver/sql/PageSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/saver/sql/PageSaver.scala
@@ -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 c3f412e..c7f2092 100644
--- a/src/main/scala/de/tobias/playpad/server/project/saver/sql/PathSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/saver/sql/PathSaver.scala
@@ -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 d5443fd..10e7cd6 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 4543900..2aa834f 100644
--- a/src/main/scala/de/tobias/playpad/server/project/settings/Fade.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/settings/Fade.scala
@@ -1,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 45f681c..f6564b5 100644
--- a/src/main/scala/de/tobias/playpad/server/project/settings/PadSettings.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/settings/PadSettings.scala
@@ -1,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 ae2ea70..6a397c4 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 2b58258..1334f04 100644
--- a/src/main/scala/de/tobias/playpad/server/server/account/AccountPost.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/account/AccountPost.scala
@@ -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 f3e044f..92658be 100644
--- a/src/main/scala/de/tobias/playpad/server/server/account/AccountPut.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/account/AccountPut.scala
@@ -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 7675667..7a5d473 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectDelete.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/ProjectDelete.scala
@@ -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 c1ab86e..0c14a84 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectGet.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/ProjectGet.scala
@@ -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 194a20a..8a6d0fd 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/ProjectHandler.scala
@@ -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 1bcf449..b6ec867 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectList.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/ProjectList.scala
@@ -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 713cc25..3f9426a 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectModificationGet.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/ProjectModificationGet.scala
@@ -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 28ddff0..71eff6b 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectPost.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/ProjectPost.scala
@@ -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 17fc4c2..a6b1867 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/listener/CollectionAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/listener/CollectionAddListener.scala
@@ -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 13772d7..202f36e 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/listener/CollectionRemoveListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/listener/CollectionRemoveListener.scala
@@ -1,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 70c1591..d964ed1 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/listener/Listener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/listener/Listener.scala
@@ -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 759e221..5222d5d 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 63f6cd5..3b476a2 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala
@@ -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 9407abf..3693666 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/Listener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/Listener.scala
@@ -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 f925167..c9d8a29 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignAddListener.scala
@@ -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 1ca60dd..7051119 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignUpdateListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignUpdateListener.scala
@@ -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 440c5ac..42c9fa1 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadAddListener.scala
@@ -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 b2260cd..cb27b92 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadClearListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadClearListener.scala
@@ -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 1f8cea2..3c2e49c 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadRemoveListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadRemoveListener.scala
@@ -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 9fdd71e..29a1202 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadUpdateListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadUpdateListener.scala
@@ -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 b71f2ac..bb389e1 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 1b5b6cf..a1b9790 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 844ef0d..9d3ac3b 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageAddListener.scala
@@ -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 fffd98f..81ffce2 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageRemoveListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageRemoveListener.scala
@@ -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 7398f62..24c6234 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageUpdateListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageUpdateListener.scala
@@ -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 adedb18..0d08ca2 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathAddListener.scala
@@ -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 69304c8..400c8ec 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathRemoveListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathRemoveListener.scala
@@ -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 422b81e..8e237c5 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectAddListener.scala
@@ -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 b9bdb87..c2edae2 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectRemoveListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectRemoveListener.scala
@@ -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 d110c12..9c6242e 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectUpdateListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectUpdateListener.scala
@@ -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 56297a0..4f9a581 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 149f697..36a4bdf 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 af72f92..27d37c3 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 ecbdbfd..f8f1983 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 992ce20..f77c90d 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 {
--
GitLab