hb/zz_app
1
0 Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

more package clean up

Browse Source
This commit is contained in:
Hartmut Bauer committed 2026-02-10 18:33:26 +01:00
1 parent c4400a0334
commit bd63935a1e
16 files changed
+24 -52
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

server/build.gradle.kts
+1 -1
View File
@@ -28,7 +28,7 @@ tasks.withType<Sync> {
}
application {
mainClass.set("net.keinekekse.app.ApplicationKt")
mainClass.set("net.keinekekse.app.server.ApplicationKt")
val isDevelopment: Boolean = project.ext.has("development")
applicationDefaultJvmArgs = listOf("-Dio.ktor.development=$isDevelopment")
server/buildnumber.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#auto generated
#Tue Feb 10 00:04:01 CET 2026
build.number=50
#Tue Feb 10 18:18:54 CET 2026
build.number=58
server/src/main/kotlin/net/keinekekse/app/Application.kt → server/src/main/kotlin/net/keinekekse/app/server/Application.kt
+3 -3
View File
@@ -1,13 +1,13 @@
package net.keinekekse.app
package net.keinekekse.app.server
import io.github.oshai.kotlinlogging.KotlinLogging
import io.ktor.server.application.*
import net.keinekekse.app.server.VERSION
import io.ktor.server.netty.*
import net.keinekekse.app.server.config.*
private val logger = KotlinLogging.logger {}
fun main(args: Array<String>): Unit = io.ktor.server.netty.EngineMain.main(args)
fun main(args: Array<String>): Unit = EngineMain.main(args)
//fun main() {
//// embeddedServer(Netty, port = SERVER_PORT, host = "0.0.0.0", module = Application::module)
server/src/main/kotlin/net/keinekekse/app/server/Version.kt
+4 -4
View File
@@ -3,14 +3,14 @@ package net.keinekekse.app.server
import net.keinekekse.version.Version
object VERSION: Version {
override val version = "0.1.0-beta.1+build.50"
override val fullVersion = "0.1.0-beta.1+build.50"
override val version = "0.1.0-beta.1+build.58"
override val fullVersion = "0.1.0-beta.1+build.58"
override val major = 0
override val minor = 1
override val patch = 0
override val preRelease = "beta.1"
override val buildMetadata = "build.50"
override val buildDate = "2026-02-09T23:04:01.715682Z"
override val buildMetadata = "build.58"
override val buildDate = "2026-02-10T17:18:54.134684Z"
override val displayName = "kAS"
override val copyright = "Copyright (c) 2026 Hartmut Bauer"
override val name = "server"
server/src/main/kotlin/net/keinekekse/app/server/books/booksRoute.kt
+2 -2
View File
@@ -1,11 +1,11 @@
package books
package net.keinekekse.app.server.books
import books.model.BookRepository
import io.ktor.http.*
import io.ktor.server.auth.*
import io.ktor.server.response.*
import io.ktor.server.routing.*
import net.keinekekse.app.UserRoles
import net.keinekekse.app.server.books.model.BookRepository
import org.koin.ktor.ext.inject
fun Route.booksRoute() {
server/src/main/kotlin/net/keinekekse/app/server/books/db/ArtistDAO.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package books.db
package net.keinekekse.app.server.books.db
import org.jetbrains.exposed.v1.core.dao.id.EntityID
import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
server/src/main/kotlin/net/keinekekse/app/server/books/db/ArtistRoleDAO.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package books.db
package net.keinekekse.app.server.books.db
import org.jetbrains.exposed.v1.core.dao.id.EntityID
import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
server/src/main/kotlin/net/keinekekse/app/server/books/db/ArtistToBookDAO.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package books.db
package net.keinekekse.app.server.books.db
import org.jetbrains.exposed.v1.core.dao.id.EntityID
import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
server/src/main/kotlin/net/keinekekse/app/server/books/db/BookDAO.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package books.db
package net.keinekekse.app.server.books.db
import net.keinekekse.app.books.model.*
import org.jetbrains.exposed.v1.core.dao.id.EntityID
server/src/main/kotlin/net/keinekekse/app/server/books/db/SeriesDAO.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package books.db
package net.keinekekse.app.server.books.db
import org.jetbrains.exposed.v1.core.dao.id.EntityID
import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
server/src/main/kotlin/net/keinekekse/app/server/books/model/BookRepository.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package books.model
package net.keinekekse.app.server.books.model
import net.keinekekse.app.books.model.Artist
import net.keinekekse.app.books.model.Book
server/src/main/kotlin/net/keinekekse/app/server/books/model/BookRepositoryImpl.kt
+3 -3
View File
@@ -1,10 +1,10 @@
package books.model
package net.keinekekse.app.server.books.model
import books.db.BookDAO
import books.db.daoToModel
import net.keinekekse.app.books.model.Artist
import net.keinekekse.app.books.model.Book
import net.keinekekse.app.books.model.Series
import net.keinekekse.app.server.books.db.BookDAO
import net.keinekekse.app.server.books.db.daoToModel
import org.jetbrains.exposed.v1.jdbc.transactions.suspendTransaction
import org.koin.core.annotation.Single
server/src/main/kotlin/net/keinekekse/app/server/config/routing.kt
+1 -1
View File
@@ -1,6 +1,5 @@
package net.keinekekse.app.server.config
import books.booksRoute
import io.github.oshai.kotlinlogging.KotlinLogging
import io.ktor.server.application.*
import io.ktor.server.auth.*
@@ -8,6 +7,7 @@ import io.ktor.server.response.*
import io.ktor.server.routing.*
import net.keinekekse.app.UserRoles
import net.keinekekse.app.server.VERSION
import net.keinekekse.app.server.books.booksRoute
private val logger = KotlinLogging.logger {}
server/src/main/kotlin/net/keinekekse/app/server/testdb/testDbRoute.kt
-28
View File
@@ -1,28 +0,0 @@
package net.keinekekse.app.server.testdb
import io.ktor.http.*
import io.ktor.server.response.*
import io.ktor.server.routing.*
import net.keinekekse.app.server.testdb.model.BookRepository
import org.koin.ktor.ext.inject
fun Route.testDbRoute() {
val repository: BookRepository by inject<BookRepository>()
// authenticate("auth-KC") {
route("/testdb") {
get("/books") {
// call.respondText("Test DB route")
val books = repository.allBooks()
call.respond(books)
}
get("/book/{id}") {
// TODO safe toInt conv
val id = call.parameters["id"]!!.toInt()
repository.bookById(id)?.let { call.respond(it) }
?: call.respondText("Book with id $id not found", status = HttpStatusCode.NotFound)
}
}
// }
}
server/src/main/resources/application.conf
+1 -1
View File
@@ -16,7 +16,7 @@ ktor {
}
application {
# ApplicationKt.module() übernimmt die Konfiguration
modules = [ net.keinekekse.app.ApplicationKt.module ]
modules = [ net.keinekekse.app.server.ApplicationKt.module ]
}
}
keycloak {
server/src/main/resources/logback.xml
+1 -1
View File
@@ -7,6 +7,6 @@
<root level="trace">
<appender-ref ref="STDOUT"/>
</root>
<logger name="org.eclipse.jetty" level="INFO"/>
<logger name="com.zaxxer.hikari" level="INFO"/>
<logger name="io.netty" level="INFO"/>
</configuration>