Upgrade to Java 21 (hashgraph#7294)

* Bump Java version from 17 to 21 * Change `@Retryable` to not use deprecated `value` attribute * Fix compiler warnings * Remove unused Query DSL dependency * Suppress compiler warnings due to plugin generated code --------- Signed-off-by: Steven Sheehy <[email protected]>
mgoelswirlds · Dec 6, 2023 · 6e27167 · 6e27167
1 parent 1b95271
commit 6e27167
Show file tree

Hide file tree

Showing 29 changed files with 88 additions and 77 deletions.
diff --git a/.github/workflows/charts.yml b/.github/workflows/charts.yml
@@ -37,7 +37,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
 
       - name: Install Python
         uses: actions/setup-python@v4

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -32,7 +32,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
 
       - name: Execute Gradle
         uses: gradle/gradle-build-action@v2

diff --git a/.github/workflows/release-automation.yml b/.github/workflows/release-automation.yml
@@ -65,7 +65,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
 
       - name: Create and Switch to Release Branch
         run: |
@@ -153,7 +153,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
 
       - name: Reset main to release branch
         run: |

diff --git a/.github/workflows/release-integration.yml b/.github/workflows/release-integration.yml
@@ -27,7 +27,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
 
       - name: Authenticate to Google Cloud
         uses: google-github-actions/auth@v2

diff --git a/.github/workflows/release-production.yml b/.github/workflows/release-production.yml
@@ -28,7 +28,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
 
       - name: Authenticate to Google Cloud
         uses: google-github-actions/auth@v2

diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml
@@ -19,7 +19,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
 
       - name: Vulnerability check
         uses: gradle/gradle-build-action@v2
@@ -68,7 +68,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
 
       - name: Cache SonarCloud dependencies
         uses: actions/cache@v3
@@ -97,7 +97,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
-          java-version: 17
+          java-version: 21
 
       - name: Setup Snyk
         run: npm install -g snyk-to-html @wcj/html-to-markdown-cli
@@ -133,7 +133,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
-          java-version: 17
+          java-version: 21
 
       - name: Setup Snyk
         run: npm install -g snyk-to-html @wcj/html-to-markdown-cli
@@ -169,7 +169,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
-          java-version: 17
+          java-version: 21
 
       - name: Execute Gradle Snyk Monitor
         uses: gradle/gradle-build-action@v2

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 # Compiled class file
 *.class
+generated/
 
 # OS specific
 .DS_Store

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -29,7 +29,7 @@ repositories {
 
 dependencies {
     implementation("com.bmuschko:gradle-docker-plugin:9.4.0")
-    implementation("com.diffplug.spotless:spotless-plugin-gradle:6.23.2")
+    implementation("com.diffplug.spotless:spotless-plugin-gradle:6.23.3")
     implementation("com.github.johnrengelman:shadow:8.1.1")
     implementation("com.github.node-gradle:gradle-node-plugin:7.0.1")
     implementation("com.google.protobuf:protobuf-gradle-plugin:0.9.4")

diff --git a/buildSrc/src/main/kotlin/common-conventions.gradle.kts b/buildSrc/src/main/kotlin/common-conventions.gradle.kts
@@ -97,7 +97,7 @@ spotless {
     })
     java {
         addStep(StripOldLicenseFormatterStep.create())
-        palantirJavaFormat()
+        palantirJavaFormat("2.39.0")
         licenseHeader(licenseHeader, "package").updateYearWithLatest(true)
         target("**/*.java")
         targetExclude("build/**")

diff --git a/buildSrc/src/main/kotlin/java-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-conventions.gradle.kts
@@ -60,18 +60,19 @@ dependencies {
 
 tasks.compileJava {
     dependsOn("generateEffectiveLombokConfig")
-    options.compilerArgs.addAll(listOf("-Werror", "-Xlint:all"))
+    // Disable serial and this-escape warnings due to errors in generated code
+    options.compilerArgs.addAll(listOf("-Werror", "-Xlint:all", "-Xlint:-serial,-this-escape"))
     options.encoding = "UTF-8"
-    sourceCompatibility = "17"
-    targetCompatibility = "17"
+    sourceCompatibility = "21"
+    targetCompatibility = "21"
 }
 
 tasks.compileTestJava {
     dependsOn("generateEffectiveLombokConfig")
-    options.compilerArgs.addAll(listOf("-Werror", "-Xlint:all"))
+    options.compilerArgs.addAll(listOf("-Werror", "-Xlint:all", "-Xlint:-this-escape"))
     options.encoding = "UTF-8"
-    sourceCompatibility = "17"
-    targetCompatibility = "17"
+    sourceCompatibility = "21"
+    targetCompatibility = "21"
 }
 
 tasks.javadoc {

diff --git a/buildSrc/src/main/kotlin/plugin/go/GoSetup.kt b/buildSrc/src/main/kotlin/plugin/go/GoSetup.kt
@@ -22,13 +22,12 @@ package plugin.go
 
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream
 import org.gradle.api.DefaultTask
-import org.gradle.api.file.FileSystemOperations
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.TaskAction
 import org.gradle.kotlin.dsl.getByName
 import java.io.File
 import java.io.FileInputStream
-import java.net.URL
+import java.net.URI
 import java.nio.file.Files
 import java.nio.file.Paths
 import java.nio.file.StandardCopyOption
@@ -43,7 +42,7 @@ open class GoSetup : DefaultTask() {
     @TaskAction
     fun prepare() {
         go.goRoot.mkdirs()
-        val url = URL("https://storage.googleapis.com/golang/go${go.version}.${go.os}-${go.arch}.tar.gz")
+        val url = URI.create("https://storage.googleapis.com/golang/go${go.version}.${go.os}-${go.arch}.tar.gz").toURL()
         val filename = Paths.get(url.path).fileName
         val targetFile = go.cacheDir.toPath().resolve(filename)
 

diff --git a/charts/README.md b/charts/README.md
@@ -87,12 +87,12 @@ a [Standalone NEG](https://cloud.google.com/kubernetes-engine/docs/how-to/standa
 
    This can be done by setting a unique name for the subnet in the UI or through the console with the following command
    ```shell script
-   gcloud container clusters create mirrornode-lb \
+   gcloud container clusters create mirror-node \
        --enable-ip-alias \
        --create-subnetwork="" \
        --network=default \
        --zone=us-central1-a \
-       --cluster-version=1.21.5-gke.1802 \
+       --cluster-version=1.27 \
        --machine-type=n1-standard-4
    ```
 

diff --git a/docs/installation.md b/docs/installation.md
@@ -4,7 +4,7 @@ The Mirror Node can be run [locally](#running-locally) or via [Docker](#running-
 
 ## Building
 
-To run locally, first build the project using Java. Ensure you have OpenJDK 17 installed, then run the following command
+To run locally, first build the project using Java. Ensure you have Java 21 installed, then run the following command
 from the top level directory. This will compile a runnable mirror node JAR file in the `target` directory.
 
 ```console
@@ -15,7 +15,7 @@ from the top level directory. This will compile a runnable mirror node JAR file
 
 ### Database Setup
 
-In addition to OpenJDK 17, you will need to install a [PostgreSQL](https://postgresql.org) database and initialize it.
+In addition to Java 21, you will need to install a [PostgreSQL](https://postgresql.org) database and initialize it.
 
 Since [Flyway](https://flywaydb.org) will manage the database schema, the only required step is to run the database
 initialization script. Locate the SQL script at `hedera-mirror-importer/src/main/resources/db/scripts/init.sh` and edit

diff --git a/hedera-mirror-common/build.gradle.kts b/hedera-mirror-common/build.gradle.kts
@@ -20,15 +20,12 @@ plugins { id("java-conventions") }
 
 dependencies {
     val testClasses by configurations.creating
-    annotationProcessor(group = "com.querydsl", name = "querydsl-apt", classifier = "jakarta")
     annotationProcessor("jakarta.persistence:jakarta.persistence-api")
     api("com.fasterxml.jackson.core:jackson-databind")
     api("com.github.ben-manes.caffeine:caffeine")
     api("com.google.guava:guava")
     api("com.google.protobuf:protobuf-java")
     api("com.hedera.hashgraph:hedera-protobuf-java-api") { isTransitive = false }
-    api("com.querydsl:querydsl-apt")
-    api("com.querydsl:querydsl-jpa")
     api("io.hypersistence:hypersistence-utils-hibernate-62")
     api("commons-codec:commons-codec")
     api("io.projectreactor:reactor-core")

diff --git a/hedera-mirror-graphql/Dockerfile b/hedera-mirror-graphql/Dockerfile
@@ -1,9 +1,9 @@
-FROM eclipse-temurin:17.0.8.1_1-jre-jammy as builder
+FROM eclipse-temurin:21-jre-jammy as builder
 WORKDIR /app
 COPY build/libs/*.jar ./
 RUN java -Djarmode=layertools -jar *.jar extract
 
-FROM eclipse-temurin:17.0.8.1_1-jre-jammy
+FROM eclipse-temurin:21-jre-jammy
 ENV JDK_JAVA_OPTIONS="-XX:MaxRAMPercentage=80"
 EXPOSE 8083
 HEALTHCHECK --interval=10s --retries=3 --start-period=50s --timeout=2s CMD curl -f http://localhost:8083/actuator/health/liveness

diff --git a/hedera-mirror-grpc/Dockerfile b/hedera-mirror-grpc/Dockerfile
@@ -1,9 +1,9 @@
-FROM eclipse-temurin:17.0.8.1_1-jre-jammy as builder
+FROM eclipse-temurin:21-jre-jammy as builder
 WORKDIR /app
 COPY build/libs/*.jar ./
 RUN java -Djarmode=layertools -jar *.jar extract
 
-FROM eclipse-temurin:17.0.8.1_1-jre-jammy
+FROM eclipse-temurin:21-jre-jammy
 ENV JDK_JAVA_OPTIONS="-XX:MaxRAMPercentage=80"
 EXPOSE 5600
 HEALTHCHECK --interval=10s --retries=3 --start-period=50s --timeout=2s CMD curl -f http://localhost:8081/actuator/health/liveness

diff --git a/hedera-mirror-importer/Dockerfile b/hedera-mirror-importer/Dockerfile
@@ -1,9 +1,9 @@
-FROM eclipse-temurin:17.0.8.1_1-jre-jammy as builder
+FROM eclipse-temurin:21-jre-jammy as builder
 WORKDIR /app
 COPY build/libs/*.jar ./
 RUN java -Djarmode=layertools -jar *.jar extract
 
-FROM eclipse-temurin:17.0.8.1_1-jre-jammy
+FROM eclipse-temurin:21-jre-jammy
 ENV JDK_JAVA_OPTIONS="-XX:MaxRAMPercentage=80"
 HEALTHCHECK --interval=30s --retries=3 --start-period=60s --timeout=2s CMD curl -f http://localhost:8080/actuator/health/liveness
 WORKDIR /app

diff --git a/hedera-mirror-monitor/Dockerfile b/hedera-mirror-monitor/Dockerfile
@@ -1,9 +1,9 @@
-FROM eclipse-temurin:17.0.8.1_1-jre-jammy as builder
+FROM eclipse-temurin:21-jre-jammy as builder
 WORKDIR /app
 COPY build/libs/*.jar ./
 RUN java -Djarmode=layertools -jar *.jar extract
 
-FROM eclipse-temurin:17.0.8.1_1-jre-jammy
+FROM eclipse-temurin:21-jre-jammy
 ENV JDK_JAVA_OPTIONS="-XX:MaxRAMPercentage=80"
 EXPOSE 8082
 HEALTHCHECK --interval=10s --retries=5 --start-period=60s --timeout=2s CMD curl -f http://localhost:8082/actuator/health/liveness

diff --git a/...or-monitor/src/main/java/com/hedera/mirror/monitor/publish/PublishScenarioProperties.java b/...or-monitor/src/main/java/com/hedera/mirror/monitor/publish/PublishScenarioProperties.java
@@ -61,7 +61,7 @@ public class PublishScenarioProperties extends ScenarioProperties {
     private TransactionType type;
 
     public PublishScenarioProperties() {
-        getRetry().setMaxAttempts(1L);
+        retry.setMaxAttempts(1L);
     }
 
     @Override

diff --git a/...or/src/main/java/com/hedera/mirror/monitor/subscribe/controller/SubscriberController.java b/...or/src/main/java/com/hedera/mirror/monitor/subscribe/controller/SubscriberController.java
@@ -47,7 +47,8 @@ class SubscriberController {
 
     @GetMapping
     public <T extends ScenarioProperties> Flux<Scenario<T, Object>> subscriptions(
-            @RequestParam Optional<ScenarioProtocol> protocol, @RequestParam Optional<List<ScenarioStatus>> status) {
+            @RequestParam("protocol") Optional<ScenarioProtocol> protocol,
+            @RequestParam("status") Optional<List<ScenarioStatus>> status) {
         return mirrorSubscriber
                 .<Scenario<T, Object>>getSubscriptions()
                 .filter(s -> !protocol.isPresent() || protocol.get() == s.getProtocol())

diff --git a/hedera-mirror-rest-java/Dockerfile b/hedera-mirror-rest-java/Dockerfile
@@ -1,9 +1,9 @@
-FROM eclipse-temurin:17.0.8.1_1-jre-jammy as builder
+FROM eclipse-temurin:21-jre-jammy as builder
 WORKDIR /app
 COPY build/libs/*.jar ./
 RUN java -Djarmode=layertools -jar *.jar extract
 
-FROM eclipse-temurin:17.0.8.1_1-jre-jammy
+FROM eclipse-temurin:21-jre-jammy
 ENV JDK_JAVA_OPTIONS="-XX:MaxRAMPercentage=80"
 EXPOSE 8084
 HEALTHCHECK --interval=10s --retries=3 --start-period=50s --timeout=2s CMD curl -f http://localhost:8084/actuator/health/liveness

diff --git a/hedera-mirror-test/Dockerfile b/hedera-mirror-test/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17.0.8.1_1-jre-jammy
+FROM eclipse-temurin:21-jre-jammy
 
 ENV JDK_JAVA_OPTIONS="-XX:MaxRAMPercentage=80"
 WORKDIR /app

diff --git a/hedera-mirror-test/README.md b/hedera-mirror-test/README.md
@@ -24,7 +24,7 @@ complex code underneath.
 
 ### Requirements
 
-- OpenJDK 17+
+- Java 21
 
 ### Test Execution
 
@@ -39,7 +39,7 @@ uses [Spring Boot](https://spring.io/projects/spring-boot) properties to configu
 include:
 
 | Name                                                           | Default                                      | Description                                                                                               |
-| -------------------------------------------------------------- | -------------------------------------------- | --------------------------------------------------------------------------------------------------------- |
+|----------------------------------------------------------------|----------------------------------------------|-----------------------------------------------------------------------------------------------------------|
 | `hedera.mirror.test.acceptance.backOffPeriod`                  | 5s                                           | The amount of time the client will wait before retrying a retryable failure.                              |
 | `hedera.mirror.test.acceptance.createOperatorAccount`          | true                                         | Whether to create a separate operator account to run the acceptance tests.                                |
 | `hedera.mirror.test.acceptance.emitBackgroundMessages`         | false                                        | Whether background topic messages should be emitted.                                                      |