diff --git a/api/src/NotesApplication.kt b/api/src/NotesApplication.kt index c1c3cff..52ce1f8 100644 --- a/api/src/NotesApplication.kt +++ b/api/src/NotesApplication.kt @@ -6,17 +6,9 @@ import be.vandewalleh.features.features import be.vandewalleh.migrations.Migration import be.vandewalleh.routing.registerRoutes import be.vandewalleh.services.serviceModule -import io.ktor.application.Application -import io.ktor.application.call -import io.ktor.application.feature -import io.ktor.application.log -import io.ktor.response.respond -import io.ktor.routing.Route -import io.ktor.routing.Routing -import io.ktor.routing.RoutingPath.Companion.root -import io.ktor.routing.get -import io.ktor.routing.routing -import me.liuwj.ktorm.database.Database +import io.ktor.application.* +import io.ktor.routing.* +import me.liuwj.ktorm.database.* import org.kodein.di.Kodein import org.kodein.di.description import org.kodein.di.generic.bind diff --git a/api/src/auth/AuthenticationModule.kt b/api/src/auth/AuthenticationModule.kt index f57ad63..454ea22 100644 --- a/api/src/auth/AuthenticationModule.kt +++ b/api/src/auth/AuthenticationModule.kt @@ -1,11 +1,9 @@ package be.vandewalleh.auth import be.vandewalleh.kodein -import io.ktor.application.Application -import io.ktor.application.install -import io.ktor.auth.Authentication -import io.ktor.auth.UserIdPrincipal -import io.ktor.auth.jwt.jwt +import io.ktor.application.* +import io.ktor.auth.* +import io.ktor.auth.jwt.* import org.kodein.di.generic.instance fun Application.authenticationModule() { diff --git a/api/src/auth/UsernamePasswordCredential.kt b/api/src/auth/UsernamePasswordCredential.kt index 3d27223..1945e7f 100644 --- a/api/src/auth/UsernamePasswordCredential.kt +++ b/api/src/auth/UsernamePasswordCredential.kt @@ -1,6 +1,6 @@ package be.vandewalleh.auth -import io.ktor.auth.Credential +import io.ktor.auth.* /** * Represents a simple user [username] and [password] credential pair diff --git a/api/src/entities/Chapter.kt b/api/src/entities/Chapter.kt index 0498139..9b881da 100644 --- a/api/src/entities/Chapter.kt +++ b/api/src/entities/Chapter.kt @@ -1,6 +1,6 @@ package be.vandewalleh.entities -import me.liuwj.ktorm.entity.Entity +import me.liuwj.ktorm.entity.* interface Chapter : Entity { companion object : Entity.Factory() diff --git a/api/src/entities/Note.kt b/api/src/entities/Note.kt index 877fff3..f3571a7 100644 --- a/api/src/entities/Note.kt +++ b/api/src/entities/Note.kt @@ -1,6 +1,6 @@ package be.vandewalleh.entities -import me.liuwj.ktorm.entity.Entity +import me.liuwj.ktorm.entity.* import java.time.LocalDateTime interface Note : Entity { diff --git a/api/src/entities/Tag.kt b/api/src/entities/Tag.kt index c6467d4..0ab35a3 100644 --- a/api/src/entities/Tag.kt +++ b/api/src/entities/Tag.kt @@ -1,6 +1,6 @@ package be.vandewalleh.entities -import me.liuwj.ktorm.entity.Entity +import me.liuwj.ktorm.entity.* interface Tag : Entity { companion object : Entity.Factory() diff --git a/api/src/entities/User.kt b/api/src/entities/User.kt index 1db3c52..aacb825 100644 --- a/api/src/entities/User.kt +++ b/api/src/entities/User.kt @@ -1,6 +1,6 @@ package be.vandewalleh.entities -import me.liuwj.ktorm.entity.Entity +import me.liuwj.ktorm.entity.* import java.time.LocalDateTime interface User : Entity { diff --git a/api/src/extensions/ApplicationCallExtensions.kt b/api/src/extensions/ApplicationCallExtensions.kt index de8ee00..3a241ce 100644 --- a/api/src/extensions/ApplicationCallExtensions.kt +++ b/api/src/extensions/ApplicationCallExtensions.kt @@ -2,12 +2,11 @@ package be.vandewalleh.extensions import be.vandewalleh.kodein import be.vandewalleh.services.UserService -import io.ktor.application.ApplicationCall -import io.ktor.auth.UserIdPrincipal -import io.ktor.auth.principal -import io.ktor.http.HttpStatusCode -import io.ktor.request.receive -import io.ktor.response.respond +import io.ktor.application.* +import io.ktor.auth.* +import io.ktor.http.* +import io.ktor.request.* +import io.ktor.response.* import org.kodein.di.generic.instance val userService by kodein.instance() diff --git a/api/src/extensions/ParametersExtensions.kt b/api/src/extensions/ParametersExtensions.kt index 9b0b208..c9bf06d 100644 --- a/api/src/extensions/ParametersExtensions.kt +++ b/api/src/extensions/ParametersExtensions.kt @@ -3,7 +3,7 @@ package be.vandewalleh.extensions import be.vandewalleh.kodein import be.vandewalleh.services.NotesService import be.vandewalleh.tables.Notes -import io.ktor.http.Parameters +import io.ktor.http.* import org.kodein.di.generic.instance val notesService by kodein.instance() diff --git a/api/src/features/ConfigurationFeature.kt b/api/src/features/ConfigurationFeature.kt index 4a2f0ad..b914ee9 100644 --- a/api/src/features/ConfigurationFeature.kt +++ b/api/src/features/ConfigurationFeature.kt @@ -1,7 +1,7 @@ package be.vandewalleh.features import be.vandewalleh.auth.SimpleJWT -import io.ktor.application.Application +import io.ktor.application.* import org.kodein.di.Kodein import org.kodein.di.generic.bind import org.kodein.di.generic.instance diff --git a/api/src/features/ContentNegotiationFeature.kt b/api/src/features/ContentNegotiationFeature.kt index c196321..3b91178 100644 --- a/api/src/features/ContentNegotiationFeature.kt +++ b/api/src/features/ContentNegotiationFeature.kt @@ -1,10 +1,9 @@ package be.vandewalleh.features import com.fasterxml.jackson.databind.SerializationFeature -import io.ktor.application.Application -import io.ktor.application.install -import io.ktor.features.ContentNegotiation -import io.ktor.jackson.jackson +import io.ktor.application.* +import io.ktor.features.* +import io.ktor.jackson.* fun Application.contentNegotiationFeature() { install(ContentNegotiation) { diff --git a/api/src/features/CorsFeature.kt b/api/src/features/CorsFeature.kt index 85af273..ddc7342 100644 --- a/api/src/features/CorsFeature.kt +++ b/api/src/features/CorsFeature.kt @@ -1,9 +1,8 @@ package be.vandewalleh.features -import io.ktor.application.Application -import io.ktor.application.install -import io.ktor.features.CORS -import io.ktor.http.HttpHeaders +import io.ktor.application.* +import io.ktor.features.* +import io.ktor.http.* fun Application.corsFeature() { install(CORS) { diff --git a/api/src/features/ErrorFeature.kt b/api/src/features/ErrorFeature.kt index c085ab2..6ca34cc 100644 --- a/api/src/features/ErrorFeature.kt +++ b/api/src/features/ErrorFeature.kt @@ -1,12 +1,10 @@ package be.vandewalleh.features -import io.ktor.application.Application -import io.ktor.application.call -import io.ktor.application.install -import io.ktor.features.StatusPages -import io.ktor.http.HttpStatusCode -import io.ktor.response.respond -import io.ktor.utils.io.errors.IOException +import io.ktor.application.* +import io.ktor.features.* +import io.ktor.http.* +import io.ktor.response.* +import io.ktor.utils.io.errors.* fun Application.handleErrors() { install(StatusPages) { diff --git a/api/src/features/Features.kt b/api/src/features/Features.kt index 09e5942..c57e449 100644 --- a/api/src/features/Features.kt +++ b/api/src/features/Features.kt @@ -1,7 +1,7 @@ package be.vandewalleh.features import be.vandewalleh.auth.authenticationModule -import io.ktor.application.Application +import io.ktor.application.* fun Application.features() { corsFeature() diff --git a/api/src/routing/ChaptersController.kt b/api/src/routing/ChaptersController.kt index 76850b7..4236948 100644 --- a/api/src/routing/ChaptersController.kt +++ b/api/src/routing/ChaptersController.kt @@ -1,8 +1,7 @@ package be.vandewalleh.routing -import io.ktor.auth.authenticate -import io.ktor.routing.Routing -import io.ktor.routing.route +import io.ktor.auth.* +import io.ktor.routing.* import org.kodein.di.Kodein fun Routing.chapters(kodein: Kodein) { diff --git a/api/src/routing/LoginController.kt b/api/src/routing/LoginController.kt index d776de1..b42fc15 100644 --- a/api/src/routing/LoginController.kt +++ b/api/src/routing/LoginController.kt @@ -3,13 +3,11 @@ package be.vandewalleh.routing import be.vandewalleh.auth.SimpleJWT import be.vandewalleh.auth.UsernamePasswordCredential import be.vandewalleh.services.UserService -import io.ktor.application.call -import io.ktor.http.HttpStatusCode -import io.ktor.request.receive -import io.ktor.response.respond -import io.ktor.routing.Routing -import io.ktor.routing.post -import io.ktor.routing.route +import io.ktor.application.* +import io.ktor.http.* +import io.ktor.request.* +import io.ktor.response.* +import io.ktor.routing.* import org.kodein.di.Kodein import org.kodein.di.generic.instance import org.mindrot.jbcrypt.BCrypt diff --git a/api/src/routing/NotesController.kt b/api/src/routing/NotesController.kt index f4108ea..ac2e587 100644 --- a/api/src/routing/NotesController.kt +++ b/api/src/routing/NotesController.kt @@ -2,11 +2,10 @@ package be.vandewalleh.routing import be.vandewalleh.extensions.userId import be.vandewalleh.services.NotesService -import io.ktor.application.call -import io.ktor.auth.authenticate -import io.ktor.response.respond -import io.ktor.routing.Routing -import io.ktor.routing.get +import io.ktor.application.* +import io.ktor.auth.* +import io.ktor.response.* +import io.ktor.routing.* import org.kodein.di.Kodein import org.kodein.di.generic.instance diff --git a/api/src/routing/RegisterController.kt b/api/src/routing/RegisterController.kt index 8f32ae0..16275b6 100644 --- a/api/src/routing/RegisterController.kt +++ b/api/src/routing/RegisterController.kt @@ -3,12 +3,11 @@ package be.vandewalleh.routing import be.vandewalleh.extensions.respondStatus import be.vandewalleh.services.UserRegistrationDto import be.vandewalleh.services.UserService -import io.ktor.application.call -import io.ktor.http.HttpStatusCode -import io.ktor.request.receive -import io.ktor.response.respond -import io.ktor.routing.Routing -import io.ktor.routing.post +import io.ktor.application.* +import io.ktor.http.* +import io.ktor.request.* +import io.ktor.response.* +import io.ktor.routing.* import org.kodein.di.Kodein import org.kodein.di.generic.instance import org.mindrot.jbcrypt.BCrypt diff --git a/api/src/routing/Routes.kt b/api/src/routing/Routes.kt index 31e6401..bad3c45 100644 --- a/api/src/routing/Routes.kt +++ b/api/src/routing/Routes.kt @@ -1,6 +1,6 @@ package be.vandewalleh.routing -import io.ktor.routing.Routing +import io.ktor.routing.* import org.kodein.di.Kodein fun Routing.registerRoutes(kodein: Kodein) { diff --git a/api/src/routing/TitleController.kt b/api/src/routing/TitleController.kt index 4fb4e95..292e368 100644 --- a/api/src/routing/TitleController.kt +++ b/api/src/routing/TitleController.kt @@ -2,10 +2,10 @@ package be.vandewalleh.routing import be.vandewalleh.extensions.* import be.vandewalleh.services.NotesService -import io.ktor.application.call -import io.ktor.auth.authenticate -import io.ktor.http.HttpStatusCode -import io.ktor.response.respond +import io.ktor.application.* +import io.ktor.auth.* +import io.ktor.http.* +import io.ktor.response.* import io.ktor.routing.* import org.kodein.di.Kodein import org.kodein.di.generic.instance diff --git a/api/src/services/NotesService.kt b/api/src/services/NotesService.kt index 45ef13e..3df50f1 100644 --- a/api/src/services/NotesService.kt +++ b/api/src/services/NotesService.kt @@ -3,7 +3,7 @@ package be.vandewalleh.services import be.vandewalleh.tables.Chapters import be.vandewalleh.tables.Notes import be.vandewalleh.tables.Tags -import me.liuwj.ktorm.database.Database +import me.liuwj.ktorm.database.* import me.liuwj.ktorm.dsl.* import org.kodein.di.Kodein import org.kodein.di.KodeinAware diff --git a/api/src/services/UserService.kt b/api/src/services/UserService.kt index 67887d2..514e6ad 100644 --- a/api/src/services/UserService.kt +++ b/api/src/services/UserService.kt @@ -2,10 +2,9 @@ package be.vandewalleh.services import be.vandewalleh.entities.User import be.vandewalleh.tables.Users -import me.liuwj.ktorm.database.Database +import me.liuwj.ktorm.database.* import me.liuwj.ktorm.dsl.* -import me.liuwj.ktorm.entity.add -import me.liuwj.ktorm.entity.sequenceOf +import me.liuwj.ktorm.entity.* import org.kodein.di.Kodein import org.kodein.di.KodeinAware import org.kodein.di.generic.instance diff --git a/api/src/tables/Chapters.kt b/api/src/tables/Chapters.kt index 4651fda..51ffb9b 100644 --- a/api/src/tables/Chapters.kt +++ b/api/src/tables/Chapters.kt @@ -1,11 +1,7 @@ package be.vandewalleh.tables import be.vandewalleh.entities.Chapter -import be.vandewalleh.entities.Tag -import me.liuwj.ktorm.schema.Table -import me.liuwj.ktorm.schema.int -import me.liuwj.ktorm.schema.text -import me.liuwj.ktorm.schema.varchar +import me.liuwj.ktorm.schema.* object Chapters : Table("Chapters") { val id by int("id").primaryKey().bindTo { it.id } diff --git a/api/src/tables/Tags.kt b/api/src/tables/Tags.kt index 309291c..e9e52ef 100644 --- a/api/src/tables/Tags.kt +++ b/api/src/tables/Tags.kt @@ -1,9 +1,7 @@ package be.vandewalleh.tables import be.vandewalleh.entities.Tag -import me.liuwj.ktorm.schema.Table -import me.liuwj.ktorm.schema.int -import me.liuwj.ktorm.schema.varchar +import me.liuwj.ktorm.schema.* object Tags : Table("Tags") { val id by int("id").primaryKey().bindTo { it.id } diff --git a/api/src/tables/Users.kt b/api/src/tables/Users.kt index 11f8d57..2ae5061 100644 --- a/api/src/tables/Users.kt +++ b/api/src/tables/Users.kt @@ -1,10 +1,7 @@ package be.vandewalleh.tables import be.vandewalleh.entities.User -import me.liuwj.ktorm.schema.Table -import me.liuwj.ktorm.schema.datetime -import me.liuwj.ktorm.schema.int -import me.liuwj.ktorm.schema.varchar +import me.liuwj.ktorm.schema.* object Users : Table("Users") { val id by int("id").primaryKey().bindTo { it.id }