Update java version to 21

.github/workflows/backdeploy.yaml

@@ -17,30 +17,30 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./server
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Restore gradle dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: "~/.gradle"
-          key: ${{ runner.os }}-modules-${{ hashFiles('**/server/build.gradle') }}
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
+          key: ${{ runner.os }}-modules-${{ hashFiles('**/build.gradle.kts') }}
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
-          java-version: "11"
-          distribution: "adopt"
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
+          distribution: "zulu"
+          java-version: "21"
       - name: Add version info
         run: |
           export GIT_HASH=$(git rev-parse --short HEAD)
-          sed -i "s|version: 1.0.0|version: ${GIT_HASH}|g" server/src/main/resources/application.yaml
+          sed -i "s|version: 1.0.0|version: ${GIT_HASH}|g" src/main/resources/application.yaml
       - name: Build jar
-        run: ./server/gradlew build -p server -x test
+        run: ./gradlew build -x test
       - name: Build and push to ECR
         run: |
-          cd server
           ./gradlew clean build --info -x test
 
           export STAGE=prod

.github/workflows/backtest.yaml

@@ -11,28 +11,24 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./server
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Restoreß dependencies
-        uses: actions/cache@v3
-        with:
-          path: "**/server/test-web-server/node_modules"
-          key: ${{ runner.os }}-v2-${{ hashFiles('**/server/test-web-server/package-lock.json') }}
       - name: Restore gradle dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: "~/.gradle"
-          key: ${{ runner.os }}-modules-${{ hashFiles('**/server/build.gradle') }}
-      - name: Set up JDK 11
+          key: ${{ runner.os }}-modules-${{ hashFiles('**/build.gradle.kts') }}
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: "11"
-          distribution: "adopt"
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
+          distribution: "zulu"
+          java-version: "21"
       - name: Run containers
-        run: docker compose -f server/docker-compose-test.yaml up -d
+        run: docker compose -f docker-compose-test.yaml up -d
       - name: Wait for database to start
         run: |
           for i in `seq 1 60`;
@@ -43,4 +39,4 @@ jobs:
           done
           echo Failed waiting for mysql && exit 1
       - name: Build and test
-        run: ./server/gradlew clean build -p server --info
+        run: ./gradlew clean build --info

client/src/main/api/DatabaseQueryApi.ts

@@ -9,17 +9,17 @@ export class DatabaseQueryApi {
   BASE_URL: string;
 
   constructor() {
-    this.BASE_URL = API_URL + "/database/";
+    this.BASE_URL = API_URL + "/database";
   }
 
   queryDatabase = (sqlQuery: string, page: number, size: number) => {
-    let url = this.BASE_URL + "query";
+    let url = this.BASE_URL + "/query";
     let body = { sqlQuery, page, size };
     return Axios.post<QueryDatabaseResponse>(url, body);
   };
 
   queryDatabaseMeta = () => {
-    let url = this.BASE_URL + "meta";
+    let url = this.BASE_URL + "/meta";
     return Axios.get<DatabaseMetaData>(url);
   };
 }

client/src/main/components/Footer.tsx

@@ -15,9 +15,7 @@ const Footer = () => {
             <a href="https://www.worldcubeassociation.org/faq">FAQ</a>
           </li>
           <li>
-            <a href="https://www.worldcubeassociation.org/contact">
-              Contact
-            </a>
+            <a href="https://www.worldcubeassociation.org/contact">Contact</a>
           </li>
           <li>
             <a href="https://github.com/thewca/statistics">

client/src/main/components/Topbar.css

@@ -17,4 +17,4 @@ nav a span {
 
 #top-bar .ant-menu-item img {
   vertical-align: middle;
-}
+}

server/Dockerfile

@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk11:latest
-ARG JAR_FILE=build/libs/statistics-server.jar
+FROM eclipse-temurin:21
+ARG JAR_FILE=build/libs/app.jar
 COPY ${JAR_FILE} app.jar
 ENTRYPOINT ["java","-jar","/app.jar"]

server/build.gradle.kts

@@ -0,0 +1,74 @@
+plugins {
+    kotlin("jvm") version "1.9.25"
+    kotlin("plugin.spring") version "1.9.25"
+    id("org.springframework.boot") version "3.4.4"
+    id("io.spring.dependency-management") version "1.1.7"
+}
+
+group = "com.example"
+version = "0.0.1-SNAPSHOT"
+
+// Multiple usages
+val springBootVersion = "3.4.4"
+val lombokVersion = "1.18.38"
+val simpleFlatMapperVersion = "8.2.3"
+
+// Single usage
+val openApiVersion = "2.8.6"
+val hypersistenceUtilsVersion = "3.9.0"
+val mySqlConnectorVersion = "8.0.33"
+val guavaVersion = "33.4.8-jre"
+val restAssuredVersion = "5.5.1"
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation("org.springframework.boot:spring-boot-starter")
+    implementation("org.springframework.boot:spring-boot-starter-web:${springBootVersion}")
+    implementation("org.springframework.boot:spring-boot-starter-data-jpa:${springBootVersion}")
+    implementation("org.springframework.boot:spring-boot-starter-validation:${springBootVersion}")
+
+    implementation("com.google.guava:guava:$guavaVersion")
+    implementation("mysql:mysql-connector-java:${mySqlConnectorVersion}")
+    implementation("org.simpleflatmapper:sfm-tuples:${simpleFlatMapperVersion}")
+    implementation("org.simpleflatmapper:sfm-springjdbc:${simpleFlatMapperVersion}")
+    implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:$openApiVersion")
+    implementation("io.hypersistence:hypersistence-utils-hibernate-63:${hypersistenceUtilsVersion}")
+
+    implementation("org.jetbrains.kotlin:kotlin-reflect")
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
+    testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+
+    compileOnly("org.projectlombok:lombok:$lombokVersion")
+    annotationProcessor("org.projectlombok:lombok:$lombokVersion")
+
+    testCompileOnly("org.projectlombok:lombok:$lombokVersion")
+    testAnnotationProcessor("org.projectlombok:lombok:$lombokVersion")
+
+    testImplementation("io.rest-assured:rest-assured:${restAssuredVersion}")
+}
+
+kotlin {
+    compilerOptions {
+        freeCompilerArgs.addAll("-Xjsr305=strict")
+    }
+}
+
+tasks.withType<Test> {
+    useJUnitPlatform()
+}
+
+tasks {
+    bootJar {
+        archiveFileName.set("app.jar")
+    }
+}

server/gradle/wrapper/gradle-wrapper.properties

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