Adapt the new model structure and standalize uris

.github/workflows/build-pr.yml

@@ -18,11 +18,11 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 24
+          java-version: 25
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Build on ${{ matrix.os }}
-        run: ./gradlew clean build test
+        run: ./gradlew clean build
       - name: Generate JaCoCo Coverage Report
         if: matrix.os == 'ubuntu-latest'
         run: ./gradlew jacocoTestReport

build.gradle.kts

@@ -1,10 +1,9 @@
 plugins {
     alias(libs.plugins.micronaut.application)
     alias(libs.plugins.micronaut.aot)
-    alias(libs.plugins.micronaut.test.resources)
+//    alias(libs.plugins.micronaut.test.resources) // TODO: Needs be fixed, ref: https://github.com/micronaut-projects/micronaut-gradle-plugin/issues/1195
     jacoco
     `maven-publish`
-    id("org.openapi.generator") version "7.14.0"
     alias(libs.plugins.cyclonedx)
 }
 
@@ -37,7 +36,6 @@ dependencies {
     implementation(mn.micronaut.openapi)
     implementation(mn.validation)
     implementation(mn.swagger.core)
-    implementation(mn.micronaut.management)
     implementation(mn.micronaut.micrometer.core)
     implementation(mn.micronaut.micrometer.registry.prometheus)
     // External Dependencies
@@ -105,93 +103,6 @@ tasks {
             csv.required.set(false)
         }
     }
-    this.openApiGenerate {
-        dependsOn("compileJava")
-    }
-    register("pushDartClient") {
-        dependsOn("openApiGenerate")
-       doLast {
-           val clientDir = file("$projectDir/build/generated/dart-client")
-           val version = project.version as String
-
-           // Get GitHub credentials from environment variables
-           val githubToken = System.getenv("CLIENT_REPO_TOKEN") ?: System.getenv("GITHUB_TOKEN") ?: throw GradleException("CLIENT_REPO_TOKEN or GITHUB_TOKEN environment variable is required")
-
-           // Create a temporary directory for the Git repository
-           val tempDir = file("$projectDir/build/temp/vulpes-client")
-           tempDir.mkdirs()
-           providers.exec {
-               workingDir = tempDir
-               commandLine("git", "clone", "https://${githubToken}@github.com/OneLiteFeatherNET/vulpes-backend-client-dart.git", ".")
-           }.result?.get()
-
-           // Copy the generated client to the repository
-           copy {
-               from(clientDir)
-               into(tempDir)
-           }
-
-//           providers.exec {
-//               workingDir = tempDir
-//               commandLine("flutter", "pub", "get")
-//           }.result?.get()
-
-//           providers.exec {
-//               workingDir = tempDir
-//               commandLine("flutter", "pub", "run", "build_runner", "build", "--delete-conflicting-outputs")
-//           }.result?.get()
-
-           providers.exec {
-               workingDir = tempDir
-               commandLine("git", "add", ".")
-           }.result?.get()
-
-           providers.exec {
-               workingDir = tempDir
-               commandLine("git", "commit", "-m", "Update client to version $version")
-           }.result?.get()
-
-           providers.exec {
-               workingDir = tempDir
-               commandLine("git", "tag", "-a", "v$version", "-m", "Version $version")
-           }.result?.get()
-
-           providers.exec {
-               workingDir = tempDir
-               commandLine("git", "push", "origin")
-           }.result?.get()
-
-           providers.exec {
-               workingDir = tempDir
-               commandLine("git", "push", "origin", "--tags")
-           }.result?.get()
-       }
-    }
-    named("publish") {
-        dependsOn("pushDartClient")
-    }
-}
-
-// OpenAPI Generator configuration
-openApiGenerate {
-    generatorName.set("dart-dio")
-    inputSpec.set("$projectDir/build/classes/java/main/META-INF/swagger/vulpes-backend-1.0.yml")
-    outputDir.set("$projectDir/build/generated/dart-client")
-    apiPackage.set("net.onelitefeather.vulpes.backend.client.api")
-    invokerPackage.set("net.onelitefeather.vulpes.backend.client.invoker")
-    modelPackage.set("net.onelitefeather.vulpes.backend.client.model")
-    configOptions.set(mapOf(
-        "pubName" to "vulpes_backend_client",
-        "pubVersion" to (project.version as String),
-        "pubDescription" to "Vulpes Backend API Client",
-        "pubAuthor" to "OneLiteFeatherNET",
-        "pubAuthorEmail" to "p.glanz@madfix.me",
-        "pubHomepage" to "https://github.com/OneLiteFeatherNET/vulpes-backend-client-dart",
-        "pubRepository" to "https://github.com/OneLiteFeatherNET/vulpes-backend-client-dart",
-        "pubPublishTo" to "https://github.com/OneLiteFeatherNET/vulpes-backend-client-dart",
-        "dateLibrary" to "core",
-        "enumUnknownDefaultCase" to "true"
-    ))
 }
 
 publishing {

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.parallel=true
 # org.gradle.warning.mode=all
 # org.gradle.logging.level=info
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8 -Dmicronaut.openapi.views.spec=redoc.enabled=true,rapidoc.enabled=true,openapi-explorer.enabled=true,swagger-ui.enabled=true,swagger-ui.theme=flattop
-micronautVersion=4.10.1
+micronautVersion=4.10.2
 
 # The version of the Vulpes API
 version=999.0.0-SNAPSHOT

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,8 +210,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.gradle.kts

@@ -33,7 +33,7 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             version("micronaut", "4.6.1")
-            version("vulpes.model", "1.6.0-beta.11")
+            version("vulpes.model", "1.6.0-beta.14")
             version("uuid.creator", "6.1.1")
             version("datafaker", "2.4.2")
             version("jetbrains.annotation", "26.0.2")

src/main/java/net/onelitefeather/vulpes/backend/controller/AttributeController.java

@@ -144,7 +144,7 @@ public HttpResponse<AttributeModelResponseDTO> delete(@PathVariable UUID id) {
                     schema = @Schema(implementation = AttributeModelResponseDTO.AttributeModelDTO.class)
             )
     )
-    @Delete("/delete/all")
+    @Delete("/delete")
     public HttpResponse<List<AttributeModelResponseDTO>> deleteAll() {
         List<AttributeModelResponseDTO> result = attributeService.deleteAllAttributes();
         return HttpResponse.ok(result);
@@ -173,7 +173,7 @@ public HttpResponse<List<AttributeModelResponseDTO>> deleteAll() {
             )
     )
     @Produces(MediaType.APPLICATION_JSON)
-    @Get(uris = {"/all"})
+    @Get(uris = {"/"})
     public HttpResponse<Page<AttributeModelResponseDTO.AttributeModelDTO>> getAll(Pageable pageable) {
         Page<AttributeModelResponseDTO.AttributeModelDTO> models = attributeService.getAllAttributes(pageable);
         return HttpResponse.ok(models);