forked from SteamWar/SteamWar
Optimize imports across SQL module: replace explicit class imports with wildcard imports, remove unused imports for cleaner structure.
Signed-off-by: Chaoscaot <max@maxsp.de>
This commit is contained in:
@@ -29,7 +29,7 @@ import org.jetbrains.exposed.v1.core.eq
|
|||||||
import org.jetbrains.exposed.v1.dao.CompositeEntity
|
import org.jetbrains.exposed.v1.dao.CompositeEntity
|
||||||
import org.jetbrains.exposed.v1.dao.CompositeEntityClass
|
import org.jetbrains.exposed.v1.dao.CompositeEntityClass
|
||||||
import org.jetbrains.exposed.v1.jdbc.insertIgnore
|
import org.jetbrains.exposed.v1.jdbc.insertIgnore
|
||||||
import java.util.UUID
|
import java.util.*
|
||||||
|
|
||||||
object BauweltMemberTable: CompositeIdTable("BauweltMember") {
|
object BauweltMemberTable: CompositeIdTable("BauweltMember") {
|
||||||
val bauweltId = reference("BauweltID", SteamwarUserTable)
|
val bauweltId = reference("BauweltID", SteamwarUserTable)
|
||||||
|
|||||||
@@ -30,10 +30,8 @@ import org.jetbrains.exposed.v1.dao.IntEntity
|
|||||||
import org.jetbrains.exposed.v1.dao.IntEntityClass
|
import org.jetbrains.exposed.v1.dao.IntEntityClass
|
||||||
import org.jetbrains.exposed.v1.javatime.timestamp
|
import org.jetbrains.exposed.v1.javatime.timestamp
|
||||||
import org.jetbrains.exposed.v1.jdbc.insertAndGetId
|
import org.jetbrains.exposed.v1.jdbc.insertAndGetId
|
||||||
import org.jetbrains.exposed.v1.jdbc.update
|
|
||||||
import java.sql.Timestamp
|
import java.sql.Timestamp
|
||||||
import java.time.Instant
|
import java.time.Instant
|
||||||
import kotlin.math.max
|
|
||||||
|
|
||||||
object EventTable : IntIdTable("Event", "EventId") {
|
object EventTable : IntIdTable("Event", "EventId") {
|
||||||
val name = varchar("EventName", 100).uniqueIndex()
|
val name = varchar("EventName", 100).uniqueIndex()
|
||||||
|
|||||||
@@ -20,17 +20,9 @@
|
|||||||
package de.steamwar.sql
|
package de.steamwar.sql
|
||||||
|
|
||||||
import de.steamwar.sql.internal.useDb
|
import de.steamwar.sql.internal.useDb
|
||||||
import org.jetbrains.exposed.v1.core.SortOrder
|
import org.jetbrains.exposed.v1.core.*
|
||||||
import org.jetbrains.exposed.v1.core.and
|
|
||||||
import org.jetbrains.exposed.v1.core.dao.id.EntityID
|
import org.jetbrains.exposed.v1.core.dao.id.EntityID
|
||||||
import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
|
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.IntEntity
|
||||||
import org.jetbrains.exposed.v1.dao.IntEntityClass
|
import org.jetbrains.exposed.v1.dao.IntEntityClass
|
||||||
import org.jetbrains.exposed.v1.javatime.timestamp
|
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 org.jetbrains.exposed.v1.jdbc.select
|
||||||
import java.sql.Timestamp
|
import java.sql.Timestamp
|
||||||
import java.time.Instant
|
import java.time.Instant
|
||||||
import java.util.Optional
|
import java.util.*
|
||||||
import java.util.PriorityQueue
|
|
||||||
import java.util.Queue
|
|
||||||
|
|
||||||
object EventFightTable : IntIdTable("EventFight", "FightID") {
|
object EventFightTable : IntIdTable("EventFight", "FightID") {
|
||||||
val eventId = reference("EventID", EventTable)
|
val eventId = reference("EventID", EventTable)
|
||||||
|
|||||||
@@ -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.core.eq
|
||||||
import org.jetbrains.exposed.v1.dao.IntEntity
|
import org.jetbrains.exposed.v1.dao.IntEntity
|
||||||
import org.jetbrains.exposed.v1.dao.IntEntityClass
|
import org.jetbrains.exposed.v1.dao.IntEntityClass
|
||||||
import java.util.Optional
|
import java.util.*
|
||||||
|
|
||||||
object EventGroupTable : IntIdTable("EventGroup", "Id") {
|
object EventGroupTable : IntIdTable("EventGroup", "Id") {
|
||||||
val event = reference("EventID", EventTable)
|
val event = reference("EventID", EventTable)
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ import org.jetbrains.exposed.v1.core.eq
|
|||||||
import org.jetbrains.exposed.v1.dao.IntEntity
|
import org.jetbrains.exposed.v1.dao.IntEntity
|
||||||
import org.jetbrains.exposed.v1.dao.IntEntityClass
|
import org.jetbrains.exposed.v1.dao.IntEntityClass
|
||||||
import org.jetbrains.exposed.v1.jdbc.select
|
import org.jetbrains.exposed.v1.jdbc.select
|
||||||
import java.util.Optional
|
|
||||||
|
|
||||||
object EventRelationTable : IntIdTable("EventRelation") {
|
object EventRelationTable : IntIdTable("EventRelation") {
|
||||||
val fightId = reference("FightId", EventFightTable)
|
val fightId = reference("FightId", EventFightTable)
|
||||||
|
|||||||
@@ -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.core.eq
|
||||||
import org.jetbrains.exposed.v1.dao.CompositeEntity
|
import org.jetbrains.exposed.v1.dao.CompositeEntity
|
||||||
import org.jetbrains.exposed.v1.dao.CompositeEntityClass
|
import org.jetbrains.exposed.v1.dao.CompositeEntityClass
|
||||||
import java.util.UUID
|
import java.util.*
|
||||||
|
|
||||||
object IgnoreSystemTable: CompositeIdTable("IgnoreTable") {
|
object IgnoreSystemTable: CompositeIdTable("IgnoreTable") {
|
||||||
val ignorer = reference("Ignorer", SteamwarUserTable)
|
val ignorer = reference("Ignorer", SteamwarUserTable)
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ import org.jetbrains.exposed.v1.core.eq
|
|||||||
import org.jetbrains.exposed.v1.dao.CompositeEntity
|
import org.jetbrains.exposed.v1.dao.CompositeEntity
|
||||||
import org.jetbrains.exposed.v1.dao.CompositeEntityClass
|
import org.jetbrains.exposed.v1.dao.CompositeEntityClass
|
||||||
import org.jetbrains.exposed.v1.jdbc.insertIgnore
|
import org.jetbrains.exposed.v1.jdbc.insertIgnore
|
||||||
import java.util.Optional
|
import java.util.*
|
||||||
import kotlin.jvm.optionals.getOrNull
|
import kotlin.jvm.optionals.getOrNull
|
||||||
|
|
||||||
object NodeMemberTable : CompositeIdTable("NodeMember") {
|
object NodeMemberTable : CompositeIdTable("NodeMember") {
|
||||||
|
|||||||
@@ -20,20 +20,16 @@
|
|||||||
package de.steamwar.sql
|
package de.steamwar.sql
|
||||||
|
|
||||||
import de.steamwar.sql.internal.useDb
|
import de.steamwar.sql.internal.useDb
|
||||||
import org.jetbrains.exposed.v1.core.SortOrder
|
import org.jetbrains.exposed.v1.core.*
|
||||||
import org.jetbrains.exposed.v1.core.and
|
|
||||||
import org.jetbrains.exposed.v1.core.dao.id.EntityID
|
import org.jetbrains.exposed.v1.core.dao.id.EntityID
|
||||||
import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
|
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.IntEntity
|
||||||
import org.jetbrains.exposed.v1.dao.IntEntityClass
|
import org.jetbrains.exposed.v1.dao.IntEntityClass
|
||||||
import org.jetbrains.exposed.v1.javatime.timestamp
|
import org.jetbrains.exposed.v1.javatime.timestamp
|
||||||
import org.jetbrains.exposed.v1.jdbc.select
|
import org.jetbrains.exposed.v1.jdbc.select
|
||||||
import java.sql.Timestamp
|
import java.sql.Timestamp
|
||||||
import java.time.Instant
|
import java.time.Instant
|
||||||
import java.util.Date
|
import java.util.*
|
||||||
import java.util.function.Consumer
|
import java.util.function.Consumer
|
||||||
|
|
||||||
object PunishmentTable : IntIdTable("Punishments", "PunishmentId") {
|
object PunishmentTable : IntIdTable("Punishments", "PunishmentId") {
|
||||||
|
|||||||
@@ -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.core.eq
|
||||||
import org.jetbrains.exposed.v1.dao.CompositeEntity
|
import org.jetbrains.exposed.v1.dao.CompositeEntity
|
||||||
import org.jetbrains.exposed.v1.dao.CompositeEntityClass
|
import org.jetbrains.exposed.v1.dao.CompositeEntityClass
|
||||||
import org.jetbrains.exposed.v1.jdbc.select
|
|
||||||
|
|
||||||
object RefereeTable: CompositeIdTable("Referee") {
|
object RefereeTable: CompositeIdTable("Referee") {
|
||||||
val eventId = reference("EventId", EventTable)
|
val eventId = reference("EventId", EventTable)
|
||||||
|
|||||||
@@ -26,7 +26,6 @@ import org.jetbrains.exposed.v1.javatime.timestamp
|
|||||||
import org.jetbrains.exposed.v1.jdbc.insert
|
import org.jetbrains.exposed.v1.jdbc.insert
|
||||||
import org.jetbrains.exposed.v1.jdbc.insertAndGetId
|
import org.jetbrains.exposed.v1.jdbc.insertAndGetId
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import java.time.Instant
|
|
||||||
|
|
||||||
object ExceptionTable: IntIdTable("Exception") {
|
object ExceptionTable: IntIdTable("Exception") {
|
||||||
val time = timestamp("Time").defaultExpression(CurrentTimestamp)
|
val time = timestamp("Time").defaultExpression(CurrentTimestamp)
|
||||||
|
|||||||
@@ -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.CompositeID
|
||||||
import org.jetbrains.exposed.v1.core.dao.id.CompositeIdTable
|
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.EntityID
|
||||||
import org.jetbrains.exposed.v1.core.dao.id.IdTable
|
|
||||||
import org.jetbrains.exposed.v1.core.eq
|
import org.jetbrains.exposed.v1.core.eq
|
||||||
import org.jetbrains.exposed.v1.dao.CompositeEntity
|
import org.jetbrains.exposed.v1.dao.CompositeEntity
|
||||||
import org.jetbrains.exposed.v1.dao.CompositeEntityClass
|
import org.jetbrains.exposed.v1.dao.CompositeEntityClass
|
||||||
|
|||||||
@@ -26,7 +26,6 @@ import org.jetbrains.exposed.v1.javatime.CurrentTimestamp
|
|||||||
import org.jetbrains.exposed.v1.javatime.timestamp
|
import org.jetbrains.exposed.v1.javatime.timestamp
|
||||||
import org.jetbrains.exposed.v1.jdbc.insert
|
import org.jetbrains.exposed.v1.jdbc.insert
|
||||||
import java.sql.Timestamp
|
import java.sql.Timestamp
|
||||||
import java.time.Instant
|
|
||||||
|
|
||||||
object SessionTable: Table("Session") {
|
object SessionTable: Table("Session") {
|
||||||
val userId = reference("UserId", SteamwarUserTable)
|
val userId = reference("UserId", SteamwarUserTable)
|
||||||
|
|||||||
@@ -30,8 +30,7 @@ import org.jetbrains.exposed.v1.javatime.timestamp
|
|||||||
import java.security.MessageDigest
|
import java.security.MessageDigest
|
||||||
import java.security.SecureRandom
|
import java.security.SecureRandom
|
||||||
import java.sql.Timestamp
|
import java.sql.Timestamp
|
||||||
import java.time.Instant
|
import java.util.*
|
||||||
import java.util.Base64
|
|
||||||
|
|
||||||
object TokenTable: IntIdTable("Token") {
|
object TokenTable: IntIdTable("Token") {
|
||||||
val name = varchar("Name", 64)
|
val name = varchar("Name", 64)
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ import org.jetbrains.exposed.v1.core.eq
|
|||||||
import org.jetbrains.exposed.v1.dao.CompositeEntity
|
import org.jetbrains.exposed.v1.dao.CompositeEntity
|
||||||
import org.jetbrains.exposed.v1.dao.CompositeEntityClass
|
import org.jetbrains.exposed.v1.dao.CompositeEntityClass
|
||||||
import org.jetbrains.exposed.v1.jdbc.upsert
|
import org.jetbrains.exposed.v1.jdbc.upsert
|
||||||
import java.util.UUID
|
import java.util.*
|
||||||
|
|
||||||
object UserConfigTable: CompositeIdTable("UserConfig") {
|
object UserConfigTable: CompositeIdTable("UserConfig") {
|
||||||
val userId = reference("User", SteamwarUserTable)
|
val userId = reference("User", SteamwarUserTable)
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ import org.intellij.lang.annotations.Language
|
|||||||
import org.jetbrains.exposed.v1.core.ColumnType
|
import org.jetbrains.exposed.v1.core.ColumnType
|
||||||
import org.jetbrains.exposed.v1.core.Expression
|
import org.jetbrains.exposed.v1.core.Expression
|
||||||
import org.jetbrains.exposed.v1.core.ResultRow
|
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.core.statements.StatementType
|
||||||
import org.jetbrains.exposed.v1.dao.IntEntity
|
import org.jetbrains.exposed.v1.dao.IntEntity
|
||||||
import org.jetbrains.exposed.v1.dao.IntEntityClass
|
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.TransactionManager
|
||||||
import org.jetbrains.exposed.v1.jdbc.transactions.transaction
|
import org.jetbrains.exposed.v1.jdbc.transactions.transaction
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import java.util.Properties
|
import java.util.*
|
||||||
|
|
||||||
object KotlinDatabase {
|
object KotlinDatabase {
|
||||||
var db: Database? = null
|
var db: Database? = null
|
||||||
|
|||||||
@@ -20,7 +20,10 @@
|
|||||||
package de.steamwar.sql.internal
|
package de.steamwar.sql.internal
|
||||||
|
|
||||||
import de.steamwar.sql.SteamwarUser
|
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.name
|
||||||
import org.jetbrains.exposed.v1.jdbc.transactions.TransactionManager
|
import org.jetbrains.exposed.v1.jdbc.transactions.TransactionManager
|
||||||
import java.sql.ResultSet
|
import java.sql.ResultSet
|
||||||
|
|||||||
Reference in New Issue
Block a user