Revert "Revert "Migrate to JDK 21 (#279)" (#280)" (#282)

chetangudisagar · web-flow · commit 3f09b7779b9a · 2025-09-14T13:25:06.000-07:00
This reverts commit 33813d8.
diff --git a/.github/workflows/corfu-client-example.yml b/.github/workflows/corfu-client-example.yml
@@ -11,13 +11,13 @@ jobs:
       PUBLISH_TOKEN: ${{ secrets.publish_token }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup BuildX
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to the Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{secrets.DOCKER_USER_NAME}}
           password: ${{secrets.DOCKER_PASSWORD}}
diff --git a/.github/workflows/publish-cloud.yml b/.github/workflows/publish-cloud.yml
@@ -18,7 +18,7 @@ jobs:
     if: github.event_name == 'push'
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: satackey/action-docker-layer-caching@v0.0.8
         continue-on-error: true
 
diff --git a/.github/workflows/publish-injection-framework.yml b/.github/workflows/publish-injection-framework.yml
@@ -18,7 +18,7 @@ jobs:
     if: github.event_name == 'push'
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: satackey/action-docker-layer-caching@v0.0.8
         continue-on-error: true
 
diff --git a/.github/workflows/publish-universe-artifacts.yml b/.github/workflows/publish-universe-artifacts.yml
@@ -20,18 +20,18 @@ jobs:
       PUBLISH_TOKEN: ${{ secrets.publish_token }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
           distribution: 'corretto'
-          java-version: '17'
+          java-version: '21'
           check-latest: true
           cache-dependency-path: '**/pom.xml'
 
       - name: Cache local Gradle repository
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
diff --git a/.github/workflows/pull_request_benchmarks.yml b/.github/workflows/pull_request_benchmarks.yml
@@ -16,18 +16,18 @@ jobs:
       PUBLISH_TOKEN: ${{ secrets.publish_token }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Set up JDK
       uses: actions/setup-java@v4
       with:
         distribution: 'corretto'
-        java-version: '17'
+        java-version: '21'
         check-latest: true
         cache-dependency-path: '**/pom.xml'
 
     - name: Cache local Gradle repository
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: |
           ~/.gradle/caches
diff --git a/.github/workflows/pull_request_universe.yml b/.github/workflows/pull_request_universe.yml
@@ -17,18 +17,18 @@ jobs:
       PUBLISH_TOKEN: ${{ secrets.publish_token }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Set up JDK
       uses: actions/setup-java@v4
       with:
         distribution: 'corretto'
-        java-version: '17'
+        java-version: '21'
         check-latest: true
         cache-dependency-path: '**/pom.xml'
 
     - name: Cache local Gradle repository
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: |
           ~/.gradle/caches
diff --git a/.github/workflows/run-corfu-cloud-deployment.yml b/.github/workflows/run-corfu-cloud-deployment.yml
@@ -7,7 +7,7 @@ jobs:
   corfu-helm-deployment:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: satackey/action-docker-layer-caching@v0.0.8
         continue-on-error: true
 
diff --git a/.github/workflows/run_benchmarks.yml b/.github/workflows/run_benchmarks.yml
@@ -19,18 +19,18 @@ jobs:
       PUBLISH_TOKEN: ${{ secrets.publish_token }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
           distribution: 'corretto'
-          java-version: '17'
+          java-version: '21'
           check-latest: true
           cache-dependency-path: '**/pom.xml'
 
       - name: Cache local Gradle repository
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
diff --git a/benchmarks/Dockerfile b/benchmarks/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-jdk-bullseye
+FROM openjdk:21-bullseye
 
 RUN apt-get update && apt-get install -y iputils-ping
 
diff --git a/cloud/corfu/corfu-client-example/Dockerfile b/cloud/corfu/corfu-client-example/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-jdk-alpine3.8
+FROM openjdk:21-bullseye
 
 ADD ./build/libs/corfu-runtime-client-example.jar /app/
 
diff --git a/cloud/infrastructure/kibana/kibana-tools/Dockerfile b/cloud/infrastructure/kibana/kibana-tools/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-jdk-alpine3.8
+FROM openjdk:21-bullseye
 
 ADD ./lib /app/lib/
 ADD ./*.jar /app/
diff --git a/gradle/idea-project.gradle.kts b/gradle/idea-project.gradle.kts
@@ -8,7 +8,7 @@ idea.project {
     // can be used. E.g. Subversion, Mercurial.
     vcs = "Git"
 
-    setLanguageLevel("1.8")
+    setLanguageLevel("21")
 }
 
 idea.module {
diff --git a/gradle/jacoco.gradle b/gradle/jacoco.gradle
@@ -1,6 +1,6 @@
 
 jacoco {
-    toolVersion = "0.8.12"
+    toolVersion = "0.8.13"
 }
 
 jacocoTestReport {
diff --git a/gradle/java.gradle b/gradle/java.gradle
@@ -1,8 +1,8 @@
 group = 'org.corfudb'
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 
     withJavadocJar()
     withSourcesJar()
diff --git a/tests/Dockerfile b/tests/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8u212-jdk
+FROM openjdk:21-bullseye
 
 ADD ./ /universe-tests
 WORKDIR /universe-tests/tests
diff --git a/universe/universe-core/src/main/java/org/corfudb/universe/infrastructure/docker/universe/FakeDns.java b/universe/universe-core/src/main/java/org/corfudb/universe/infrastructure/docker/universe/FakeDns.java
@@ -1,21 +1,14 @@
 package org.corfudb.universe.infrastructure.docker.universe;
 
-import com.google.common.base.Throwables;
-import com.google.common.net.InetAddresses;
 import lombok.extern.slf4j.Slf4j;
 
 import java.lang.reflect.Field;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.util.Arrays;
+import java.net.spi.InetAddressResolver;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.NoSuchElementException;
-
+import java.util.stream.Stream;
 /**
  * Fake DNS resolver which allows our tests to work well even though we use
  * strange loopback IP addresses (127.x.y.z) with no corresponding reverse
@@ -33,11 +26,8 @@
 @Slf4j
 public class FakeDns {
     private static final FakeDns instance = new FakeDns();
-
     private final Map<String, InetAddress> forwardResolutions = new HashMap<>();
 
-    private final Map<InetAddress, String> reverseResolutions = new HashMap<>();
-
     /**
      * whether the fake resolver has been installed
      */
@@ -50,139 +40,54 @@ public static FakeDns getInstance() {
         return instance;
     }
 
-    public synchronized void addForwardResolution(String hostname, InetAddress ip) {
-        log.info("Add forward resolution. Hostname: {}, ip: {}", hostname, ip);
+    public synchronized FakeDns addForwardResolution(String hostname, InetAddress ip) {
         forwardResolutions.put(hostname, ip);
+        return this;
     }
 
     /**
      * Install the fake DNS resolver into the Java runtime.
      */
     public synchronized FakeDns install() {
-        if (installed) {
-            return this;
-        }
+        if (installed) return this;
         try {
             installDns();
         } catch (Exception e) {
-            log.error("FakeDns initialization error", e);
             throw new IllegalStateException(e);
         }
         installed = true;
 
         return this;
     }
 
-    private void installDns() throws NoSuchMethodException, IllegalAccessException, InvocationTargetException,
-            ClassNotFoundException, NoSuchFieldException {
-        try {
-            // Override the NameService in Java 9 or later.
-            final Class<?> nameServiceInterface = Class.forName("java.net.InetAddress$NameService");
-            Field field = InetAddress.class.getDeclaredField("nameService");
-            // Get the default NameService to fallback to.
-            Method method = InetAddress.class.getDeclaredMethod("createNameService");
-            method.setAccessible(true);
-            Object fallbackNameService = method.invoke(null);
-            // Create a proxy instance to set on the InetAddress field which will handle
-            // all NameService calls.
-            Object proxy = Proxy.newProxyInstance(
-                    nameServiceInterface.getClassLoader(),
-                    new Class<?>[]{nameServiceInterface},
-                    new NameServiceListener(fallbackNameService)
-            );
-            field.setAccessible(true);
-            field.set(InetAddress.class, proxy);
-        } catch (ClassNotFoundException | NoSuchFieldException e) {
-            // Override the NameService in Java 8 or earlier.
-            final Class<?> nameServiceInterface = Class.forName("sun.net.spi.nameservice.NameService");
-            Field field = InetAddress.class.getDeclaredField("nameServices");
-            // Get the default NameService to fallback to.
-            Method method = InetAddress.class.getDeclaredMethod("createNSProvider", String.class);
-            method.setAccessible(true);
-            Object fallbackNameService = method.invoke(null, "default");
-            // Create a proxy instance to set on the InetAddress field which will handle
-            // all NameService calls.
-            Object proxy = Proxy.newProxyInstance(
-                    nameServiceInterface.getClassLoader(),
-                    new Class<?>[]{nameServiceInterface},
-                    new NameServiceListener(fallbackNameService)
-            );
-            field.setAccessible(true);
-            // Java 8 or earlier takes a list of NameServices
-            field.set(InetAddress.class, Arrays.asList(proxy));
-        }
-    }
-
-    /**
-     * The NameService in all versions of Java has the same interface, so we
-     * can use the same InvocationHandler as our proxy instance for both
-     * java.net.InetAddress$NameService and sun.net.spi.nameservice.NameService.
-     */
-    private class NameServiceListener implements InvocationHandler {
-
-        private final Object fallbackNameService;
-
-        // Creates a NameServiceListener with a NameService implementation to
-        // fallback to. The parameter is untyped so we can handle the NameService
-        // type in all versions of Java with reflection.
-        NameServiceListener(Object fallbackNameService) {
-            this.fallbackNameService = fallbackNameService;
-        }
+    public class CorfuResolver implements InetAddressResolver {
 
-        private InetAddress[] lookupAllHostAddr(String host) throws UnknownHostException {
-            InetAddress inetAddress;
-            synchronized (FakeDns.this) {
-                inetAddress = forwardResolutions.get(host);
-            }
-            if (inetAddress != null) {
-                return new InetAddress[]{inetAddress};
-            }
+        private final InetAddressResolver defaultResolver;
 
-            try {
-                Method method = fallbackNameService.getClass().getDeclaredMethod("lookupAllHostAddr", String.class);
-                method.setAccessible(true);
-                return (InetAddress[]) method.invoke(fallbackNameService, host);
-            } catch (ReflectiveOperationException | NoSuchElementException | SecurityException e) {
-                throw new AssertionError("unexpected reflection issue", e);
-            }
+        public CorfuResolver(InetAddressResolver defaultResolver) {
+            this.defaultResolver = defaultResolver;
         }
 
-        private String getHostByAddr(byte[] addr) throws UnknownHostException {
-            if (addr[0] == 127) {
-                return InetAddresses.toAddrString(InetAddress.getByAddress(addr));
-            }
-
-            String hostname;
-            synchronized (FakeDns.this) {
-                hostname = reverseResolutions.get(InetAddress.getByAddress(addr));
-            }
-            if (hostname != null) {
-                return hostname;
-            }
-
-            try {
-                Method method = fallbackNameService
-                        .getClass()
-                        .getDeclaredMethod("getHostByAddr", byte[].class);
-
-                method.setAccessible(true);
-                return (String) method.invoke(fallbackNameService, (Object) addr);
-            } catch (ReflectiveOperationException | NoSuchElementException | SecurityException e) {
-                Throwables.propagateIfPossible(e.getCause(), UnknownHostException.class);
-                throw new AssertionError("unexpected reflection issue", e);
+        @Override
+        public Stream<InetAddress> lookupByName(String host, LookupPolicy lookupPolicy) throws UnknownHostException {
+            if (forwardResolutions.containsKey(host)) {
+                return Stream.of(forwardResolutions.get(host));
+            } else {
+                return defaultResolver.lookupByName(host, lookupPolicy);
             }
         }
 
         @Override
-        public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-            switch (method.getName()) {
-                case "lookupAllHostAddr":
-                    return lookupAllHostAddr((String) args[0]);
-                case "getHostByAddr":
-                    return getHostByAddr((byte[]) args[0]);
-                default:
-                    throw new UnsupportedOperationException();
-            }
+        public String lookupByAddress(byte[] addr) throws UnknownHostException {
+            return defaultResolver.lookupByAddress(addr);
         }
     }
+
+    private void installDns() throws IllegalAccessException, NoSuchFieldException {
+        Field resolverField = InetAddress.class.getDeclaredField("resolver");
+        resolverField.setAccessible(true);
+
+        var defaultResolver = (InetAddressResolver) resolverField.get(InetAddress.class);
+        resolverField.set(InetAddressResolver.class, new CorfuResolver(defaultResolver));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM openjdk:8-jdk-bullseye`
	`1`	`+FROM openjdk:21-bullseye`
`2`	`2`
`3`	`3`	`RUN apt-get update && apt-get install -y iputils-ping`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM openjdk:8-jdk-alpine3.8`
	`1`	`+FROM openjdk:21-bullseye`
`2`	`2`
`3`	`3`	`ADD ./build/libs/corfu-runtime-client-example.jar /app/`
`4`	`4`