diff --git a/CommonCore/SQL/src/de/steamwar/sql/BauweltMember.kt b/CommonCore/SQL/src/de/steamwar/sql/BauweltMember.kt index a314d793..0324146f 100644 --- a/CommonCore/SQL/src/de/steamwar/sql/BauweltMember.kt +++ b/CommonCore/SQL/src/de/steamwar/sql/BauweltMember.kt @@ -29,7 +29,7 @@ import org.jetbrains.exposed.v1.core.eq import org.jetbrains.exposed.v1.dao.CompositeEntity import org.jetbrains.exposed.v1.dao.CompositeEntityClass import org.jetbrains.exposed.v1.jdbc.insertIgnore -import java.util.UUID +import java.util.* object BauweltMemberTable: CompositeIdTable("BauweltMember") { val bauweltId = reference("BauweltID", SteamwarUserTable) diff --git a/CommonCore/SQL/src/de/steamwar/sql/Event.kt b/CommonCore/SQL/src/de/steamwar/sql/Event.kt index 5ca83078..ffc08b8d 100644 --- a/CommonCore/SQL/src/de/steamwar/sql/Event.kt +++ b/CommonCore/SQL/src/de/steamwar/sql/Event.kt @@ -30,10 +30,8 @@ import org.jetbrains.exposed.v1.dao.IntEntity import org.jetbrains.exposed.v1.dao.IntEntityClass import org.jetbrains.exposed.v1.javatime.timestamp import org.jetbrains.exposed.v1.jdbc.insertAndGetId -import org.jetbrains.exposed.v1.jdbc.update import java.sql.Timestamp import java.time.Instant -import kotlin.math.max object EventTable : IntIdTable("Event", "EventId") { val name = varchar("EventName", 100).uniqueIndex() diff --git a/CommonCore/SQL/src/de/steamwar/sql/EventFight.kt b/CommonCore/SQL/src/de/steamwar/sql/EventFight.kt index ff41e24f..306c84b9 100644 --- a/CommonCore/SQL/src/de/steamwar/sql/EventFight.kt +++ b/CommonCore/SQL/src/de/steamwar/sql/EventFight.kt @@ -20,17 +20,9 @@ package de.steamwar.sql import de.steamwar.sql.internal.useDb -import org.jetbrains.exposed.v1.core.SortOrder -import org.jetbrains.exposed.v1.core.and +import org.jetbrains.exposed.v1.core.* import org.jetbrains.exposed.v1.core.dao.id.EntityID import org.jetbrains.exposed.v1.core.dao.id.IntIdTable -import org.jetbrains.exposed.v1.core.eq -import org.jetbrains.exposed.v1.core.greater -import org.jetbrains.exposed.v1.core.greaterEq -import org.jetbrains.exposed.v1.core.inList -import org.jetbrains.exposed.v1.core.inSubQuery -import org.jetbrains.exposed.v1.core.isNull -import org.jetbrains.exposed.v1.core.less import org.jetbrains.exposed.v1.dao.IntEntity import org.jetbrains.exposed.v1.dao.IntEntityClass import org.jetbrains.exposed.v1.javatime.timestamp @@ -38,9 +30,7 @@ import org.jetbrains.exposed.v1.jdbc.insertAndGetId import org.jetbrains.exposed.v1.jdbc.select import java.sql.Timestamp import java.time.Instant -import java.util.Optional -import java.util.PriorityQueue -import java.util.Queue +import java.util.* object EventFightTable : IntIdTable("EventFight", "FightID") { val eventId = reference("EventID", EventTable) diff --git a/CommonCore/SQL/src/de/steamwar/sql/EventGroup.kt b/CommonCore/SQL/src/de/steamwar/sql/EventGroup.kt index 7da29538..5fb01f30 100644 --- a/CommonCore/SQL/src/de/steamwar/sql/EventGroup.kt +++ b/CommonCore/SQL/src/de/steamwar/sql/EventGroup.kt @@ -25,7 +25,7 @@ import org.jetbrains.exposed.v1.core.dao.id.IntIdTable import org.jetbrains.exposed.v1.core.eq import org.jetbrains.exposed.v1.dao.IntEntity import org.jetbrains.exposed.v1.dao.IntEntityClass -import java.util.Optional +import java.util.* object EventGroupTable : IntIdTable("EventGroup", "Id") { val event = reference("EventID", EventTable) diff --git a/CommonCore/SQL/src/de/steamwar/sql/EventRelation.kt b/CommonCore/SQL/src/de/steamwar/sql/EventRelation.kt index 6847adfd..c1f0e53c 100644 --- a/CommonCore/SQL/src/de/steamwar/sql/EventRelation.kt +++ b/CommonCore/SQL/src/de/steamwar/sql/EventRelation.kt @@ -27,7 +27,6 @@ import org.jetbrains.exposed.v1.core.eq import org.jetbrains.exposed.v1.dao.IntEntity import org.jetbrains.exposed.v1.dao.IntEntityClass import org.jetbrains.exposed.v1.jdbc.select -import java.util.Optional object EventRelationTable : IntIdTable("EventRelation") { val fightId = reference("FightId", EventFightTable) diff --git a/CommonCore/SQL/src/de/steamwar/sql/IgnoreSystem.kt b/CommonCore/SQL/src/de/steamwar/sql/IgnoreSystem.kt index b94c111a..a3396e7e 100644 --- a/CommonCore/SQL/src/de/steamwar/sql/IgnoreSystem.kt +++ b/CommonCore/SQL/src/de/steamwar/sql/IgnoreSystem.kt @@ -27,7 +27,7 @@ import org.jetbrains.exposed.v1.core.dao.id.EntityID import org.jetbrains.exposed.v1.core.eq import org.jetbrains.exposed.v1.dao.CompositeEntity import org.jetbrains.exposed.v1.dao.CompositeEntityClass -import java.util.UUID +import java.util.* object IgnoreSystemTable: CompositeIdTable("IgnoreTable") { val ignorer = reference("Ignorer", SteamwarUserTable) diff --git a/CommonCore/SQL/src/de/steamwar/sql/NodeMember.kt b/CommonCore/SQL/src/de/steamwar/sql/NodeMember.kt index 1d69976d..410fc140 100644 --- a/CommonCore/SQL/src/de/steamwar/sql/NodeMember.kt +++ b/CommonCore/SQL/src/de/steamwar/sql/NodeMember.kt @@ -28,7 +28,7 @@ import org.jetbrains.exposed.v1.core.eq import org.jetbrains.exposed.v1.dao.CompositeEntity import org.jetbrains.exposed.v1.dao.CompositeEntityClass import org.jetbrains.exposed.v1.jdbc.insertIgnore -import java.util.Optional +import java.util.* import kotlin.jvm.optionals.getOrNull object NodeMemberTable : CompositeIdTable("NodeMember") { diff --git a/CommonCore/SQL/src/de/steamwar/sql/Punishment.kt b/CommonCore/SQL/src/de/steamwar/sql/Punishment.kt index 9c866325..4eafce0c 100644 --- a/CommonCore/SQL/src/de/steamwar/sql/Punishment.kt +++ b/CommonCore/SQL/src/de/steamwar/sql/Punishment.kt @@ -20,20 +20,16 @@ package de.steamwar.sql import de.steamwar.sql.internal.useDb -import org.jetbrains.exposed.v1.core.SortOrder -import org.jetbrains.exposed.v1.core.and +import org.jetbrains.exposed.v1.core.* import org.jetbrains.exposed.v1.core.dao.id.EntityID import org.jetbrains.exposed.v1.core.dao.id.IntIdTable -import org.jetbrains.exposed.v1.core.eq -import org.jetbrains.exposed.v1.core.inSubQuery -import org.jetbrains.exposed.v1.core.max import org.jetbrains.exposed.v1.dao.IntEntity import org.jetbrains.exposed.v1.dao.IntEntityClass import org.jetbrains.exposed.v1.javatime.timestamp import org.jetbrains.exposed.v1.jdbc.select import java.sql.Timestamp import java.time.Instant -import java.util.Date +import java.util.* import java.util.function.Consumer object PunishmentTable : IntIdTable("Punishments", "PunishmentId") { diff --git a/CommonCore/SQL/src/de/steamwar/sql/Referee.kt b/CommonCore/SQL/src/de/steamwar/sql/Referee.kt index e5df5bdd..594b12cd 100644 --- a/CommonCore/SQL/src/de/steamwar/sql/Referee.kt +++ b/CommonCore/SQL/src/de/steamwar/sql/Referee.kt @@ -27,7 +27,6 @@ import org.jetbrains.exposed.v1.core.dao.id.EntityID import org.jetbrains.exposed.v1.core.eq import org.jetbrains.exposed.v1.dao.CompositeEntity import org.jetbrains.exposed.v1.dao.CompositeEntityClass -import org.jetbrains.exposed.v1.jdbc.select object RefereeTable: CompositeIdTable("Referee") { val eventId = reference("EventId", EventTable) diff --git a/CommonCore/SQL/src/de/steamwar/sql/SWException.kt b/CommonCore/SQL/src/de/steamwar/sql/SWException.kt index 27c62aee..fb57e24f 100644 --- a/CommonCore/SQL/src/de/steamwar/sql/SWException.kt +++ b/CommonCore/SQL/src/de/steamwar/sql/SWException.kt @@ -26,7 +26,6 @@ import org.jetbrains.exposed.v1.javatime.timestamp import org.jetbrains.exposed.v1.jdbc.insert import org.jetbrains.exposed.v1.jdbc.insertAndGetId import java.io.File -import java.time.Instant object ExceptionTable: IntIdTable("Exception") { val time = timestamp("Time").defaultExpression(CurrentTimestamp) diff --git a/CommonCore/SQL/src/de/steamwar/sql/SchemElo.kt b/CommonCore/SQL/src/de/steamwar/sql/SchemElo.kt index fc07f8f4..b187186b 100644 --- a/CommonCore/SQL/src/de/steamwar/sql/SchemElo.kt +++ b/CommonCore/SQL/src/de/steamwar/sql/SchemElo.kt @@ -24,7 +24,6 @@ import org.jetbrains.exposed.v1.core.and import org.jetbrains.exposed.v1.core.dao.id.CompositeID import org.jetbrains.exposed.v1.core.dao.id.CompositeIdTable import org.jetbrains.exposed.v1.core.dao.id.EntityID -import org.jetbrains.exposed.v1.core.dao.id.IdTable import org.jetbrains.exposed.v1.core.eq import org.jetbrains.exposed.v1.dao.CompositeEntity import org.jetbrains.exposed.v1.dao.CompositeEntityClass diff --git a/CommonCore/SQL/src/de/steamwar/sql/Session.kt b/CommonCore/SQL/src/de/steamwar/sql/Session.kt index 1ed2978c..029ec6cc 100644 --- a/CommonCore/SQL/src/de/steamwar/sql/Session.kt +++ b/CommonCore/SQL/src/de/steamwar/sql/Session.kt @@ -26,7 +26,6 @@ import org.jetbrains.exposed.v1.javatime.CurrentTimestamp import org.jetbrains.exposed.v1.javatime.timestamp import org.jetbrains.exposed.v1.jdbc.insert import java.sql.Timestamp -import java.time.Instant object SessionTable: Table("Session") { val userId = reference("UserId", SteamwarUserTable) diff --git a/CommonCore/SQL/src/de/steamwar/sql/Token.kt b/CommonCore/SQL/src/de/steamwar/sql/Token.kt index 2153a298..d63dab5b 100644 --- a/CommonCore/SQL/src/de/steamwar/sql/Token.kt +++ b/CommonCore/SQL/src/de/steamwar/sql/Token.kt @@ -30,8 +30,7 @@ import org.jetbrains.exposed.v1.javatime.timestamp import java.security.MessageDigest import java.security.SecureRandom import java.sql.Timestamp -import java.time.Instant -import java.util.Base64 +import java.util.* object TokenTable: IntIdTable("Token") { val name = varchar("Name", 64) diff --git a/CommonCore/SQL/src/de/steamwar/sql/UserConfig.kt b/CommonCore/SQL/src/de/steamwar/sql/UserConfig.kt index 14dcd201..9df36810 100644 --- a/CommonCore/SQL/src/de/steamwar/sql/UserConfig.kt +++ b/CommonCore/SQL/src/de/steamwar/sql/UserConfig.kt @@ -28,7 +28,7 @@ import org.jetbrains.exposed.v1.core.eq import org.jetbrains.exposed.v1.dao.CompositeEntity import org.jetbrains.exposed.v1.dao.CompositeEntityClass import org.jetbrains.exposed.v1.jdbc.upsert -import java.util.UUID +import java.util.* object UserConfigTable: CompositeIdTable("UserConfig") { val userId = reference("User", SteamwarUserTable) diff --git a/CommonCore/SQL/src/de/steamwar/sql/internal/KotlinDatabase.kt b/CommonCore/SQL/src/de/steamwar/sql/internal/KotlinDatabase.kt index 2d6908b6..bf0cc9ff 100644 --- a/CommonCore/SQL/src/de/steamwar/sql/internal/KotlinDatabase.kt +++ b/CommonCore/SQL/src/de/steamwar/sql/internal/KotlinDatabase.kt @@ -23,7 +23,6 @@ import org.intellij.lang.annotations.Language import org.jetbrains.exposed.v1.core.ColumnType import org.jetbrains.exposed.v1.core.Expression import org.jetbrains.exposed.v1.core.ResultRow -import org.jetbrains.exposed.v1.core.StdOutSqlLogger import org.jetbrains.exposed.v1.core.statements.StatementType import org.jetbrains.exposed.v1.dao.IntEntity import org.jetbrains.exposed.v1.dao.IntEntityClass @@ -33,7 +32,7 @@ import org.jetbrains.exposed.v1.jdbc.statements.jdbc.JdbcResult import org.jetbrains.exposed.v1.jdbc.transactions.TransactionManager import org.jetbrains.exposed.v1.jdbc.transactions.transaction import java.io.File -import java.util.Properties +import java.util.* object KotlinDatabase { var db: Database? = null diff --git a/CommonCore/SQL/src/de/steamwar/sql/internal/Statement.kt b/CommonCore/SQL/src/de/steamwar/sql/internal/Statement.kt index aa6a81d4..994798e1 100644 --- a/CommonCore/SQL/src/de/steamwar/sql/internal/Statement.kt +++ b/CommonCore/SQL/src/de/steamwar/sql/internal/Statement.kt @@ -20,7 +20,10 @@ package de.steamwar.sql.internal import de.steamwar.sql.SteamwarUser -import org.jetbrains.exposed.v1.core.* +import org.jetbrains.exposed.v1.core.BooleanColumnType +import org.jetbrains.exposed.v1.core.IntegerColumnType +import org.jetbrains.exposed.v1.core.LongColumnType +import org.jetbrains.exposed.v1.core.VarCharColumnType import org.jetbrains.exposed.v1.jdbc.name import org.jetbrains.exposed.v1.jdbc.transactions.TransactionManager import java.sql.ResultSet