hubert/SimpleNotes
1
0
Fork 0
Code Projects Releases Activity

Wildcards imports for ktorm & ktor

Browse Source
This commit is contained in:
Hubert Van De Walle 2020-04-21 16:46:06 +02:00
parent ff01ab2af3
commit d8a8f53b97
25 changed files with 57 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/src/NotesApplication.kt
View File

@ -6,17 +6,9 @@ import be.vandewalleh.features.features
import be.vandewalleh.migrations.Migration import be.vandewalleh.migrations.Migration
import be.vandewalleh.routing.registerRoutes import be.vandewalleh.routing.registerRoutes
import be.vandewalleh.services.serviceModule import be.vandewalleh.services.serviceModule
import io.ktor.application.Application import io.ktor.application.*
import io.ktor.application.call import io.ktor.routing.*
import io.ktor.application.feature import me.liuwj.ktorm.database.*
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 org.kodein.di.Kodein import org.kodein.di.Kodein
import org.kodein.di.description import org.kodein.di.description
import org.kodein.di.generic.bind import org.kodein.di.generic.bind

8
api/src/auth/AuthenticationModule.kt
View File

@ -1,11 +1,9 @@
package be.vandewalleh.auth package be.vandewalleh.auth
import be.vandewalleh.kodein import be.vandewalleh.kodein
import io.ktor.application.Application import io.ktor.application.*
import io.ktor.application.install import io.ktor.auth.*
import io.ktor.auth.Authentication import io.ktor.auth.jwt.*
import io.ktor.auth.UserIdPrincipal
import io.ktor.auth.jwt.jwt
import org.kodein.di.generic.instance import org.kodein.di.generic.instance
fun Application.authenticationModule() { fun Application.authenticationModule() {

2
api/src/auth/UsernamePasswordCredential.kt
View File

@ -1,6 +1,6 @@
package be.vandewalleh.auth package be.vandewalleh.auth
import io.ktor.auth.Credential import io.ktor.auth.*
/** /**
* Represents a simple user [username] and [password] credential pair * Represents a simple user [username] and [password] credential pair

2
api/src/entities/Chapter.kt
View File

@ -1,6 +1,6 @@
package be.vandewalleh.entities package be.vandewalleh.entities
import me.liuwj.ktorm.entity.Entity import me.liuwj.ktorm.entity.*
interface Chapter : Entity<Chapter> { interface Chapter : Entity<Chapter> {
companion object : Entity.Factory<Chapter>() companion object : Entity.Factory<Chapter>()

2
api/src/entities/Note.kt
View File

@ -1,6 +1,6 @@
package be.vandewalleh.entities package be.vandewalleh.entities
import me.liuwj.ktorm.entity.Entity import me.liuwj.ktorm.entity.*
import java.time.LocalDateTime import java.time.LocalDateTime
interface Note : Entity<Note> { interface Note : Entity<Note> {

2
api/src/entities/Tag.kt
View File

@ -1,6 +1,6 @@
package be.vandewalleh.entities package be.vandewalleh.entities
import me.liuwj.ktorm.entity.Entity import me.liuwj.ktorm.entity.*
interface Tag : Entity<Tag> { interface Tag : Entity<Tag> {
companion object : Entity.Factory<Tag>() companion object : Entity.Factory<Tag>()

2
api/src/entities/User.kt
View File

@ -1,6 +1,6 @@
package be.vandewalleh.entities package be.vandewalleh.entities
import me.liuwj.ktorm.entity.Entity import me.liuwj.ktorm.entity.*
import java.time.LocalDateTime import java.time.LocalDateTime
interface User : Entity<User> { interface User : Entity<User> {

11
api/src/extensions/ApplicationCallExtensions.kt
View File

@ -2,12 +2,11 @@ package be.vandewalleh.extensions
import be.vandewalleh.kodein import be.vandewalleh.kodein
import be.vandewalleh.services.UserService import be.vandewalleh.services.UserService
import io.ktor.application.ApplicationCall import io.ktor.application.*
import io.ktor.auth.UserIdPrincipal import io.ktor.auth.*
import io.ktor.auth.principal import io.ktor.http.*
import io.ktor.http.HttpStatusCode import io.ktor.request.*
import io.ktor.request.receive import io.ktor.response.*
import io.ktor.response.respond
import org.kodein.di.generic.instance import org.kodein.di.generic.instance
val userService by kodein.instance<UserService>() val userService by kodein.instance<UserService>()

2
api/src/extensions/ParametersExtensions.kt
View File

@ -3,7 +3,7 @@ package be.vandewalleh.extensions
import be.vandewalleh.kodein import be.vandewalleh.kodein
import be.vandewalleh.services.NotesService import be.vandewalleh.services.NotesService
import be.vandewalleh.tables.Notes import be.vandewalleh.tables.Notes
import io.ktor.http.Parameters import io.ktor.http.*
import org.kodein.di.generic.instance import org.kodein.di.generic.instance
val notesService by kodein.instance<NotesService>() val notesService by kodein.instance<NotesService>()

2
api/src/features/ConfigurationFeature.kt
View File

@ -1,7 +1,7 @@
package be.vandewalleh.features package be.vandewalleh.features
import be.vandewalleh.auth.SimpleJWT import be.vandewalleh.auth.SimpleJWT
import io.ktor.application.Application import io.ktor.application.*
import org.kodein.di.Kodein import org.kodein.di.Kodein
import org.kodein.di.generic.bind import org.kodein.di.generic.bind
import org.kodein.di.generic.instance import org.kodein.di.generic.instance

7
api/src/features/ContentNegotiationFeature.kt
View File

@ -1,10 +1,9 @@
package be.vandewalleh.features package be.vandewalleh.features
import com.fasterxml.jackson.databind.SerializationFeature import com.fasterxml.jackson.databind.SerializationFeature
import io.ktor.application.Application import io.ktor.application.*
import io.ktor.application.install import io.ktor.features.*
import io.ktor.features.ContentNegotiation import io.ktor.jackson.*
import io.ktor.jackson.jackson
fun Application.contentNegotiationFeature() { fun Application.contentNegotiationFeature() {
install(ContentNegotiation) { install(ContentNegotiation) {

7
api/src/features/CorsFeature.kt
View File

@ -1,9 +1,8 @@
package be.vandewalleh.features package be.vandewalleh.features
import io.ktor.application.Application import io.ktor.application.*
import io.ktor.application.install import io.ktor.features.*
import io.ktor.features.CORS import io.ktor.http.*
import io.ktor.http.HttpHeaders
fun Application.corsFeature() { fun Application.corsFeature() {
install(CORS) { install(CORS) {

12
api/src/features/ErrorFeature.kt
View File

@ -1,12 +1,10 @@
package be.vandewalleh.features package be.vandewalleh.features
import io.ktor.application.Application import io.ktor.application.*
import io.ktor.application.call import io.ktor.features.*
import io.ktor.application.install import io.ktor.http.*
import io.ktor.features.StatusPages import io.ktor.response.*
import io.ktor.http.HttpStatusCode import io.ktor.utils.io.errors.*
import io.ktor.response.respond
import io.ktor.utils.io.errors.IOException
fun Application.handleErrors() { fun Application.handleErrors() {
install(StatusPages) { install(StatusPages) {

2
api/src/features/Features.kt
View File

@ -1,7 +1,7 @@
package be.vandewalleh.features package be.vandewalleh.features
import be.vandewalleh.auth.authenticationModule import be.vandewalleh.auth.authenticationModule
import io.ktor.application.Application import io.ktor.application.*
fun Application.features() { fun Application.features() {
corsFeature() corsFeature()

5
api/src/routing/ChaptersController.kt
View File

@ -1,8 +1,7 @@
package be.vandewalleh.routing package be.vandewalleh.routing
import io.ktor.auth.authenticate import io.ktor.auth.*
import io.ktor.routing.Routing import io.ktor.routing.*
import io.ktor.routing.route
import org.kodein.di.Kodein import org.kodein.di.Kodein
fun Routing.chapters(kodein: Kodein) { fun Routing.chapters(kodein: Kodein) {

12
api/src/routing/LoginController.kt
View File

@ -3,13 +3,11 @@ package be.vandewalleh.routing
import be.vandewalleh.auth.SimpleJWT import be.vandewalleh.auth.SimpleJWT
import be.vandewalleh.auth.UsernamePasswordCredential import be.vandewalleh.auth.UsernamePasswordCredential
import be.vandewalleh.services.UserService import be.vandewalleh.services.UserService
import io.ktor.application.call import io.ktor.application.*
import io.ktor.http.HttpStatusCode import io.ktor.http.*
import io.ktor.request.receive import io.ktor.request.*
import io.ktor.response.respond import io.ktor.response.*
import io.ktor.routing.Routing import io.ktor.routing.*
import io.ktor.routing.post
import io.ktor.routing.route
import org.kodein.di.Kodein import org.kodein.di.Kodein
import org.kodein.di.generic.instance import org.kodein.di.generic.instance
import org.mindrot.jbcrypt.BCrypt import org.mindrot.jbcrypt.BCrypt

9
api/src/routing/NotesController.kt
View File

@ -2,11 +2,10 @@ package be.vandewalleh.routing
import be.vandewalleh.extensions.userId import be.vandewalleh.extensions.userId
import be.vandewalleh.services.NotesService import be.vandewalleh.services.NotesService
import io.ktor.application.call import io.ktor.application.*
import io.ktor.auth.authenticate import io.ktor.auth.*
import io.ktor.response.respond import io.ktor.response.*
import io.ktor.routing.Routing import io.ktor.routing.*
import io.ktor.routing.get
import org.kodein.di.Kodein import org.kodein.di.Kodein
import org.kodein.di.generic.instance import org.kodein.di.generic.instance

11
api/src/routing/RegisterController.kt
View File

@ -3,12 +3,11 @@ package be.vandewalleh.routing
import be.vandewalleh.extensions.respondStatus import be.vandewalleh.extensions.respondStatus
import be.vandewalleh.services.UserRegistrationDto import be.vandewalleh.services.UserRegistrationDto
import be.vandewalleh.services.UserService import be.vandewalleh.services.UserService
import io.ktor.application.call import io.ktor.application.*
import io.ktor.http.HttpStatusCode import io.ktor.http.*
import io.ktor.request.receive import io.ktor.request.*
import io.ktor.response.respond import io.ktor.response.*
import io.ktor.routing.Routing import io.ktor.routing.*
import io.ktor.routing.post
import org.kodein.di.Kodein import org.kodein.di.Kodein
import org.kodein.di.generic.instance import org.kodein.di.generic.instance
import org.mindrot.jbcrypt.BCrypt import org.mindrot.jbcrypt.BCrypt

2
api/src/routing/Routes.kt
View File

@ -1,6 +1,6 @@
package be.vandewalleh.routing package be.vandewalleh.routing
import io.ktor.routing.Routing import io.ktor.routing.*
import org.kodein.di.Kodein import org.kodein.di.Kodein
fun Routing.registerRoutes(kodein: Kodein) { fun Routing.registerRoutes(kodein: Kodein) {

8
api/src/routing/TitleController.kt
View File

@ -2,10 +2,10 @@ package be.vandewalleh.routing
import be.vandewalleh.extensions.* import be.vandewalleh.extensions.*
import be.vandewalleh.services.NotesService import be.vandewalleh.services.NotesService
import io.ktor.application.call import io.ktor.application.*
import io.ktor.auth.authenticate import io.ktor.auth.*
import io.ktor.http.HttpStatusCode import io.ktor.http.*
import io.ktor.response.respond import io.ktor.response.*
import io.ktor.routing.* import io.ktor.routing.*
import org.kodein.di.Kodein import org.kodein.di.Kodein
import org.kodein.di.generic.instance import org.kodein.di.generic.instance

2
api/src/services/NotesService.kt
View File

@ -3,7 +3,7 @@ package be.vandewalleh.services
import be.vandewalleh.tables.Chapters import be.vandewalleh.tables.Chapters
import be.vandewalleh.tables.Notes import be.vandewalleh.tables.Notes
import be.vandewalleh.tables.Tags import be.vandewalleh.tables.Tags
import me.liuwj.ktorm.database.Database import me.liuwj.ktorm.database.*
import me.liuwj.ktorm.dsl.* import me.liuwj.ktorm.dsl.*
import org.kodein.di.Kodein import org.kodein.di.Kodein
import org.kodein.di.KodeinAware import org.kodein.di.KodeinAware

5
api/src/services/UserService.kt
View File

@ -2,10 +2,9 @@ package be.vandewalleh.services
import be.vandewalleh.entities.User import be.vandewalleh.entities.User
import be.vandewalleh.tables.Users 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.dsl.*
import me.liuwj.ktorm.entity.add import me.liuwj.ktorm.entity.*
import me.liuwj.ktorm.entity.sequenceOf
import org.kodein.di.Kodein import org.kodein.di.Kodein
import org.kodein.di.KodeinAware import org.kodein.di.KodeinAware
import org.kodein.di.generic.instance import org.kodein.di.generic.instance

6
api/src/tables/Chapters.kt
View File

@ -1,11 +1,7 @@
package be.vandewalleh.tables package be.vandewalleh.tables
import be.vandewalleh.entities.Chapter import be.vandewalleh.entities.Chapter
import be.vandewalleh.entities.Tag import me.liuwj.ktorm.schema.*
import me.liuwj.ktorm.schema.Table
import me.liuwj.ktorm.schema.int
import me.liuwj.ktorm.schema.text
import me.liuwj.ktorm.schema.varchar
object Chapters : Table<Chapter>("Chapters") { object Chapters : Table<Chapter>("Chapters") {
val id by int("id").primaryKey().bindTo { it.id } val id by int("id").primaryKey().bindTo { it.id }

4
api/src/tables/Tags.kt
View File

@ -1,9 +1,7 @@
package be.vandewalleh.tables package be.vandewalleh.tables
import be.vandewalleh.entities.Tag import be.vandewalleh.entities.Tag
import me.liuwj.ktorm.schema.Table import me.liuwj.ktorm.schema.*
import me.liuwj.ktorm.schema.int
import me.liuwj.ktorm.schema.varchar
object Tags : Table<Tag>("Tags") { object Tags : Table<Tag>("Tags") {
val id by int("id").primaryKey().bindTo { it.id } val id by int("id").primaryKey().bindTo { it.id }

5
api/src/tables/Users.kt
View File

@ -1,10 +1,7 @@
package be.vandewalleh.tables package be.vandewalleh.tables
import be.vandewalleh.entities.User import be.vandewalleh.entities.User
import me.liuwj.ktorm.schema.Table import me.liuwj.ktorm.schema.*
import me.liuwj.ktorm.schema.datetime
import me.liuwj.ktorm.schema.int
import me.liuwj.ktorm.schema.varchar
object Users : Table<User>("Users") { object Users : Table<User>("Users") {
val id by int("id").primaryKey().bindTo { it.id } val id by int("id").primaryKey().bindTo { it.id }