Feat/jdk21

.github/workflows/maven-extension-publish.yml

@@ -16,10 +16,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '21'
           distribution: 'temurin'
           server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
           server-username: MAVEN_USERNAME # env variable for username in deploy

.github/workflows/maven-web-api-publish.yml

@@ -16,10 +16,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '21'
           distribution: 'temurin'
           server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
           server-username: MAVEN_USERNAME # env variable for username in deploy

.github/workflows/ut.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java-version: [ 8, 11 ]
+        java-version: [ 21 ]
     steps:
       - uses: actions/checkout@v3
       - name: "Test for JDK ${{ matrix.java-version }}"

Dockerfile

@@ -1,11 +1,11 @@
-FROM maven:3-openjdk-8-slim as builder
+FROM maven:3.9.9-eclipse-temurin-21 as builder
 COPY . /usr/src/app/
 WORKDIR /usr/src/app/
 # buildkit support since docker 18.03
 RUN --mount=type=cache,target=/root/.m2 mvn clean package -DskipTests -Pjar
 # use this if you are on docker<=18.02
 # RUN mvn clean package -DskipTests -Pjar
 
-FROM eclipse-temurin:8-jre
+FROM eclipse-temurin:21-jre
 COPY --from=builder /usr/src/app/arex-schedule-jar/schedule.jar app.jar
-ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /app.jar"]
+ENTRYPOINT ["sh", "-c", "java --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED ${JAVA_OPTS} -jar /app.jar"]

arex-schedule-web-api/pom.xml

@@ -147,10 +147,6 @@
       <build>
         <finalName>arex-schedule-web-api</finalName>
         <plugins>
-          <plugin>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <groupId>org.apache.maven.plugins</groupId>
-          </plugin>
           <plugin>
             <artifactId>maven-gpg-plugin</artifactId>
             <executions>

arex-schedule-web-api/src/main/java/com/arextest/schedule/WebSpringBootServletInitializer.java

@@ -1,9 +1,9 @@
 package com.arextest.schedule;
 
 import com.arextest.common.metrics.PrometheusConfiguration;
+import jakarta.annotation.PostConstruct;
 import java.awt.Desktop;
 import java.net.URI;
-import javax.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.annotation.Value;

arex-schedule-web-api/src/main/java/com/arextest/schedule/aspect/AppAuthAspect.java

@@ -1,7 +1,7 @@
 package com.arextest.schedule.aspect;
 
 import com.arextest.common.annotation.AppAuth;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;

arex-schedule-web-api/src/main/java/com/arextest/schedule/aspect/AppAuthAspectExecutor.java

@@ -10,9 +10,9 @@
 import com.arextest.config.model.dao.config.SystemConfigurationCollection;
 import com.arextest.config.model.dao.config.SystemConfigurationCollection.KeySummary;
 import com.arextest.schedule.dao.mongodb.ApplicationRepository;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.Optional;
 import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

arex-schedule-web-api/src/main/java/com/arextest/schedule/beans/CORSFilter.java

@@ -1,15 +1,15 @@
 package com.arextest.schedule.beans;
 
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 /**
  * @author wyc

arex-schedule-web-api/src/main/java/com/arextest/schedule/beans/CacheProviderConfiguration.java

@@ -61,7 +61,7 @@ public RedisTemplate<byte[], byte[]> redisTemplate(
   @Bean
   @ConditionalOnExpression("'${arex.redis.uri:}'.isEmpty() and '${arex.redis.sentinelUrl:}'.isEmpty()")
   @ConditionalOnMissingBean(CacheProvider.class)
-  public CacheProvider redisCacheProvider(RedisTemplate redisTemplate,
+  public CacheProvider redisCacheProvider(RedisTemplate<byte[], byte[]> redisTemplate,
       RedissonClient redissonClient) {
     return new RedisTemplateCacheProvider(redisTemplate, redissonClient);
   }

arex-schedule-web-api/src/main/java/com/arextest/schedule/beans/ReplaySenderConfiguration.java

@@ -1,6 +1,7 @@
 package com.arextest.schedule.beans;
 
-import com.arextest.schedule.common.ClassLoaderUtils;
+import com.arextest.common.model.classloader.RemoteJarClassLoader;
+import com.arextest.common.utils.RemoteJarLoaderUtils;
 import com.arextest.schedule.extension.invoker.ReplayExtensionInvoker;
 import com.arextest.schedule.sender.ReplaySender;
 import com.arextest.schedule.sender.ReplaySenderFactory;
@@ -13,10 +14,11 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.ServiceLoader;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -36,11 +38,9 @@ public class ReplaySenderConfiguration {
   private static final String NEW_INVOKER_PATH = "dubboInvoker.jar";
   private static final List<String> remoteProtocol = Arrays.asList("http", "https", "ftp", "sftp", "nfs");
 
-  @Bean("replayExtensionInvoker")
+  @Bean("dubboInvokerLoader")
   @ConditionalOnProperty(name = "replay.sender.extension.switch", havingValue = "true")
-  public List<ReplayExtensionInvoker> invokers() {
-    List<ReplayExtensionInvoker> invokers = new ArrayList<>();
-
+  public RemoteJarClassLoader dubboInvokerLoader() {
     try {
       URL classPathResource;
       if (StringUtils.isNotBlank(jarFilePath)) {
@@ -52,11 +52,21 @@ public List<ReplayExtensionInvoker> invokers() {
       } else {
         classPathResource = loadLocalInvokerJar();
       }
-      ClassLoaderUtils.loadJar(classPathResource);
-      ServiceLoader.load(ReplayExtensionInvoker.class).forEach(invokers::add);
+      return RemoteJarLoaderUtils.loadJar(classPathResource.getPath());
     } catch (Throwable t) {
       LOGGER.error("Load invoker jar failed, application startup blocked", t);
     }
+    LOGGER.error("No invoker found, application startup blocked");
+    throw new RuntimeException("No invoker found");
+  }
+
+  @Bean("replayExtensionInvoker")
+  @ConditionalOnBean(name = "dubboInvokerLoader")
+  public List<ReplayExtensionInvoker> invokers(
+      @Qualifier("dubboInvokerLoader") RemoteJarClassLoader loader) {
+    List<ReplayExtensionInvoker> invokers = new ArrayList<>(
+        RemoteJarLoaderUtils.loadService(ReplayExtensionInvoker.class, loader));
+
     if (invokers.isEmpty()) {
       LOGGER.error("No invoker found, application startup blocked");
       throw new RuntimeException("No invoker found");
@@ -66,12 +76,13 @@ public List<ReplayExtensionInvoker> invokers() {
   }
 
   @Bean
-  @ConditionalOnProperty(name = "replay.sender.extension.switch", havingValue = "true")
+  @ConditionalOnBean(name = "replayExtensionInvoker")
   public DefaultDubboReplaySender dubboReplaySender(
       @Value("#{'${arex.replay.header.excludes.dubbo}'.split(',')}") List<String> excludes,
-      List<ReplayExtensionInvoker> invokers) {
+      List<ReplayExtensionInvoker> invokers,
+      @Qualifier("dubboInvokerLoader") RemoteJarClassLoader loader) {
 
-    return new DefaultDubboReplaySender(excludes, invokers);
+    return new DefaultDubboReplaySender(excludes, invokers, loader);
   }
 
   @Bean

arex-schedule-web-api/src/main/java/com/arextest/schedule/client/HttpWepServiceApiClient.java

@@ -6,15 +6,15 @@
 import com.arextest.schedule.utils.SSLUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Maps;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;

arex-schedule-web-api/src/main/java/com/arextest/schedule/client/LoggingRequestInterceptor.java

@@ -5,7 +5,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpRequest;
-import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.client.ClientHttpRequestExecution;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
 import org.springframework.http.client.ClientHttpResponse;
@@ -35,7 +35,7 @@ public ClientHttpResponse intercept(HttpRequest request, byte[] body,
       throw ex;
     }
 
-    HttpStatus statusCode = response.getStatusCode();
+    HttpStatusCode statusCode = response.getStatusCode();
 
     // Log the failed request if the response status code is 4xx or 5xx
     if (statusCode.is4xxClientError() || statusCode.is5xxServerError()) {

arex-schedule-web-api/src/main/java/com/arextest/schedule/client/ZstdJacksonMessageConverter.java

@@ -2,8 +2,8 @@
 
 
 import com.arextest.schedule.serialization.ZstdJacksonSerializer;
+import jakarta.annotation.Resource;
 import java.io.IOException;
-import javax.annotation.Resource;
 import org.springframework.http.HttpInputMessage;
 import org.springframework.http.HttpOutputMessage;
 import org.springframework.http.MediaType;

arex-schedule-web-api/src/main/java/com/arextest/schedule/comparer/CompareConfigService.java

@@ -13,13 +13,13 @@
 import com.arextest.schedule.progress.ProgressEvent;
 import com.arextest.web.model.contract.contracts.config.SystemConfigWithProperties;
 import com.arextest.web.model.contract.contracts.config.replay.ReplayCompareConfig;
+import jakarta.annotation.Resource;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;