v1.1.0

build.gradle.kts

@@ -1,6 +1,8 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
-    kotlin("jvm") version "1.8.10"
-    kotlin("plugin.allopen") version "1.8.10"
+    kotlin("jvm") version "2.1.0"
     id("io.quarkus")
 }
 
@@ -15,31 +17,30 @@ val quarkusPlatformVersion: String by project
 
 dependencies {
     implementation(enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}"))
-    implementation("io.quarkus:quarkus-resteasy-reactive-qute")
+    implementation("io.quarkus:quarkus-rest-qute")
     implementation("io.quarkus:quarkus-kotlin")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib")
     implementation("io.quarkus:quarkus-arc")
     testImplementation("io.quarkus:quarkus-junit5")
 }
 
 group = "fr.spacefox"
-version = "1.0.1"
+version = "1.0.7"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 tasks.withType<Test> {
     systemProperty("java.util.logging.manager", "org.jboss.logmanager.LogManager")
 }
-allOpen {
-    annotation("javax.ws.rs.Path")
-    annotation("javax.enterprise.context.ApplicationScoped")
-    annotation("io.quarkus.test.junit.QuarkusTest")
-}
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString()
-    kotlinOptions.javaParameters = true
+tasks.withType<KotlinCompile> {
+    compilerOptions {
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
+        compilerOptions.jvmTarget.set(JvmTarget.JVM_21)
+        // For Qute templates to work
+        compilerOptions.javaParameters = true
+    }
 }

gradle.properties

@@ -1,6 +1,6 @@
 #Gradle properties
 quarkusPluginId=io.quarkus
-quarkusPluginVersion=2.16.2.Final
+quarkusPluginVersion=3.15.3
 quarkusPlatformGroupId=io.quarkus.platform
 quarkusPlatformArtifactId=quarkus-bom
-quarkusPlatformVersion=2.16.2.Final
+quarkusPlatformVersion=3.15.3

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,12 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +134,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,11 +201,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -26,6 +28,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -42,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

src/main/kotlin/fr/spacefox/japon/Resource.kt

@@ -5,26 +5,22 @@ import fr.spacefox.japon.data.Page
 import fr.spacefox.japon.data.Place
 import io.quarkus.qute.Template
 import io.quarkus.qute.TemplateInstance
-import javax.ws.rs.GET
-import javax.ws.rs.Path
-import javax.ws.rs.PathParam
-import javax.ws.rs.Produces
-import javax.ws.rs.core.MediaType
+import jakarta.ws.rs.GET
+import jakarta.ws.rs.Path
+import jakarta.ws.rs.PathParam
+import jakarta.ws.rs.Produces
+import jakarta.ws.rs.core.MediaType
 
 @Path("/")
 class ListHtmlResource(val list: Template) {
 
-
-    @GET
-    @Path("")
-    @Produces(MediaType.TEXT_HTML)
-    fun root(): TemplateInstance = accueil()
+    @GET @Path("") @Produces(MediaType.TEXT_HTML) fun root(): TemplateInstance = accueil()
 
     @GET
     @Path("accueil")
     @Produces(MediaType.TEXT_HTML)
     fun accueil(): TemplateInstance =
-        list.data("title", "Accueil").data("pages", Page.values()).withMenuData()
+        list.data("title", "Accueil").data("pages", Page.entries.toTypedArray()).withMenuData()
 
     @GET
     @Path("category/{name}")
@@ -83,5 +79,6 @@ class LicencesResource(val licences: Template) {
 }
 
 private fun TemplateInstance.withMenuData(): TemplateInstance {
-    return this.data("categories", Category.values()).data("places", Place.values())
+    return this.data("categories", Category.entries.toTypedArray())
+        .data("places", Place.entries.toTypedArray())
 }

src/main/kotlin/fr/spacefox/japon/data/Category.kt

@@ -11,7 +11,7 @@ enum class Category(val displayName: String) {
     quotidien("Vie quotidienne"),
     francisla("Francis-La");
 
-    fun pages(): List<Page> = Page.values().filter { it.category == this }
+    fun pages(): List<Page> = Page.entries.filter { it.category == this }
 
     fun imgCount(): Int = pages().sumOf { it.imgCount() }
 }

src/main/kotlin/fr/spacefox/japon/data/Place.kt

@@ -6,58 +6,67 @@ enum class Place(val displayName: String, val iframeSrc: String, val link: Strin
         iframeSrc =
             "https://www.google.com/maps?f=q&source=s_q&hl=fr&geocode=&q=Nagano,+Pr%C3%A9fecture+de+Nagano,+Japon&aq=0&oq=nagano&sll=36.177791,137.80426&sspn=1.877743,4.22699&ie=UTF8&hq=&hnear=Nagano,+Pr%C3%A9fecture+de+Nagano,+Japon&t=p&ll=37.405074,139.855957&spn=6.979889,16.501465&z=6&output=embed",
         link =
-            "https://www.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=Nagano,+Pr%C3%A9fecture+de+Nagano,+Japon&aq=0&oq=nagano&sll=36.177791,137.80426&sspn=1.877743,4.22699&ie=UTF8&hq=&hnear=Nagano,+Pr%C3%A9fecture+de+Nagano,+Japon&t=p&ll=37.405074,139.855957&spn=6.979889,16.501465&z=6"),
+            "https://www.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=Nagano,+Pr%C3%A9fecture+de+Nagano,+Japon&aq=0&oq=nagano&sll=36.177791,137.80426&sspn=1.877743,4.22699&ie=UTF8&hq=&hnear=Nagano,+Pr%C3%A9fecture+de+Nagano,+Japon&t=p&ll=37.405074,139.855957&spn=6.979889,16.501465&z=6"
+    ),
     matsumoto(
         displayName = "Matsumoto",
         iframeSrc =
             "https://www.google.com/maps?f=q&source=s_q&hl=fr&geocode=&q=Matsumoto,+Pr%C3%A9fecture+de+Nagano,+Japon&aq=0&oq=matsumot&sll=37.0625,-95.677068&sspn=107.090143,270.527344&ie=UTF8&hq=&hnear=Matsumoto,+Pr%C3%A9fecture+de+Nagano,+Japon&t=p&ll=37.125286,138.22998&spn=7.005806,16.45752&z=6&output=embed",
         link =
-            "https://www.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=Matsumoto,+Pr%C3%A9fecture+de+Nagano,+Japon&aq=0&oq=matsumot&sll=37.0625,-95.677068&sspn=107.090143,270.527344&ie=UTF8&hq=&hnear=Matsumoto,+Pr%C3%A9fecture+de+Nagano,+Japon&t=p&ll=37.125286,138.22998&spn=7.005806,16.45752&z=6"),
+            "https://www.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=Matsumoto,+Pr%C3%A9fecture+de+Nagano,+Japon&aq=0&oq=matsumot&sll=37.0625,-95.677068&sspn=107.090143,270.527344&ie=UTF8&hq=&hnear=Matsumoto,+Pr%C3%A9fecture+de+Nagano,+Japon&t=p&ll=37.125286,138.22998&spn=7.005806,16.45752&z=6"
+    ),
     himeji(
         displayName = "Himeji",
         iframeSrc =
             "https://www.google.com/maps?f=q&source=s_q&hl=fr&geocode=&q=Himeji,+Pr%C3%A9fecture+de+Hy%C5%8Dgo,+Japon&aq=0&oq=himeji&sll=36.253133,138.850708&sspn=3.751586,8.453979&ie=UTF8&hq=&hnear=Himeji,+Pr%C3%A9fecture+de+Hy%C5%8Dgo,+Japon&t=p&ll=35.173808,135.834961&spn=3.59183,8.22876&z=7&output=embed",
         link =
-            "https://www.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=Himeji,+Pr%C3%A9fecture+de+Hy%C5%8Dgo,+Japon&aq=0&oq=himeji&sll=36.253133,138.850708&sspn=3.751586,8.453979&ie=UTF8&hq=&hnear=Himeji,+Pr%C3%A9fecture+de+Hy%C5%8Dgo,+Japon&t=p&ll=35.173808,135.834961&spn=3.59183,8.22876&z=7"),
+            "https://www.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=Himeji,+Pr%C3%A9fecture+de+Hy%C5%8Dgo,+Japon&aq=0&oq=himeji&sll=36.253133,138.850708&sspn=3.751586,8.453979&ie=UTF8&hq=&hnear=Himeji,+Pr%C3%A9fecture+de+Hy%C5%8Dgo,+Japon&t=p&ll=35.173808,135.834961&spn=3.59183,8.22876&z=7"
+    ),
     beppu(
         displayName = "Beppu",
         iframeSrc =
             "https://www.google.com/maps?f=q&source=s_q&hl=fr&geocode=&q=Beppu,+Pr%C3%A9fecture+d\'%C5%8Cita,+Japon&aq=0&oq=Beppu&sll=34.678394,134.351807&sspn=3.825721,8.453979&t=p&ie=UTF8&hq=&hnear=Beppu,+Pr%C3%A9fecture+d\'%C5%8Cita,+Japon&ll=33.28462,131.495361&spn=3.673271,8.22876&z=7&iwloc=A&output=embed",
         link =
-            "https://www.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=Beppu,+Pr%C3%A9fecture+d\'%C5%8Cita,+Japon&aq=0&oq=Beppu&sll=34.678394,134.351807&sspn=3.825721,8.453979&t=p&ie=UTF8&hq=&hnear=Beppu,+Pr%C3%A9fecture+d\'%C5%8Cita,+Japon&ll=33.28462,131.495361&spn=3.673271,8.22876&z=7&iwloc=A"),
+            "https://www.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=Beppu,+Pr%C3%A9fecture+d\'%C5%8Cita,+Japon&aq=0&oq=Beppu&sll=34.678394,134.351807&sspn=3.825721,8.453979&t=p&ie=UTF8&hq=&hnear=Beppu,+Pr%C3%A9fecture+d\'%C5%8Cita,+Japon&ll=33.28462,131.495361&spn=3.673271,8.22876&z=7&iwloc=A"
+    ),
     hiroshima(
         displayName = "Hiroshima",
         iframeSrc =
             "https://www.google.com/maps?sll=37.06250000000001,-95.67706800000002&sspn=76.93536935117227,102.44083790758059&t=p&q=hiroshima&dg=opt&ie=UTF8&hq=&hnear=Hiroshima,+Pr%C3%A9fecture+de+Hiroshima,+Japon&ll=34.134542,132.890625&spn=3.637121,8.22876&z=7&iwloc=A&output=embed",
         link =
-            "https://www.google.com/maps?sll=37.06250000000001,-95.67706800000002&sspn=76.93536935117227,102.44083790758059&t=p&q=hiroshima&dg=opt&ie=UTF8&hq=&hnear=Hiroshima,+Pr%C3%A9fecture+de+Hiroshima,+Japon&ll=34.134542,132.890625&spn=3.637121,8.22876&z=7&iwloc=A&source=embed"),
+            "https://www.google.com/maps?sll=37.06250000000001,-95.67706800000002&sspn=76.93536935117227,102.44083790758059&t=p&q=hiroshima&dg=opt&ie=UTF8&hq=&hnear=Hiroshima,+Pr%C3%A9fecture+de+Hiroshima,+Japon&ll=34.134542,132.890625&spn=3.637121,8.22876&z=7&iwloc=A&source=embed"
+    ),
     itsukushima(
         displayName = "Itsukushima (Miyajima)",
         iframeSrc =
             "https://maps.google.com/maps?f=q&source=s_q&hl=fr&geocode=&q=Itsukushima-jinja,+Hatsukaichi,+Pr%C3%A9fecture+de+Hiroshima,+Japon&aq=0&oq=Itsukushima&sll=37.0625,-95.677068&sspn=58.72842,107.841797&t=p&ie=UTF8&hq=Itsukushima-jinja,+Hatsukaichi,+Pr%C3%A9fecture+de+Hiroshima,+Japon&ll=34.307711,132.409973&spn=0.226874,0.514297&z=11&output=embed",
         link =
-            "https://maps.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=Itsukushima-jinja,+Hatsukaichi,+Pr%C3%A9fecture+de+Hiroshima,+Japon&aq=0&oq=Itsukushima&sll=37.0625,-95.677068&sspn=58.72842,107.841797&t=p&ie=UTF8&hq=Itsukushima-jinja,+Hatsukaichi,+Pr%C3%A9fecture+de+Hiroshima,+Japon&ll=34.307711,132.409973&spn=0.226874,0.514297&z=11"),
+            "https://maps.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=Itsukushima-jinja,+Hatsukaichi,+Pr%C3%A9fecture+de+Hiroshima,+Japon&aq=0&oq=Itsukushima&sll=37.0625,-95.677068&sspn=58.72842,107.841797&t=p&ie=UTF8&hq=Itsukushima-jinja,+Hatsukaichi,+Pr%C3%A9fecture+de+Hiroshima,+Japon&ll=34.307711,132.409973&spn=0.226874,0.514297&z=11"
+    ),
     kyoto(
         displayName = "Kyôto",
         iframeSrc =
             "https://maps.google.com/maps?f=q&source=s_q&hl=fr&geocode=&q=kyoto&aq=&sll=37.0625,-95.677068&sspn=61.452931,107.841797&ie=UTF8&hq=&hnear=Kyoto,+Pr%C3%A9fecture+de+Kyoto,+Japon&t=p&ll=35.012002,135.966797&spn=7.196108,16.45752&z=6&output=embed",
         link =
-            "https://maps.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=kyoto&aq=&sll=37.0625,-95.677068&sspn=61.452931,107.841797&ie=UTF8&hq=&hnear=Kyoto,+Pr%C3%A9fecture+de+Kyoto,+Japon&t=p&ll=35.012002,135.966797&spn=7.196108,16.45752&z=6"),
+            "https://maps.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=kyoto&aq=&sll=37.0625,-95.677068&sspn=61.452931,107.841797&ie=UTF8&hq=&hnear=Kyoto,+Pr%C3%A9fecture+de+Kyoto,+Japon&t=p&ll=35.012002,135.966797&spn=7.196108,16.45752&z=6"
+    ),
     nara(
         displayName = "Nara",
         iframeSrc =
             "https://maps.google.com/maps?f=q&source=s_q&hl=fr&geocode=&q=nara&t=p&ie=UTF8&hq=&hnear=Nara,+Pr%C3%A9fecture+de+Nara,+Japon&ll=34.669359,135.681152&spn=3.613962,8.22876&z=7&output=embed",
         link =
-            "https://maps.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=nara&t=p&ie=UTF8&hq=&hnear=Nara,+Pr%C3%A9fecture+de+Nara,+Japon&ll=34.669359,135.681152&spn=3.613962,8.22876&z=7"),
+            "https://maps.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=nara&t=p&ie=UTF8&hq=&hnear=Nara,+Pr%C3%A9fecture+de+Nara,+Japon&ll=34.669359,135.681152&spn=3.613962,8.22876&z=7"
+    ),
     tokyo(
         displayName = "Tôkyô",
         iframeSrc =
             "https://maps.google.fr/maps?f=q&source=s_q&hl=fr&geocode=&q=tokyo&aq=&sll=48.680792,2.502588&sspn=3.315151,8.453979&ie=UTF8&hq=&hnear=Tokyo,+Japon&t=p&ll=35.817813,139.658203&spn=7.124687,16.45752&z=6&output=embed",
         link =
-            "https://maps.google.fr/maps?f=q&source=embed&hl=fr&geocode=&q=tokyo&aq=&sll=48.680792,2.502588&sspn=3.315151,8.453979&ie=UTF8&hq=&hnear=Tokyo,+Japon&t=p&ll=35.817813,139.658203&spn=7.124687,16.45752&z=6"),
+            "https://maps.google.fr/maps?f=q&source=embed&hl=fr&geocode=&q=tokyo&aq=&sll=48.680792,2.502588&sspn=3.315151,8.453979&ie=UTF8&hq=&hnear=Tokyo,+Japon&t=p&ll=35.817813,139.658203&spn=7.124687,16.45752&z=6"
+    ),
     ;
 
-    fun pages(): List<Page> = Page.values().filter { it.place == this }
+    fun pages(): List<Page> = Page.entries.filter { it.place == this }
 
     fun imgCount(): Int = pages().sumOf { it.imgCount() }
 }