Update

.github/dependabot.yml

@@ -14,7 +14,18 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "daily"
+      time: "10:00"
+      timezone: "Europe/Paris"
+    assignees:
+      - "Ziedelth"
+    reviewers:
+      - "Ziedelth"
+
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "daily"
       time: "10:00"
       timezone: "Europe/Paris"
     assignees:

.github/workflows/pull_requests.yml

@@ -35,4 +35,26 @@ jobs:
           distribution: 'adopt'
 
       - name: Build
-        run: mvn -B package -DskipTests
+        run: mvn -B package -DskipTests
+
+  docker:
+    runs-on: ubuntu-latest
+
+    needs:
+      - build
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build docker file
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: false
+          tags: registry.ziedelth.fr:5000/jais-api:dev

.github/workflows/push.yml

@@ -40,6 +40,42 @@ jobs:
       - name: Build
         run: mvn -B package -DskipTests
 
+  sonar:
+    if: github.ref == 'refs/heads/master'
+    name: Sonarqube
+    runs-on: ubuntu-latest
+
+    needs:
+      - test
+
+    permissions: read-all
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: 'adopt'
+      - name: Cache SonarQube packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+      - name: Cache Maven packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+      - name: Build and analyze
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
+        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=jais-api -Dsonar.projectName='jais-api'
+
   docker:
     runs-on: ubuntu-latest
 

Dockerfile

@@ -1,13 +1,13 @@
-FROM maven:3.9.4-amazoncorretto-17 AS build
+FROM maven:3-amazoncorretto-21 AS build
 COPY . /app
 WORKDIR /app
 RUN mvn clean package -DskipTests
 
-FROM amazoncorretto:17-alpine
+FROM amazoncorretto:21-alpine
 COPY --from=build /app/target/api-1.0.0-jar-with-dependencies.jar /app/api.jar
 COPY --from=build /app/data/ /app/data/
 
-RUN apk update && apk add gcompat opencv-dev
+RUN apk update && apk add gcompat opencv-dev && rm -rf /var/cache/apk/*
 EXPOSE 8080
 WORKDIR /app
 ENTRYPOINT ["java", "-jar", "api.jar"]

pom.xml

@@ -20,10 +20,9 @@
         <junit-jupiter.version>5.10.0</junit-jupiter.version>
 
         <sonar.coverage.exclusions>
-            **/fr/ziedelth/events/**,
-            **/fr/ziedelth/listeners/**,
+            **/fr/ziedelth/dtos/**,
+            **/fr/ziedelth/entities/**,
             **/fr/ziedelth/plugins/**,
-            **/fr/ziedelth/utils/**,
             **/fr/ziedelth/Application.kt
         </sonar.coverage.exclusions>
     </properties>
@@ -145,7 +144,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>32.1.2-jre</version>
+            <version>32.1.3-jre</version>
         </dependency>
         <dependency>
             <groupId>com.google.inject</groupId>

src/main/kotlin/fr/ziedelth/Application.kt

@@ -23,7 +23,7 @@ fun main(args: Array<String>) {
     }
 
     println("Loading OpenCV...")
-    OpenCV.loadShared()
+    OpenCV.loadLocally()
     println("OpenCV loaded")
     println("Connecting to database...")
     database = Database()
@@ -33,25 +33,7 @@ fun main(args: Array<String>) {
     try {
         PluginManager.loadPlugins()
         ListenerManager()
-
-        Thread {
-            val scanner = Scanner(System.`in`)
-
-            while (true) {
-                try {
-                    val line = scanner.nextLine()
-
-                    if (line == "reload") {
-                        PluginManager.reload()
-                        ListenerManager()
-                    } else if (line == "invalid-cache") {
-                        ImageCache.invalidCache(database)
-                    }
-                } catch (_: Exception) {
-                    Thread.sleep(1000)
-                }
-            }
-        }.start()
+        handleCommands()
     } catch (e: Exception) {
         e.printStackTrace()
     }
@@ -65,6 +47,27 @@ fun main(args: Array<String>) {
     ).start(wait = true)
 }
 
+private fun handleCommands() {
+    Thread {
+        val scanner = Scanner(System.`in`)
+
+        while (true) {
+            try {
+                val line = scanner.nextLine()
+
+                if (line == "reload") {
+                    PluginManager.reload()
+                    ListenerManager()
+                } else if (line == "invalid-cache") {
+                    ImageCache.invalidCache(database)
+                }
+            } catch (_: Exception) {
+                Thread.sleep(1000)
+            }
+        }
+    }.start()
+}
+
 fun Application.myApplicationModule() {
     println("Configure server...")
     configureHTTP()

src/main/kotlin/fr/ziedelth/controllers/AbstractController.kt

@@ -6,6 +6,8 @@ import io.ktor.http.*
 import io.ktor.server.application.*
 import io.ktor.server.response.*
 import io.ktor.util.pipeline.*
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.async
 import java.io.Serializable
 import java.lang.reflect.ParameterizedType
 import java.util.*
@@ -46,17 +48,17 @@ open class AbstractController<T : Serializable>(open val prefix: String) {
         return Pair(page, limit)
     }
 
-    protected suspend fun PipelineContext<Unit, ApplicationCall>.isUnauthorized(): Boolean {
+    protected fun PipelineContext<Unit, ApplicationCall>.isUnauthorized(): Deferred<Boolean> = async {
         if (!Constant.secureKey.isNullOrBlank()) {
             val authorization = call.request.headers[HttpHeaders.Authorization]
 
             if (Constant.secureKey != authorization) {
                 println("Unauthorized request")
                 call.respond(HttpStatusCode.Unauthorized, "Secure key not equals")
-                return true
+                return@async true
             }
         }
 
-        return false
+        return@async false
     }
 }

src/main/kotlin/fr/ziedelth/controllers/AnimeController.kt

@@ -18,6 +18,8 @@ import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import java.util.*
 
+private const val ANIME_NOT_FOUND_ERROR = "Anime not found"
+
 class AnimeController : AttachmentController<Anime>("/animes") {
     @Inject
     private lateinit var countryRepository: CountryRepository
@@ -97,7 +99,7 @@ class AnimeController : AttachmentController<Anime>("/animes") {
     private fun Route.save() {
         post {
             println("POST $prefix")
-            if (isUnauthorized()) return@post
+            if (isUnauthorized().await()) return@post
 
             try {
                 val anime = call.receive<Anime>()
@@ -152,14 +154,14 @@ class AnimeController : AttachmentController<Anime>("/animes") {
     private fun Route.update() {
         put {
             println("PUT $prefix")
-            if (isUnauthorized()) return@put
+            if (isUnauthorized().await()) return@put
 
             try {
                 val anime = call.receive<Anime>()
                 var savedAnime = animeRepository.find(anime.uuid)
 
                 if (savedAnime == null) {
-                    call.respond(HttpStatusCode.NotFound, "Anime not found")
+                    call.respond(HttpStatusCode.NotFound, ANIME_NOT_FOUND_ERROR)
                     return@put
                 }
 
@@ -199,11 +201,11 @@ class AnimeController : AttachmentController<Anime>("/animes") {
             try {
                 val uuid = UUID.fromString(call.parameters["uuid"]!!)
                 println("DELETE $prefix/$uuid")
-                if (isUnauthorized()) return@delete
+                if (isUnauthorized().await()) return@delete
                 val savedAnime = animeRepository.find(uuid)
 
                 if (savedAnime == null) {
-                    call.respond(HttpStatusCode.NotFound, "Anime not found")
+                    call.respond(HttpStatusCode.NotFound, ANIME_NOT_FOUND_ERROR)
                     return@delete
                 }
 
@@ -220,7 +222,7 @@ class AnimeController : AttachmentController<Anime>("/animes") {
     @APIRoute
     private fun Route.merge() {
         put("/merge") {
-            if (isUnauthorized()) return@put
+            if (isUnauthorized().await()) return@put
 
             // Get list of uuids
             val uuids = call.receive<List<String>>().map { UUID.fromString(it) }
@@ -229,8 +231,8 @@ class AnimeController : AttachmentController<Anime>("/animes") {
             val animes = uuids.mapNotNull { animeRepository.find(it) }
 
             if (animes.isEmpty()) {
-                println("Anime not found")
-                call.respond(HttpStatusCode.NotFound, "Anime not found")
+                println(ANIME_NOT_FOUND_ERROR)
+                call.respond(HttpStatusCode.NotFound, ANIME_NOT_FOUND_ERROR)
                 return@put
             }
 

src/main/kotlin/fr/ziedelth/controllers/AyaneController.kt

@@ -15,7 +15,7 @@ class AyaneController : AbstractController<Ayane>("/ayane") {
     private fun Route.save() {
         post {
             println("POST $prefix")
-            if (isUnauthorized()) return@post
+            if (isUnauthorized().await()) return@post
 
             try {
                 val ayane = call.receive<Ayane>()

src/main/kotlin/fr/ziedelth/controllers/CountryController.kt

@@ -31,7 +31,7 @@ class CountryController : AbstractController<Country>("/countries") {
     private fun Route.save() {
         post {
             println("POST $prefix")
-            if (isUnauthorized()) return@post
+            if (isUnauthorized().await()) return@post
 
             try {
                 val country = call.receive<Country>()

src/main/kotlin/fr/ziedelth/controllers/EpisodeController.kt

@@ -162,7 +162,7 @@ class EpisodeController : AttachmentController<Episode>("/episodes") {
     private fun Route.saveMultiple() {
         post("/multiple") {
             println("POST $prefix/multiple")
-            if (isUnauthorized()) return@post
+            if (isUnauthorized().await()) return@post
 
             try {
                 val episodes = call.receive<List<Episode>>().filter { !episodeRepository.exists("hash", it.hash!!) }

src/main/kotlin/fr/ziedelth/controllers/EpisodeTypeController.kt

@@ -31,7 +31,7 @@ class EpisodeTypeController : AbstractController<EpisodeType>("/episodetypes") {
     private fun Route.save() {
         post {
             println("POST $prefix")
-            if (isUnauthorized()) return@post
+            if (isUnauthorized().await()) return@post
 
             try {
                 val episodeType = call.receive<EpisodeType>()

src/main/kotlin/fr/ziedelth/controllers/GenreController.kt

@@ -27,7 +27,7 @@ class GenreController : AbstractController<Genre>("/genres") {
     private fun Route.save() {
         post {
             println("POST $prefix")
-            if (isUnauthorized()) return@post
+            if (isUnauthorized().await()) return@post
 
             try {
                 val genre = call.receive<Genre>()

src/main/kotlin/fr/ziedelth/controllers/LangTypeController.kt

@@ -31,7 +31,7 @@ class LangTypeController : AbstractController<LangType>("/langtypes") {
     private fun Route.save() {
         post {
             println("POST $prefix")
-            if (isUnauthorized()) return@post
+            if (isUnauthorized().await()) return@post
 
             try {
                 val langType = call.receive<LangType>()

src/main/kotlin/fr/ziedelth/controllers/PlatformController.kt

@@ -28,7 +28,7 @@ class PlatformController : AttachmentController<Platform>("/platforms") {
     private fun Route.save() {
         post {
             println("POST $prefix")
-            if (isUnauthorized()) return@post
+            if (isUnauthorized().await()) return@post
 
             try {
                 val platform = call.receive<Platform>()

src/main/kotlin/fr/ziedelth/repositories/AbstractRepository.kt

@@ -9,8 +9,7 @@ open class AbstractRepository<T> {
     @Inject
     protected lateinit var database: Database
 
-    private val entityClass: Class<T> =
-        (javaClass.genericSuperclass as ParameterizedType).actualTypeArguments[0] as Class<T>
+    private val entityClass: Class<T> = (javaClass.genericSuperclass as ParameterizedType).actualTypeArguments[0] as Class<T> // NOSONAR
     private val entityName: String = entityClass.simpleName
 
     fun find(uuid: UUID): T? {

src/main/kotlin/fr/ziedelth/repositories/AnimeRepository.kt

@@ -61,15 +61,6 @@ class AnimeRepository : AbstractRepository<Anime>(),
         )
     }
 
-    override fun getByPageWithList(list: List<UUID>, page: Int, limit: Int): List<Anime> {
-        return super.getByPage(
-            page,
-            limit,
-            "FROM Anime WHERE uuid IN :list ORDER BY name",
-            "list" to list
-        )
-    }
-
     fun getDiary(tag: String, day: Int): List<Anime> {
         return database.inTransaction { session ->
             val query = session.createQuery(