This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 58b9123dead [feat](web)Adapted for Spring Boot 3 and Jetty 12 (#57710)
58b9123dead is described below
commit 58b9123dead01708c166c8c4b2b1a12d926456d7
Author: Calvin Kirs <[email protected]>
AuthorDate: Fri Nov 7 10:15:35 2025 +0800
[feat](web)Adapted for Spring Boot 3 and Jetty 12 (#57710)
Adapted for Spring Boot 3 and Jetty 12
---
fe/fe-core/pom.xml | 5 ---
.../java/org/apache/doris/httpv2/HttpServer.java | 4 +-
.../httpv2/config/HttpToHttpsJettyConfig.java | 22 ++++++----
.../apache/doris/httpv2/config/WebConfigurer.java | 31 ++++++++-----
.../config/WebServerFactoryCustomizerConfig.java | 2 +-
.../doris/httpv2/controller/BaseController.java | 7 +--
.../doris/httpv2/controller/ConfigController.java | 4 +-
.../httpv2/controller/HardwareInfoController.java | 2 +-
.../doris/httpv2/controller/HelpController.java | 2 +-
.../doris/httpv2/controller/LogController.java | 2 +-
.../doris/httpv2/controller/LoginController.java | 4 +-
.../doris/httpv2/controller/LogoutController.java | 7 ++-
.../doris/httpv2/controller/SessionController.java | 2 +-
.../doris/httpv2/controller/SystemController.java | 2 +-
.../doris/httpv2/interceptor/AuthInterceptor.java | 21 +++------
.../httpv2/interceptor/ServletTraceIterceptor.java | 18 ++++----
.../doris/httpv2/meta/ColocateMetaService.java | 4 +-
.../org/apache/doris/httpv2/meta/MetaService.java | 4 +-
.../apache/doris/httpv2/rest/BackendsAction.java | 4 +-
.../doris/httpv2/rest/BootstrapFinishAction.java | 5 +--
.../apache/doris/httpv2/rest/CancelLoadAction.java | 5 +--
.../doris/httpv2/rest/CheckDecommissionAction.java | 4 +-
.../doris/httpv2/rest/CheckWalSizeAction.java | 4 +-
.../apache/doris/httpv2/rest/ConnectionAction.java | 4 +-
.../apache/doris/httpv2/rest/CopyIntoAction.java | 4 +-
.../apache/doris/httpv2/rest/DebugPointAction.java | 5 +--
.../doris/httpv2/rest/ExtraBasepathAction.java | 5 +--
.../doris/httpv2/rest/FeVersionInfoAction.java | 4 +-
.../apache/doris/httpv2/rest/GetDdlStmtAction.java | 4 +-
.../apache/doris/httpv2/rest/GetLogFileAction.java | 4 +-
.../doris/httpv2/rest/GetSmallFileAction.java | 4 +-
.../doris/httpv2/rest/GetStreamLoadState.java | 5 +--
.../org/apache/doris/httpv2/rest/HealthAction.java | 4 +-
.../org/apache/doris/httpv2/rest/LoadAction.java | 4 +-
.../apache/doris/httpv2/rest/MetaInfoAction.java | 4 +-
.../doris/httpv2/rest/MetaReplayerCheckAction.java | 4 +-
.../apache/doris/httpv2/rest/MetricsAction.java | 4 +-
.../apache/doris/httpv2/rest/MinidumpAction.java | 5 +--
.../apache/doris/httpv2/rest/ProfileAction.java | 4 +-
.../apache/doris/httpv2/rest/QueryStatsAction.java | 4 +-
.../doris/httpv2/rest/RestBaseController.java | 4 +-
.../apache/doris/httpv2/rest/RowCountAction.java | 4 +-
.../apache/doris/httpv2/rest/SetConfigAction.java | 4 +-
.../org/apache/doris/httpv2/rest/ShowAction.java | 4 +-
.../doris/httpv2/rest/StmtExecutionAction.java | 4 +-
.../doris/httpv2/rest/StorageTypeCheckAction.java | 4 +-
.../doris/httpv2/rest/TableQueryPlanAction.java | 4 +-
.../doris/httpv2/rest/TableRowCountAction.java | 4 +-
.../doris/httpv2/rest/TableSchemaAction.java | 4 +-
.../org/apache/doris/httpv2/rest/UploadAction.java | 4 +-
.../doris/httpv2/rest/manager/ClusterAction.java | 4 +-
.../doris/httpv2/rest/manager/HttpUtils.java | 2 +-
.../doris/httpv2/rest/manager/NodeAction.java | 4 +-
.../httpv2/rest/manager/QueryProfileAction.java | 4 +-
.../httpv2/restv2/AddStoragePolicyAction.java | 4 +-
.../doris/httpv2/restv2/ESCatalogAction.java | 4 +-
.../apache/doris/httpv2/restv2/ImportAction.java | 4 +-
.../doris/httpv2/restv2/MetaInfoActionV2.java | 4 +-
.../doris/httpv2/restv2/StatisticAction.java | 4 +-
.../doris/httpv2/util/StatementSubmitter.java | 2 +-
.../util/streamresponse/JsonStreamResponse.java | 2 +-
.../util/streamresponse/StreamResponseInf.java | 3 +-
fe/hive-udf/pom.xml | 14 ++++++
fe/pom.xml | 51 +++++++++++++++++++---
64 files changed, 216 insertions(+), 167 deletions(-)
diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml
index 498a3942196..6ad5cf66692 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -183,11 +183,6 @@ under the License.
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
- <!--
https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.doris</groupId>
<artifactId>je</artifactId>
diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/HttpServer.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/HttpServer.java
index 88ec1a1b9f9..1902f471f1b 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/HttpServer.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/HttpServer.java
@@ -146,8 +146,8 @@ public class HttpServer extends
SpringBootServletInitializer {
} else {
properties.put("server.address", "0.0.0.0");
}
+ properties.put("spring.resources.static-locations",
"classpath:/static/");
properties.put("server.servlet.context-path", "/");
- properties.put("spring.resources.static-locations",
"classpath:/static");
properties.put("spring.http.encoding.charset", "UTF-8");
properties.put("spring.http.encoding.enabled", true);
properties.put("spring.http.encoding.force", true);
@@ -179,6 +179,6 @@ public class HttpServer extends
SpringBootServletInitializer {
new SpringApplicationBuilder()
.sources(HttpServer.class)
.properties(properties)
- .run(new String[]{});
+ .run();
}
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/config/HttpToHttpsJettyConfig.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/config/HttpToHttpsJettyConfig.java
index 47e3287bc20..5952ffe8a04 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/config/HttpToHttpsJettyConfig.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/config/HttpToHttpsJettyConfig.java
@@ -17,18 +17,24 @@
package org.apache.doris.httpv2.config;
-import org.eclipse.jetty.security.ConstraintMapping;
-import org.eclipse.jetty.security.ConstraintSecurityHandler;
-import org.eclipse.jetty.util.security.Constraint;
-import org.eclipse.jetty.webapp.AbstractConfiguration;
-import org.eclipse.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.ee10.servlet.security.ConstraintMapping;
+import org.eclipse.jetty.ee10.servlet.security.ConstraintSecurityHandler;
+import org.eclipse.jetty.ee10.webapp.AbstractConfiguration;
+import org.eclipse.jetty.ee10.webapp.WebAppContext;
+import org.eclipse.jetty.security.Constraint;
+
public class HttpToHttpsJettyConfig extends AbstractConfiguration {
+ public HttpToHttpsJettyConfig() {
+ super(new AbstractConfiguration.Builder());
+ }
+
+
@Override
public void configure(WebAppContext context) throws Exception {
- Constraint constraint = new Constraint();
- constraint.setDataConstraint(Constraint.DC_CONFIDENTIAL);
-
+ Constraint constraint = new Constraint.Builder()
+ .transport(Constraint.Transport.SECURE)
+ .build();
ConstraintSecurityHandler handler = new ConstraintSecurityHandler();
ConstraintMapping mappingGetRest = new ConstraintMapping();
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/config/WebConfigurer.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/config/WebConfigurer.java
index aef48def57a..def1edca261 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/config/WebConfigurer.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/config/WebConfigurer.java
@@ -26,9 +26,11 @@ import
org.springframework.boot.web.servlet.server.ConfigurableServletWebServerF
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpStatus;
-import org.springframework.web.multipart.commons.CommonsMultipartResolver;
+import org.springframework.util.AntPathMatcher;
+import
org.springframework.web.multipart.support.StandardServletMultipartResolver;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
import
org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -53,23 +55,32 @@ public class WebConfigurer implements WebMvcConfigurer {
.maxAge(3600);
}
+ @Override
+ public void configurePathMatch(PathMatchConfigurer configurer) {
+ configurer.setPathMatcher(new AntPathMatcher());
+ configurer.setUseTrailingSlashMatch(true);
+ }
+
@Override
public void addViewControllers(ViewControllerRegistry registry) {
-
registry.addViewController("/notFound").setStatusCode(HttpStatus.OK).setViewName("forward:/index.html");
+ registry.addViewController("/notFound")
+ .setStatusCode(HttpStatus.OK)
+ .setViewName("forward:/index.html");
+ registry.addViewController("/{path:[^\\.]*}")
+ .setViewName("forward:/index.html");
+ registry.addViewController("/**/{path:[^\\.]*}")
+ .setViewName("forward:/index.html");
}
@Bean
public WebServerFactoryCustomizer<ConfigurableServletWebServerFactory>
containerCustomizer() {
- return container -> {
- container.addErrorPages(new ErrorPage(HttpStatus.NOT_FOUND,
- "/notFound"));
- };
+ return container -> container.addErrorPages(
+ new ErrorPage(HttpStatus.NOT_FOUND, "/notFound")
+ );
}
@Bean(name = "multipartResolver")
- public CommonsMultipartResolver multipartResolver() {
- CommonsMultipartResolver multipartResolver = new
CommonsMultipartResolver();
-
multipartResolver.setMaxUploadSize(Config.jetty_server_max_http_post_size);
- return multipartResolver;
+ public StandardServletMultipartResolver multipartResolver() {
+ return new StandardServletMultipartResolver();
}
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/config/WebServerFactoryCustomizerConfig.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/config/WebServerFactoryCustomizerConfig.java
index c0eb2dc7c72..a467a230844 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/config/WebServerFactoryCustomizerConfig.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/config/WebServerFactoryCustomizerConfig.java
@@ -35,7 +35,7 @@ public class WebServerFactoryCustomizerConfig implements
WebServerFactoryCustomi
public void customize(ConfigurableJettyWebServerFactory factory) {
if (Config.enable_https) {
((JettyServletWebServerFactory) factory).setConfigurations(
- Collections.singleton(new HttpToHttpsJettyConfig())
+ Collections.singletonList(new HttpToHttpsJettyConfig())
);
factory.addServerCustomizers(
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/BaseController.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/BaseController.java
index 504da1f2682..0e17f6d23ae 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/BaseController.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/BaseController.java
@@ -40,15 +40,16 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.handler.codec.base64.Base64;
import io.netty.util.CharsetUtil;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.nio.ByteBuffer;
import java.util.List;
import java.util.UUID;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+
public class BaseController {
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/ConfigController.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/ConfigController.java
index b0769e0d83b..1df9acedd0c 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/ConfigController.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/ConfigController.java
@@ -23,6 +23,8 @@ import org.apache.doris.httpv2.entity.ResponseEntityBuilder;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -32,8 +34,6 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
@RestController
@RequestMapping("/rest/v1")
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/HardwareInfoController.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/HardwareInfoController.java
index 203aa039e52..2c90bed8764 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/HardwareInfoController.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/HardwareInfoController.java
@@ -55,7 +55,7 @@ public class HardwareInfoController {
private static final Logger LOG =
LogManager.getLogger(HardwareInfoController.class);
- @RequestMapping(path = "/hardware_info/fe", method = RequestMethod.GET)
+ @RequestMapping(path = "/hardware_info/fe/", method = RequestMethod.GET)
public Object index() {
Map<String, Map<String, String>> map = new HashMap<>();
appendVersionInfo(map);
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/HelpController.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/HelpController.java
index 8ca92da90a1..2d79702594f 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/HelpController.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/HelpController.java
@@ -22,6 +22,7 @@ import org.apache.doris.qe.help.HelpModule;
import org.apache.doris.qe.help.HelpTopic;
import com.google.common.base.Strings;
+import jakarta.servlet.http.HttpServletRequest;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@@ -30,7 +31,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
@RestController
@RequestMapping("/rest/v1")
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LogController.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LogController.java
index d9d3dadfdf9..7fdd85c5585 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LogController.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LogController.java
@@ -24,6 +24,7 @@ import org.apache.doris.httpv2.entity.ResponseEntityBuilder;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -38,7 +39,6 @@ import java.io.RandomAccessFile;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
@RestController
@RequestMapping("/rest/v1")
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LoginController.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LoginController.java
index 7962ce2a9e0..fbf0a16b02b 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LoginController.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LoginController.java
@@ -17,14 +17,14 @@
package org.apache.doris.httpv2.controller;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
@RestController
@RequestMapping("/rest/v1")
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LogoutController.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LogoutController.java
index 68e7aca9571..38e468eb554 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LogoutController.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LogoutController.java
@@ -20,14 +20,13 @@ package org.apache.doris.httpv2.controller;
import org.apache.doris.httpv2.HttpAuthManager;
import org.apache.doris.httpv2.entity.ResponseEntityBuilder;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
@RestController
@RequestMapping("/rest/v1")
public class LogoutController extends BaseController {
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/SessionController.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/SessionController.java
index e21e61b4ed9..94be8e17376 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/SessionController.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/SessionController.java
@@ -33,6 +33,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.http.ResponseEntity;
@@ -48,7 +49,6 @@ import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
@RestController
@RequestMapping("/rest/v1")
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/SystemController.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/SystemController.java
index 533eaa25d5c..c7b3a1f888c 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/SystemController.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/SystemController.java
@@ -35,6 +35,7 @@ import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.commons.validator.routines.UrlValidator;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -49,7 +50,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
@RestController
@RequestMapping("/rest/v1")
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/interceptor/AuthInterceptor.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/interceptor/AuthInterceptor.java
index cbaea7b0c84..271f071eddc 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/interceptor/AuthInterceptor.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/interceptor/AuthInterceptor.java
@@ -19,27 +19,24 @@ package org.apache.doris.httpv2.interceptor;
import org.apache.doris.httpv2.controller.BaseController;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
public class AuthInterceptor extends BaseController implements
HandlerInterceptor {
+
private static final Logger LOG =
LogManager.getLogger(AuthInterceptor.class);
@Override
- public boolean preHandle(HttpServletRequest request,
- HttpServletResponse response, Object handler)
throws Exception {
+ public boolean preHandle(HttpServletRequest request, HttpServletResponse
response, Object handler) {
if (LOG.isDebugEnabled()) {
LOG.debug("get prehandle. thread: {}",
Thread.currentThread().getId());
}
- // String sessionId = getCookieValue(request,
BaseController.PALO_SESSION_ID, response);
- // SessionValue sessionValue =
HttpAuthManager.getInstance().getSessionValue(sessionId);
+
String method = request.getMethod();
if (method.equalsIgnoreCase(RequestMethod.OPTIONS.toString())) {
response.setStatus(HttpStatus.NO_CONTENT.value());
@@ -50,13 +47,5 @@ public class AuthInterceptor extends BaseController
implements HandlerIntercepto
return true;
}
- @Override
- public void postHandle(HttpServletRequest request, HttpServletResponse
response,
- Object handler, ModelAndView modelAndView) throws Exception {
- }
- @Override
- public void afterCompletion(HttpServletRequest request,
HttpServletResponse response,
- Object handler, Exception ex) throws Exception {
- }
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/interceptor/ServletTraceIterceptor.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/interceptor/ServletTraceIterceptor.java
index 7eb724d4d8e..bf3a025d183 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/interceptor/ServletTraceIterceptor.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/interceptor/ServletTraceIterceptor.java
@@ -17,19 +17,19 @@
package org.apache.doris.httpv2.interceptor;
+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 org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
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;
@WebFilter (urlPatterns = "/*", filterName = "traceIterceptor")
public class ServletTraceIterceptor implements Filter {
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/ColocateMetaService.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/ColocateMetaService.java
index 8adb2147054..a31939e617f 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/ColocateMetaService.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/ColocateMetaService.java
@@ -30,6 +30,8 @@ import org.apache.doris.qe.ConnectContext;
import com.google.common.base.Preconditions;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.web.bind.annotation.RequestBody;
@@ -39,8 +41,6 @@ import org.springframework.web.bind.annotation.RestController;
import java.lang.reflect.Type;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
/*
* the colocate meta define in {@link ColocateTableIndex}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/MetaService.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/MetaService.java
index 44a1ae236ed..6a8bd71faca 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/MetaService.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/meta/MetaService.java
@@ -32,6 +32,8 @@ import org.apache.doris.system.Frontend;
import com.google.common.base.Strings;
import com.google.common.collect.Maps;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -42,8 +44,6 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
@RestController
public class MetaService extends RestBaseController {
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/BackendsAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/BackendsAction.java
index 81e44421500..368cc9acada 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/BackendsAction.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/BackendsAction.java
@@ -27,6 +27,8 @@ import org.apache.doris.system.Backend;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.Getter;
import lombok.Setter;
import org.apache.logging.log4j.LogManager;
@@ -36,8 +38,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
/**
* This class responsible for returning current backends info.
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/BootstrapFinishAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/BootstrapFinishAction.java
index fb503f7feea..6ea4977aaec 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/BootstrapFinishAction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/BootstrapFinishAction.java
@@ -23,14 +23,13 @@ import org.apache.doris.common.Version;
import org.apache.doris.httpv2.entity.ResponseEntityBuilder;
import com.google.common.base.Strings;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
/**
* Api for checking the whether the FE has been started successfully.
* Response
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/CancelLoadAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/CancelLoadAction.java
index 59c0579747a..4cc74e3b4d9 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/CancelLoadAction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/CancelLoadAction.java
@@ -28,14 +28,13 @@ import org.apache.doris.mysql.privilege.PrivPredicate;
import org.apache.doris.qe.ConnectContext;
import com.google.common.base.Strings;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
/**
* To cancel a load transaction with given load label
*/
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/CheckDecommissionAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/CheckDecommissionAction.java
index 39d2e506d32..fc7adb8fe64 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/CheckDecommissionAction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/CheckDecommissionAction.java
@@ -29,14 +29,14 @@ import org.apache.doris.system.SystemInfoService.HostInfo;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
/**
* calc row count from replica to table
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/CheckWalSizeAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/CheckWalSizeAction.java
index 6b52ef3f35a..7eb7d11daa3 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/CheckWalSizeAction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/CheckWalSizeAction.java
@@ -29,14 +29,14 @@ import org.apache.doris.system.SystemInfoService.HostInfo;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
/**
* cal wal size of specific be
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ConnectionAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ConnectionAction.java
index 42d009cd36f..f1d03846e65 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ConnectionAction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ConnectionAction.java
@@ -25,6 +25,8 @@ import org.apache.doris.service.ExecuteEnv;
import com.google.common.base.Strings;
import com.google.common.collect.Maps;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -32,8 +34,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
/**
* This class is used to get current query_id of connection_id.
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/CopyIntoAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/CopyIntoAction.java
index b0fbbf7b348..ea2c54e1976 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/CopyIntoAction.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/CopyIntoAction.java
@@ -42,6 +42,8 @@ import org.apache.doris.qe.ConnectContext;
import com.google.common.base.Strings;
import io.netty.handler.codec.http.HttpResponseStatus;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.json.simple.JSONObject;
@@ -60,8 +62,6 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
@RestController
@RequestMapping(path = "/copy")
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/DebugPointAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/DebugPointAction.java
index 8c102fd0ae4..c78407bb977 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/DebugPointAction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/DebugPointAction.java
@@ -25,15 +25,14 @@ import org.apache.doris.mysql.privilege.PrivPredicate;
import org.apache.doris.qe.ConnectContext;
import com.google.common.base.Strings;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
/**
* This class is used to add, remove or clear debug points.
*/
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ExtraBasepathAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ExtraBasepathAction.java
index aba1273be02..495f80dc8b4 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ExtraBasepathAction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ExtraBasepathAction.java
@@ -21,14 +21,13 @@ import org.apache.doris.common.Config;
import org.apache.doris.httpv2.entity.ResponseEntityBuilder;
import com.google.common.base.Strings;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
/**
* Api for getting the base path of api
* Base path is the URL prefix for all API paths.
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/FeVersionInfoAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/FeVersionInfoAction.java
index 6e300911132..bae9a25a093 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/FeVersionInfoAction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/FeVersionInfoAction.java
@@ -23,6 +23,8 @@ import org.apache.doris.mysql.privilege.PrivPredicate;
import org.apache.doris.qe.ConnectContext;
import com.google.common.collect.Maps;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,8 +32,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
// This class is a RESTFUL interface to get fe version info.
// It will be used in get fe version info.
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetDdlStmtAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetDdlStmtAction.java
index b71117fafbe..f06d31c93a5 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetDdlStmtAction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetDdlStmtAction.java
@@ -28,6 +28,8 @@ import org.apache.doris.qe.ConnectContext;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -36,8 +38,6 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
/*
* used to get a table's ddl stmt
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetLogFileAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetLogFileAction.java
index 87c4c4cfa90..bab2cf2c4e3 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetLogFileAction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetLogFileAction.java
@@ -26,6 +26,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Strings;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@@ -36,8 +38,6 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Map;
import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
/*
* get log file infos:
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetSmallFileAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetSmallFileAction.java
index 714bd6aed03..54c47227177 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetSmallFileAction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetSmallFileAction.java
@@ -25,6 +25,8 @@ import org.apache.doris.mysql.privilege.PrivPredicate;
import org.apache.doris.qe.ConnectContext;
import com.google.common.base.Strings;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -32,8 +34,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
@RestController
public class GetSmallFileAction extends RestBaseController {
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetStreamLoadState.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetStreamLoadState.java
index cf7bbee2b0f..42db523dec8 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetStreamLoadState.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetStreamLoadState.java
@@ -22,14 +22,13 @@ import org.apache.doris.catalog.Env;
import org.apache.doris.httpv2.entity.ResponseEntityBuilder;
import com.google.common.base.Strings;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
@RestController
public class GetStreamLoadState extends RestBaseController {
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/HealthAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/HealthAction.java
index de8f1b235ec..fe27402f9a9 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/HealthAction.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/HealthAction.java
@@ -21,14 +21,14 @@ import org.apache.doris.catalog.Env;
import org.apache.doris.common.Config;
import org.apache.doris.httpv2.entity.ResponseEntityBuilder;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
@RestController
public class HealthAction extends RestBaseController {
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/LoadAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/LoadAction.java
index 4f4f2d73e3e..4fcd432051f 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/LoadAction.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/LoadAction.java
@@ -48,6 +48,8 @@ import org.apache.doris.thrift.TNetworkAddress;
import com.google.common.base.Strings;
import io.netty.handler.codec.http.HttpHeaderNames;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.validator.routines.InetAddressValidator;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -64,8 +66,6 @@ import java.net.URI;
import java.util.Enumeration;
import java.util.List;
import java.util.Optional;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
@RestController
public class LoadAction extends RestBaseController {
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MetaInfoAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MetaInfoAction.java
index 14368c2869b..81216fe2007 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MetaInfoAction.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MetaInfoAction.java
@@ -44,6 +44,8 @@ import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -52,8 +54,6 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
/**
* And meta info like databases, tables and schema
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MetaReplayerCheckAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MetaReplayerCheckAction.java
index 6247cf41e02..fadf8ad105e 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MetaReplayerCheckAction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MetaReplayerCheckAction.java
@@ -22,13 +22,13 @@ import org.apache.doris.httpv2.entity.ResponseEntityBuilder;
import org.apache.doris.mysql.privilege.PrivPredicate;
import org.apache.doris.qe.ConnectContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
/*
* used to get meta replay info
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MetricsAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MetricsAction.java
index d7eb61d335b..80eb824fcdf 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MetricsAction.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MetricsAction.java
@@ -25,14 +25,14 @@ import org.apache.doris.metric.PrometheusMetricVisitor;
import org.apache.doris.metric.SimpleCoreMetricVisitor;
import com.google.common.base.Strings;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
//fehost:port/metrics
//fehost:port/metrics?type=core
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MinidumpAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MinidumpAction.java
index 1cc5cf46644..77f64256175 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MinidumpAction.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/MinidumpAction.java
@@ -23,6 +23,8 @@ import org.apache.doris.nereids.minidump.MinidumpUtils;
import org.apache.doris.qe.ConnectContext;
import com.google.common.base.Strings;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.http.HttpHeaders;
@@ -32,9 +34,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
// This class is a RESTFUL interface to get query minidump.
// It will be used in query monitor to collect minidumps.
// Usage:
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ProfileAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ProfileAction.java
index a470608446a..813612d68d0 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ProfileAction.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ProfileAction.java
@@ -24,6 +24,8 @@ import org.apache.doris.qe.ConnectContext;
import com.google.common.base.Strings;
import com.google.common.collect.Maps;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,8 +33,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
// This class is a RESTFUL interface to get query profile.
// It will be used in query monitor to collect profiles.
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/QueryStatsAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/QueryStatsAction.java
index c1a1c386957..6907961bee9 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/QueryStatsAction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/QueryStatsAction.java
@@ -24,6 +24,8 @@ import org.apache.doris.mysql.privilege.PrivPredicate;
import org.apache.doris.qe.ConnectContext;
import org.apache.doris.system.SystemInfoService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.json.simple.JSONArray;
@@ -37,8 +39,6 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.Map;
import java.util.function.BiFunction;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
/**
* This class is used to get query stats or clear query stats.
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/RestBaseController.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/RestBaseController.java
index 7223acab6a8..25ab947c19f 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/RestBaseController.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/RestBaseController.java
@@ -32,6 +32,8 @@ import org.apache.doris.thrift.TNetworkAddress;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import jline.internal.Nullable;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.logging.log4j.LogManager;
@@ -54,8 +56,6 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.util.Collections;
import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
public class RestBaseController extends BaseController {
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/RowCountAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/RowCountAction.java
index cb04b65e6ec..4e6179b3af9 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/RowCountAction.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/RowCountAction.java
@@ -33,13 +33,13 @@ import org.apache.doris.qe.ConnectContext;
import com.google.common.base.Strings;
import com.google.common.collect.Maps;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
/*
* calc row count from replica to table
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/SetConfigAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/SetConfigAction.java
index 8d0cc12a235..c41e3c574a1 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/SetConfigAction.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/SetConfigAction.java
@@ -29,6 +29,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.gson.annotations.SerializedName;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
@@ -42,8 +44,6 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
/**
* used to set fe config.
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ShowAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ShowAction.java
index 162e1d27ffc..1633e8514c0 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ShowAction.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ShowAction.java
@@ -39,6 +39,8 @@ import org.apache.doris.qe.ConnectContext;
import com.google.common.base.Strings;
import com.google.common.collect.Maps;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -52,8 +54,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
@RestController
public class ShowAction extends RestBaseController {
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/StmtExecutionAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/StmtExecutionAction.java
index 3916edffbc0..72ed03d2033 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/StmtExecutionAction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/StmtExecutionAction.java
@@ -41,6 +41,8 @@ import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -57,8 +59,6 @@ import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
/**
* For execute stmt or get create table stmt via http
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/StorageTypeCheckAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/StorageTypeCheckAction.java
index 56e9e27ed1f..349dc24c2d1 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/StorageTypeCheckAction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/StorageTypeCheckAction.java
@@ -30,14 +30,14 @@ import org.apache.doris.thrift.TStorageType;
import com.google.common.base.Strings;
import com.google.common.collect.Maps;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
@RestController
public class StorageTypeCheckAction extends RestBaseController {
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableQueryPlanAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableQueryPlanAction.java
index 895dfcb8a52..2bb5d48ac06 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableQueryPlanAction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableQueryPlanAction.java
@@ -62,6 +62,8 @@ import org.apache.doris.thrift.TUniqueId;
import com.google.common.base.Strings;
import io.netty.handler.codec.http.HttpResponseStatus;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.thrift.TException;
@@ -79,8 +81,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
/**
* This class responsible for parse the sql and generate the query plan
fragment for a (only one) table{@see OlapTable}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableRowCountAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableRowCountAction.java
index ec94253e1d6..f753c872b62 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableRowCountAction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableRowCountAction.java
@@ -27,6 +27,8 @@ import org.apache.doris.httpv2.entity.ResponseEntityBuilder;
import org.apache.doris.mysql.privilege.PrivPredicate;
import org.apache.doris.qe.ConnectContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -34,8 +36,6 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
/**
* This class is responsible for fetch the approximate row count of the
specified table from cluster-meta data,
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableSchemaAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableSchemaAction.java
index 2fb9eb75c86..a3196ad5d3b 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableSchemaAction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/TableSchemaAction.java
@@ -39,6 +39,8 @@ import org.apache.doris.qe.ConnectContext;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
@@ -52,8 +54,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
/**
* Get table schema for specified cluster.database.table with privilege
checking
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/UploadAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/UploadAction.java
index a07f28938a9..941f1a6dcd6 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/UploadAction.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/UploadAction.java
@@ -27,6 +27,8 @@ import org.apache.doris.system.SystemInfoService;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.web.bind.annotation.PathVariable;
@@ -40,8 +42,6 @@ import java.io.IOException;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
/**
* Upload file
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/ClusterAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/ClusterAction.java
index ef435ad0d41..995bc8080e8 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/ClusterAction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/ClusterAction.java
@@ -28,6 +28,8 @@ import org.apache.doris.qe.ConnectContext;
import org.apache.doris.system.Frontend;
import com.google.common.collect.Maps;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.http.ResponseEntity;
@@ -38,8 +40,6 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
/*
* Used to return the cluster information for the manager.
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/HttpUtils.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/HttpUtils.java
index 4330e4ace56..988eccc0cc5 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/HttpUtils.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/HttpUtils.java
@@ -27,6 +27,7 @@ import org.apache.doris.system.SystemInfoService.HostInfo;
import com.google.common.base.Strings;
import com.google.gson.reflect.TypeToken;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.commons.io.IOUtils;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.HttpGet;
@@ -43,7 +44,6 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
/*
* used to forward http requests from manager to be.
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/NodeAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/NodeAction.java
index f0b713dafeb..4067864dc30 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/NodeAction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/NodeAction.java
@@ -52,6 +52,8 @@ import com.google.common.collect.Sets;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.reflect.TypeToken;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
@@ -77,8 +79,6 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
/*
* Used to return all node information, configuration information and modify
node config.
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/QueryProfileAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/QueryProfileAction.java
index 829ffe05b06..7af8a05b648 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/QueryProfileAction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/manager/QueryProfileAction.java
@@ -49,6 +49,8 @@ import com.google.common.collect.Maps;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.reflect.TypeToken;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.Getter;
import lombok.Setter;
import org.apache.logging.log4j.LogManager;
@@ -69,8 +71,6 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
/*
* Used to return query information and query profile.
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/AddStoragePolicyAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/AddStoragePolicyAction.java
index 446f9f5306b..395355283a9 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/AddStoragePolicyAction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/AddStoragePolicyAction.java
@@ -25,6 +25,8 @@ import org.apache.doris.httpv2.rest.RestBaseController;
import org.apache.doris.policy.StoragePolicy;
import com.google.common.collect.Maps;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.Getter;
import lombok.Setter;
import org.apache.logging.log4j.LogManager;
@@ -35,8 +37,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
@RestController
@RequestMapping("/rest/v2")
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/ESCatalogAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/ESCatalogAction.java
index aeb2591eced..235d17863f2 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/ESCatalogAction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/ESCatalogAction.java
@@ -27,6 +27,8 @@ import org.apache.doris.httpv2.rest.RestBaseController;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.collect.Maps;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -38,8 +40,6 @@ import java.io.IOException;
import java.util.Map;
import java.util.function.BiFunction;
import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
@RestController
@RequestMapping("/rest/v2/api/es_catalog")
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/ImportAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/ImportAction.java
index 1979a9e9835..5c7ebf9cbbb 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/ImportAction.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/ImportAction.java
@@ -27,6 +27,8 @@ import org.apache.doris.httpv2.rest.RestBaseController;
import org.apache.doris.thrift.TBrokerFileStatus;
import com.google.common.collect.Lists;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.Getter;
import lombok.Setter;
import org.apache.logging.log4j.LogManager;
@@ -39,8 +41,6 @@ import org.springframework.web.bind.annotation.RestController;
import java.io.IOException;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
@RestController
@RequestMapping("/rest/v2")
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/MetaInfoActionV2.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/MetaInfoActionV2.java
index d973bd58fa0..04e523c288f 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/MetaInfoActionV2.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/MetaInfoActionV2.java
@@ -39,6 +39,8 @@ import org.apache.doris.qe.ConnectContext;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.Getter;
import lombok.Setter;
import org.springframework.web.bind.annotation.PathVariable;
@@ -50,8 +52,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
/**
* And meta info like databases, tables and schema
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/StatisticAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/StatisticAction.java
index 2b2a6d49b63..cb1c9e6694e 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/StatisticAction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/restv2/StatisticAction.java
@@ -27,6 +27,8 @@ import org.apache.doris.system.Backend;
import org.apache.doris.system.SystemInfoService;
import com.google.common.collect.Maps;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -36,8 +38,6 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
@RestController
@RequestMapping("/rest/v2")
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/StatementSubmitter.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/StatementSubmitter.java
index 37cf7ce3ee9..60b44ec9384 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/StatementSubmitter.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/StatementSubmitter.java
@@ -25,6 +25,7 @@ import org.apache.doris.qe.ConnectContext;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -39,7 +40,6 @@ import java.util.Map;
import java.util.concurrent.Callable;
import java.util.concurrent.Future;
import java.util.concurrent.ThreadPoolExecutor;
-import javax.servlet.http.HttpServletResponse;
/**
* This is a simple stmt submitter for submitting a statement to the local FE.
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/streamresponse/JsonStreamResponse.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/streamresponse/JsonStreamResponse.java
index e816efaeb8d..ba77589b710 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/streamresponse/JsonStreamResponse.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/streamresponse/JsonStreamResponse.java
@@ -23,6 +23,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.gson.Gson;
import com.google.gson.stream.JsonWriter;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -32,7 +33,6 @@ import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
/**
* Serialize the ResultSet to JSON, and then response to client
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/streamresponse/StreamResponseInf.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/streamresponse/StreamResponseInf.java
index 245222c79d2..739ff842c88 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/streamresponse/StreamResponseInf.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/util/streamresponse/StreamResponseInf.java
@@ -17,9 +17,10 @@
package org.apache.doris.httpv2.util.streamresponse;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.PrintWriter;
import java.sql.ResultSet;
-import javax.servlet.http.HttpServletResponse;
/**
* StreamResponseInf use response.getWriter() to response client
diff --git a/fe/hive-udf/pom.xml b/fe/hive-udf/pom.xml
index 074244af829..dd7e17797af 100644
--- a/fe/hive-udf/pom.xml
+++ b/fe/hive-udf/pom.xml
@@ -33,6 +33,20 @@ under the License.
<properties>
<fe_ut_parallel>1</fe_ut_parallel>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ <version>1.14.0</version> <!-- Java 8+ required -->
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-common</artifactId>
+ <version>3.1.2</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.hive</groupId>
diff --git a/fe/pom.xml b/fe/pom.xml
index d600c6ba424..6cb5543a1e8 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -268,9 +268,9 @@ under the License.
<hikaricp.version>6.0.0</hikaricp.version>
<thrift.version>0.16.0</thrift.version>
<tomcat-embed.version>9.0.104</tomcat-embed.version>
- <log4j2.version>2.18.0</log4j2.version>
- <log4j-1.2.version>2.18.0</log4j-1.2.version>
- <slf4j.version>2.0.6</slf4j.version>
+ <log4j2.version>2.25.2</log4j2.version>
+ <log4j-1.2.version>2.25.2</log4j-1.2.version>
+ <slf4j.version>2.0.17</slf4j.version>
<metrics-core.version>4.0.2</metrics-core.version>
<!--Netty 4.1.94 is not compatible with arrow flight.-->
<!--Need to ensure that the version is the same as in
arrow/java/pom.xml or compatible with it.-->
@@ -351,8 +351,8 @@ under the License.
<antlr4.version>4.13.1</antlr4.version>
<joda.version>2.8.1</joda.version>
<project.scm.id>github</project.scm.id>
- <spring.version>2.7.18</spring.version>
- <spring-framework.version>5.3.39</spring-framework.version>
+ <spring.version>3.5.7</spring.version>
+ <spring-framework.version>6.2.12</spring-framework.version>
<orc.version>1.8.4</orc.version>
<zookeeper.version>3.9.3</zookeeper.version>
<velocity-engine-core.version>2.4</velocity-engine-core.version>
@@ -361,7 +361,7 @@ under the License.
<woodstox.version>6.5.1</woodstox.version>
<kerby.version>2.0.3</kerby.version>
<jettison.version>1.5.4</jettison.version>
- <jetty.version>9.4.57.v20241219</jetty.version>
+ <jetty.version>12.0.29</jetty.version>
<immutables.version>2.9.3</immutables.version>
<ivy.version>2.5.2</ivy.version>
<icu4j.version>75.1</icu4j.version>
@@ -447,6 +447,12 @@ under the License.
<artifactId>ivy</artifactId>
<version>${ivy.version}</version>
</dependency>
+ <!-- has conflict with jakarta.servlet-api-->
+ <dependency>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-jakarta-servlet-api</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
@@ -497,6 +503,11 @@ under the License.
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
@@ -595,6 +606,10 @@ under the License.
<groupId>validator</groupId>
<artifactId>hibernate-validator</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-embed-jasper</artifactId>
+ </exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
@@ -1217,10 +1232,18 @@ under the License.
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
@@ -1233,6 +1256,10 @@ under the License.
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-client</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1305,6 +1332,10 @@ under the License.
<artifactId>commons-httpclient</artifactId>
<groupId>commons-httpclient</groupId>
</exclusion>
+ <exclusion>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>javax.servlet.jsp</artifactId>
+ </exclusion>
<exclusion>
<artifactId>netty-all</artifactId>
<groupId>io.netty</groupId>
@@ -1317,6 +1348,14 @@ under the License.
<groupId>org.apache.hive</groupId>
<artifactId>hive-storage-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ </exclusion>
</exclusions>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
