Feat: Support Spring Boot 3.3. X version

pom.xml

@@ -144,7 +144,7 @@
         <dependency>
             <groupId>org.jacoco</groupId>
             <artifactId>org.jacoco.agent</artifactId>
-            <version>0.8.6</version>
+            <version>0.8.11</version>
             <classifier>runtime</classifier>
             <scope>test</scope>
         </dependency>
@@ -249,7 +249,7 @@
                 <plugin>
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.8.6</version>
+                    <version>0.8.11</version>
                     <configuration>
                         <skip>false</skip>
                     </configuration>

trpc-core/pom.xml

@@ -229,6 +229,10 @@
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

trpc-core/src/main/java/com/tencent/trpc/core/utils/CollectionUtils.java

@@ -19,8 +19,8 @@
 import java.util.Set;
 import java.util.function.BinaryOperator;
 import java.util.function.Supplier;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 /**
  * Collection utility.

trpc-dependencies/trpc-dependencies-bom/pom.xml

@@ -90,19 +90,21 @@
         <javax.ws.rs.version>2.1.1</javax.ws.rs.version>
         <javax.validation.version>2.0.1.Final</javax.validation.version>
         <jetty.alpn.boot.version>8.1.13.v20181017</jetty.alpn.boot.version>
-        <jetty.version>9.4.55.v20240627</jetty.version>
+        <jetty.version>11.0.21</jetty.version>
         <joda-time.version>2.7</joda-time.version>
         <jprotobuf.version>2.4.14</jprotobuf.version>
         <junit.version>4.13.2</junit.version>
         <jakarta.annotation-api.version>1.3.5</jakarta.annotation-api.version>
         <jakarta.activation-api.version>1.2.1</jakarta.activation-api.version>
         <jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
+        <jakarta.servlet.version>6.0.0</jakarta.servlet.version>
+        <jakarta.annotation.version>2.1.1</jakarta.annotation.version>
         <jakarta.xml.bind-api.version>2.3.2</jakarta.xml.bind-api.version>
         <javassist.version>3.28.0-GA</javassist.version>
         <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
         <jsr305.version>3.0.2</jsr305.version>
         <logback.version>1.2.13</logback.version>
-        <logging.log4j.version>2.17.1</logging.log4j.version>
+        <logging.log4j.version>2.22.1</logging.log4j.version>
         <log4j2.ttl.thread.context.map.version>1.3.3</log4j2.ttl.thread.context.map.version>
         <maven.gpg.version>3.1.0</maven.gpg.version>
         <maven.deploy.version>3.0.0</maven.deploy.version>
@@ -136,9 +138,9 @@
         <slf4j.version>1.7.36</slf4j.version>
         <snakeyaml.version>2.0</snakeyaml.version>
         <snappy.version>1.1.10.4</snappy.version>
-        <spring.version>5.3.27</spring.version>
-        <springboot.version>2.7.12</springboot.version>
-        <spring.cloud.gateway.version>3.1.5</spring.cloud.gateway.version>
+        <spring.version>6.1.21</spring.version>
+        <springboot.version>3.3.12</springboot.version>
+        <spring.cloud.gateway.version>4.1.4</spring.cloud.gateway.version>
         <transmittable.version>2.12.4</transmittable.version>
         <zookeeper.version>3.8.4</zookeeper.version>
 
@@ -473,6 +475,16 @@
                 <artifactId>jakarta.validation-api</artifactId>
                 <version>${jakarta.validation-api.version}</version>
             </dependency>
+            <dependency>
+                <groupId>jakarta.servlet</groupId>
+                <artifactId>jakarta.servlet-api</artifactId>
+                <version>${jakarta.servlet.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.annotation</groupId>
+                <artifactId>jakarta.annotation-api</artifactId>
+                <version>${jakarta.annotation.version}</version>
+            </dependency>
             <dependency>
                 <groupId>jakarta.xml.bind</groupId>
                 <artifactId>jakarta.xml.bind-api</artifactId>

trpc-opentelemetry/src/main/java/com/tencent/trpc/opentelemetry/sdk/TrpcAttributesGetter.java

@@ -13,7 +13,7 @@
 
 import com.tencent.trpc.core.rpc.Request;
 import io.opentelemetry.instrumentation.api.instrumenter.rpc.RpcAttributesGetter;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * TRPC general attribute setting class

trpc-opentelemetry/src/main/java/com/tencent/trpc/opentelemetry/sdk/TrpcHeaderGetter.java

@@ -19,7 +19,7 @@
 import io.opentelemetry.context.propagation.TextMapGetter;
 import java.util.NoSuchElementException;
 import java.util.ServiceLoader;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * Service request header trace parsing adaptation class

trpc-opentelemetry/src/main/java/com/tencent/trpc/opentelemetry/sdk/TrpcRequestExtractor.java

@@ -24,7 +24,7 @@
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.ServiceLoader;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * TRPC request parser for parsing and adding additional request information to the context

trpc-opentelemetry/src/main/java/com/tencent/trpc/opentelemetry/sdk/metrics/Serializer.java

@@ -41,7 +41,7 @@
 import java.util.function.BiConsumer;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * Serializes metrics into Prometheus exposition formats.

trpc-opentelemetry/src/main/java/com/tencent/trpc/opentelemetry/sdk/support/DefaultTrpcRequestGetter.java

@@ -15,7 +15,7 @@
 import com.tencent.trpc.opentelemetry.spi.ITrpcRequestGetter;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * Default implementation of {@link ITrpcRequestGetter}

trpc-opentelemetry/src/main/java/com/tencent/trpc/opentelemetry/sdk/support/DefaultTrpcResponseExtractor.java

@@ -18,7 +18,7 @@
 import com.tencent.trpc.opentelemetry.spi.ITrpcResponseExtractor;
 import java.util.HashMap;
 import java.util.Map;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * Default implementation of {@link ITrpcResponseExtractor}

trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/common/ErrorResponse.java

@@ -14,7 +14,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
 import java.util.Optional;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 
 /**

trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/common/HttpCodec.java

@@ -24,9 +24,9 @@
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.http.HttpHeaders;
 

trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/common/TrpcServletRequestWrapper.java

@@ -13,8 +13,8 @@
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 
 /**
  * The HTTP requests encapsulated by TRPC cannot be serialized.

trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/common/TrpcServletResponseWrapper.java

@@ -13,8 +13,8 @@
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 
 /**
  * The HTTP responses encapsulated by TRPC cannot be serialized.

trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/server/AbstractHttpExecutor.java

@@ -46,8 +46,8 @@
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
 

trpc-proto/trpc-proto-http/src/main/java/com/tencent/trpc/proto/http/server/DefaultHttpExecutor.java

@@ -25,8 +25,8 @@
 import com.tencent.trpc.proto.http.common.HttpConstants;
 import com.tencent.trpc.transport.http.HttpExecutor;
 import java.util.Optional;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
 

trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/server/AbstractHttpExecutorTest.java

@@ -20,7 +20,7 @@
 import com.tencent.trpc.core.rpc.RpcInvocation;
 import com.tencent.trpc.core.rpc.common.RpcMethodInfo;
 import com.tencent.trpc.proto.http.common.HttpConstants;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;

trpc-proto/trpc-proto-http/src/test/java/com/tencent/trpc/proto/http/server/DefaultHttpExecutorTest.java

@@ -21,17 +21,9 @@
 import com.tencent.trpc.core.rpc.def.DefProviderInvoker;
 import com.tencent.trpc.core.utils.NetUtils;
 import com.tencent.trpc.proto.standard.common.TRPCProtocol;
-import java.net.InetSocketAddress;
-import javax.ws.rs.HttpMethod;
-import org.eclipse.jetty.http.HttpFields;
-import org.eclipse.jetty.http.HttpURI;
-import org.eclipse.jetty.http.HttpVersion;
-import org.eclipse.jetty.http.MetaData;
-import org.eclipse.jetty.server.HttpChannel;
-import org.eclipse.jetty.server.HttpConfiguration;
-import org.eclipse.jetty.server.HttpOutput;
-import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.server.Response;
+
+import java.net.HttpURLConnection;
+import java.net.URL;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
@@ -59,7 +51,7 @@ private static ProviderInvoker<Hello> buildProviderInvoker() {
     }
 
     @Test
-    public void testRegist() {
+    public void testRegist() throws Exception {
         HTTP_EXECUTOR.register(INVOKER);
 
         QueuedThreadPool threadPool = new QueuedThreadPool();
@@ -76,23 +68,15 @@ public void testRegist() {
         connector.setAcceptQueueSize(60);
         server.addConnector(connector);
 
-        HttpChannel httpChannel = new HttpChannel(connector, new HttpConfiguration(),
-                null, null);
-        Request request = new Request(httpChannel, null);
-        request.setMetaData(
-                new MetaData.Request(HttpMethod.GET,
-                        new HttpURI(
-                                "http://localhost:8080/hello/trpc.test.rpc.Hello/sayHello?verison=1"),
-                        HttpVersion.HTTP_1_0, new HttpFields()));
-        request.setMethod(HttpMethod.GET);
-        request.setPathInfo("/trpc.test.rpc.Hello/sayHello");
-        request.setRemoteAddr(new InetSocketAddress("127.0.0.1", 8080));
-
-        Response response = new Response(new HttpChannel(connector, new HttpConfiguration(),
-                null, null),
-                new HttpOutput(new HttpChannel(connector, new HttpConfiguration(), null,
-                        null)));
-        HTTP_EXECUTOR.execute(request, response);
+        server.start();
+        try {
+            URL url = new URL("http://localhost:8080/hello/trpc.test.rpc.Hello/sayHello?verison=1");
+            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+            conn.setRequestMethod("GET");
+
+        } finally {
+            server.stop();
+        }
     }
 
     @Test

trpc-proto/trpc-proto-standard/src/main/java/com/tencent/trpc/proto/standard/stream/StreamRemoteSubscriber.java

@@ -23,7 +23,7 @@
 import io.netty.buffer.ByteBuf;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import javax.annotation.concurrent.ThreadSafe;
 import org.reactivestreams.Subscription;
 import reactor.core.publisher.BaseSubscriber;

trpc-selector/trpc-selector-open-polaris/pom.xml

@@ -39,9 +39,14 @@
             <artifactId>slf4j-simple</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.tencent.trpc</groupId>
             <artifactId>trpc-proto-http</artifactId>

trpc-selector/trpc-selector-open-polaris/src/main/java/com/tencent/trpc/selector/polaris/PolarisSelector.java

@@ -69,7 +69,7 @@
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Executor;
 import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * Base open source polaris selector

trpc-selector/trpc-selector-open-polaris/src/test/java/com/tencent/trpc/selector/open/polaris/RequestMetadataTest.java

@@ -21,7 +21,7 @@
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 import java.util.concurrent.ConcurrentMap;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

trpc-spring-boot-starters/trpc-spring-boot-starter/src/main/java/com/tencent/trpc/spring/boot/starters/context/configuration/TRpcConfigurationApplicationContextInitializer.java

@@ -21,7 +21,7 @@
 import com.tencent.trpc.spring.boot.starters.context.configuration.bind.TRpcConfigurationBindResult;
 import com.tencent.trpc.spring.boot.starters.context.configuration.bind.TRpcConfigurationBindResultReporter;
 import com.tencent.trpc.spring.boot.starters.context.configuration.bind.TRpcConfigurationBinder;
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.Ordered;

trpc-spring-boot-starters/trpc-spring-boot-starter/src/main/java/com/tencent/trpc/spring/boot/starters/env/TRpcConfigurationEnvironmentPostProcessor.java

@@ -20,7 +20,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessor;

trpc-spring-boot-starters/trpc-spring-boot-starter/src/test/java/com/tencent/trpc/spring/boot/starters/annotation/DemoServiceImpl.java

@@ -16,7 +16,7 @@
 import com.tencent.trpc.spring.boot.starters.test.GreeterService;
 import com.tencent.trpc.spring.boot.starters.test.HelloRequestProtocol.HelloRequest;
 import com.tencent.trpc.spring.boot.starters.test.HelloRequestProtocol.HelloResponse;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;

trpc-spring-boot-starters/trpc-spring-boot-starter/src/test/java/com/tencent/trpc/spring/boot/starters/annotation/EnableAnnotationTest.java

@@ -18,7 +18,7 @@
 import com.tencent.trpc.spring.boot.starters.test.HelloRequestProtocol.HelloRequest;
 import com.tencent.trpc.spring.boot.starters.test.HelloRequestProtocol.HelloResponse;
 import com.tencent.trpc.spring.boot.starters.test.SpringBootTestApplication;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;

trpc-spring-boot-starters/trpc-spring-boot-starter/src/test/java/com/tencent/trpc/spring/boot/starters/test/AutoInjectTestFilter.java

@@ -16,7 +16,7 @@
 import com.tencent.trpc.core.rpc.Request;
 import com.tencent.trpc.core.rpc.Response;
 import java.util.concurrent.CompletionStage;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 

trpc-spring-support/trpc-spring-cloud-gateway/src/main/java/com/tencent/trpc/spring/cloud/gateway/filter/TrpcRoutingFilter.java

@@ -83,7 +83,13 @@ public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
         ServerHttpRequest request = exchange.getRequest();
         return DataBufferUtils.join(request.getBody())
                 .map(body -> requestRewriter.resolver(exchange, route, body))
-                .map(body -> client.asyncInvoke(request, route, body.asByteBuffer().array()))
+                .map(body -> {
+                    java.nio.ByteBuffer byteBuffer = body.asByteBuffer();
+                    byte[] bytes = new byte[byteBuffer.remaining()];
+                    byteBuffer.get(bytes);
+                    byteBuffer.rewind();
+                    return client.asyncInvoke(request, route, bytes);
+                })
                 .flatMap(result -> this.responseRewriter.write(exchange, route.getMetadata(), result));
     }