upd: update spring boot to 3.x

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.12</version>
+        <version>3.1.4</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -27,7 +27,7 @@
         <javax-activation.version>1.1.1</javax-activation.version>
         <glassfish-jaxb.version>2.3.3</glassfish-jaxb.version>
         <log4j2.version>2.15.0</log4j2.version>
-        <javax-jaxb.version>2.3.0</javax-jaxb.version>
+        <jakarta-jaxb.version>2.3.0</jakarta-jaxb.version>
     </properties>
 
     <dependencies>
@@ -37,9 +37,8 @@
         </dependency>
 
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.31</version>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
         </dependency>
 
         <dependency>
@@ -112,10 +111,10 @@
             <version>${aliyun-oss.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>jakarta.xml.bind</groupId>-->
+<!--            <artifactId>jaxb-api</artifactId>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>javax.activation</groupId>
             <artifactId>activation</artifactId>

src/main/java/com/dji/sample/component/ApplicationBootInitial.java

@@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Optional;
 
 /**

src/main/java/com/dji/sample/component/AuthInterceptor.java

@@ -11,8 +11,8 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.Optional;
 
 @Slf4j

src/main/java/com/dji/sample/component/CorsFilter.java

@@ -2,9 +2,9 @@ package com.dji.sample.component;
 
 import org.springframework.stereotype.Component;
 
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 import static com.dji.sample.component.AuthInterceptor.PARAM_TOKEN;

src/main/java/com/dji/sample/component/oss/service/impl/AmazonS3ServiceImpl.java

@@ -19,7 +19,7 @@ import com.dji.sdk.cloudapi.storage.OssTypeEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.ArrayList;

src/main/java/com/dji/sample/component/websocket/config/AuthPrincipalHandler.java

@@ -11,7 +11,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.socket.WebSocketHandler;
 import org.springframework.web.socket.server.support.DefaultHandshakeHandler;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.security.Principal;
 import java.util.Map;
 import java.util.Optional;

src/main/java/com/dji/sample/control/controller/DockController.java

@@ -9,7 +9,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 /**
  * @author sean

src/main/java/com/dji/sample/control/controller/DrcController.java

@@ -11,8 +11,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.Valid;
 
 import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
 

src/main/java/com/dji/sample/control/model/param/DrcModeParam.java

@@ -7,8 +7,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.Range;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
 
 /**
  * @author sean

src/main/java/com/dji/sample/control/model/param/DronePayloadParam.java

@@ -6,8 +6,8 @@ import com.dji.sdk.cloudapi.device.CameraModeEnum;
 import lombok.Data;
 import org.hibernate.validator.constraints.Range;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 
 /**
  * @author sean

src/main/java/com/dji/sample/control/model/param/FlyToPointParam.java

@@ -6,9 +6,9 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.Range;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.util.List;
 
 /**

src/main/java/com/dji/sample/control/model/param/PayloadCommandsParam.java

@@ -3,8 +3,8 @@ package com.dji.sample.control.model.param;
 import com.dji.sample.control.model.enums.PayloadCommandsEnum;
 import lombok.Data;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sample/control/model/param/RemoteDebugParam.java

@@ -2,7 +2,7 @@ package com.dji.sample.control.model.param;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sample/control/model/param/TakeoffToPointParam.java

@@ -8,9 +8,9 @@ import com.dji.sdk.cloudapi.wayline.RthModeEnum;
 import lombok.Data;
 import org.hibernate.validator.constraints.Range;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sample/manage/controller/DeviceFirmwareController.java

@@ -15,9 +15,9 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;

src/main/java/com/dji/sample/manage/controller/DeviceLogsController.java

@@ -13,8 +13,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.net.URL;
 
 import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;

src/main/java/com/dji/sample/manage/controller/LiveStreamController.java

@@ -10,7 +10,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
 import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;

src/main/java/com/dji/sample/manage/controller/LoginController.java

@@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.Optional;
 
 import static com.dji.sample.component.AuthInterceptor.PARAM_TOKEN;

src/main/java/com/dji/sample/manage/controller/TopologyController.java

@@ -8,8 +8,8 @@ import com.dji.sdk.common.HttpResultResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**

src/main/java/com/dji/sample/manage/controller/UserController.java

@@ -8,7 +8,7 @@ import com.dji.sdk.common.PaginationData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
 

src/main/java/com/dji/sample/manage/controller/WorkspaceController.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.Optional;
 
 import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;

src/main/java/com/dji/sample/manage/model/common/HmsJsonUtil.java

@@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.io.IOException;
 import java.io.InputStream;
 

src/main/java/com/dji/sample/manage/model/param/DeviceFirmwareQueryParam.java

@@ -6,7 +6,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sample/manage/model/param/DeviceFirmwareUpdateParam.java

@@ -2,7 +2,7 @@ package com.dji.sample.manage.model.param;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sample/manage/model/param/DeviceFirmwareUploadParam.java

@@ -3,7 +3,7 @@ package com.dji.sample.manage.model.param;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
 /**

src/main/java/com/dji/sample/map/controller/WorkspaceElementController.java

@@ -14,9 +14,9 @@ import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import java.util.List;
 
 import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;

src/main/java/com/dji/sample/media/controller/FileController.java

@@ -7,7 +7,7 @@ import com.dji.sdk.common.PaginationData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URL;
 

src/main/java/com/dji/sample/media/controller/MediaController.java

@@ -8,9 +8,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import java.util.List;
 
 /**

src/main/java/com/dji/sample/storage/controller/StorageController.java

@@ -7,8 +7,8 @@ import com.dji.sdk.common.HttpResultResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * @author sean

src/main/java/com/dji/sample/wayline/controller/WaylineFileController.java

@@ -15,11 +15,11 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.io.IOException;
 import java.net.URL;
 import java.sql.SQLException;

src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java

@@ -11,8 +11,8 @@ import com.dji.sdk.common.PaginationData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.Valid;
 import java.sql.SQLException;
 import java.util.Set;
 

src/main/java/com/dji/sample/wayline/model/param/CreateJobParam.java

@@ -6,8 +6,8 @@ import com.dji.sdk.cloudapi.wayline.WaylineTypeEnum;
 import lombok.Data;
 import org.hibernate.validator.constraints.Range;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
 /**

src/main/java/com/dji/sdk/cloudapi/config/ProductConfigResponse.java

@@ -2,7 +2,7 @@ package com.dji.sdk.cloudapi.config;
 
 import com.dji.sdk.common.BaseModel;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/control/CameraAimRequest.java

@@ -3,9 +3,9 @@ package com.dji.sdk.cloudapi.control;
 import com.dji.sdk.cloudapi.device.PayloadIndex;
 import com.dji.sdk.common.BaseModel;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/control/CameraFocalLengthSetRequest.java

@@ -3,9 +3,9 @@ package com.dji.sdk.cloudapi.control;
 import com.dji.sdk.cloudapi.device.PayloadIndex;
 import com.dji.sdk.common.BaseModel;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/control/CameraModeSwitchRequest.java

@@ -4,7 +4,7 @@ import com.dji.sdk.cloudapi.device.CameraModeEnum;
 import com.dji.sdk.cloudapi.device.PayloadIndex;
 import com.dji.sdk.common.BaseModel;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/control/CameraPhotoTakeRequest.java

@@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.control;
 import com.dji.sdk.cloudapi.device.PayloadIndex;
 import com.dji.sdk.common.BaseModel;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/control/CameraRecordingStartRequest.java

@@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.control;
 import com.dji.sdk.cloudapi.device.PayloadIndex;
 import com.dji.sdk.common.BaseModel;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/control/CameraRecordingStopRequest.java

@@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.control;
 import com.dji.sdk.cloudapi.device.PayloadIndex;
 import com.dji.sdk.common.BaseModel;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/control/DrcModeEnterRequest.java

@@ -2,10 +2,10 @@ package com.dji.sdk.cloudapi.control;
 
 import com.dji.sdk.common.BaseModel;
 
-import javax.validation.Valid;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/control/DrcModeMqttBroker.java

@@ -1,8 +1,8 @@
 package com.dji.sdk.cloudapi.control;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/control/DroneControlRequest.java

@@ -2,9 +2,9 @@ package com.dji.sdk.cloudapi.control;
 
 import com.dji.sdk.common.BaseModel;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/control/FlyToPointRequest.java

@@ -2,8 +2,8 @@ package com.dji.sdk.cloudapi.control;
 
 import com.dji.sdk.common.BaseModel;
 
-import javax.validation.Valid;
-import javax.validation.constraints.*;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
 import java.util.List;
 
 /**

src/main/java/com/dji/sdk/cloudapi/control/GimbalResetRequest.java

@@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.control;
 import com.dji.sdk.cloudapi.device.PayloadIndex;
 import com.dji.sdk.common.BaseModel;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/control/HeartBeatRequest.java

@@ -2,8 +2,8 @@ package com.dji.sdk.cloudapi.control;
 
 import com.dji.sdk.common.BaseModel;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/control/PayloadAuthorityGrabRequest.java

@@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.control;
 import com.dji.sdk.cloudapi.device.PayloadIndex;
 import com.dji.sdk.common.BaseModel;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/control/Point.java

@@ -1,8 +1,8 @@
 package com.dji.sdk.cloudapi.control;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/control/TakeoffToPointRequest.java

@@ -7,10 +7,10 @@ import com.dji.sdk.cloudapi.wayline.RthModeEnum;
 import com.dji.sdk.common.BaseModel;
 import com.dji.sdk.config.version.CloudSDKVersionEnum;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/control/api/AbstractControlService.java

@@ -22,7 +22,7 @@ import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 

src/main/java/com/dji/sdk/cloudapi/debug/AirConditionerModeSwitchRequest.java

@@ -2,7 +2,7 @@ package com.dji.sdk.cloudapi.debug;
 
 import com.dji.sdk.common.BaseModel;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/debug/AlarmStateSwitchRequest.java

@@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.debug;
 import com.dji.sdk.cloudapi.device.SwitchActionEnum;
 import com.dji.sdk.common.BaseModel;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/debug/BatteryMaintenanceSwitchRequest.java

@@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.debug;
 import com.dji.sdk.cloudapi.device.SwitchActionEnum;
 import com.dji.sdk.common.BaseModel;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/debug/BatteryStoreModeSwitchRequest.java

@@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.debug;
 import com.dji.sdk.cloudapi.device.BatteryStoreModeEnum;
 import com.dji.sdk.common.BaseModel;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/debug/SdrWorkmodeSwitchRequest.java

@@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.debug;
 import com.dji.sdk.cloudapi.device.LinkWorkModeEnum;
 import com.dji.sdk.common.BaseModel;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/debug/api/AbstractDebugService.java

@@ -21,7 +21,7 @@ import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;

src/main/java/com/dji/sdk/cloudapi/device/DeviceOsdHost.java

@@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.device;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/device/DeviceOsdWsResponse.java

@@ -3,8 +3,8 @@ package com.dji.sdk.cloudapi.device;
 import com.dji.sdk.common.BaseModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/device/PayloadIndex.java

@@ -5,7 +5,7 @@ import com.dji.sdk.exception.CloudSDKException;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.Arrays;
 import java.util.Objects;
 

src/main/java/com/dji/sdk/cloudapi/device/VideoId.java

@@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import org.springframework.util.StringUtils;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.Arrays;
 import java.util.Objects;
 

src/main/java/com/dji/sdk/cloudapi/firmware/OtaCreateDevice.java

@@ -1,7 +1,7 @@
 package com.dji.sdk.cloudapi.firmware;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/firmware/OtaCreateRequest.java

@@ -2,9 +2,9 @@ package com.dji.sdk.cloudapi.firmware;
 
 import com.dji.sdk.common.BaseModel;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.util.List;
 
 /**

src/main/java/com/dji/sdk/cloudapi/firmware/api/AbstractFirmwareService.java

@@ -18,7 +18,7 @@ import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/livestream/LiveLensChangeRequest.java

@@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.livestream;
 import com.dji.sdk.cloudapi.device.VideoId;
 import com.dji.sdk.common.BaseModel;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/livestream/LiveSetQualityRequest.java

@@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.livestream;
 import com.dji.sdk.cloudapi.device.VideoId;
 import com.dji.sdk.common.BaseModel;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/livestream/LiveStartPushRequest.java

@@ -3,8 +3,8 @@ package com.dji.sdk.cloudapi.livestream;
 import com.dji.sdk.cloudapi.device.VideoId;
 import com.dji.sdk.common.BaseModel;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/livestream/LiveStopPushRequest.java

@@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.livestream;
 import com.dji.sdk.cloudapi.device.VideoId;
 import com.dji.sdk.common.BaseModel;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/livestream/api/AbstractLivestreamService.java

@@ -12,7 +12,7 @@ import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/log/FileUploadListRequest.java

@@ -2,9 +2,9 @@ package com.dji.sdk.cloudapi.log;
 
 import com.dji.sdk.common.BaseModel;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.util.List;
 
 /**

src/main/java/com/dji/sdk/cloudapi/log/FileUploadStartFile.java

@@ -1,7 +1,7 @@
 package com.dji.sdk.cloudapi.log;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
 /**

src/main/java/com/dji/sdk/cloudapi/log/FileUploadStartParam.java

@@ -1,8 +1,8 @@
 package com.dji.sdk.cloudapi.log;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.util.List;
 
 /**

src/main/java/com/dji/sdk/cloudapi/log/FileUploadStartRequest.java

@@ -5,8 +5,8 @@ import com.dji.sdk.cloudapi.storage.OssTypeEnum;
 import com.dji.sdk.cloudapi.storage.StsCredentialsResponse;
 import com.dji.sdk.common.BaseModel;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/log/FileUploadUpdateRequest.java

@@ -2,9 +2,9 @@ package com.dji.sdk.cloudapi.log;
 
 import com.dji.sdk.common.BaseModel;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.util.List;
 
 /**

src/main/java/com/dji/sdk/cloudapi/log/LogFileIndex.java

@@ -1,6 +1,6 @@
 package com.dji.sdk.cloudapi.log;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/log/api/AbstractLogService.java

@@ -15,7 +15,7 @@ import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/map/CreateMapElementRequest.java

@@ -2,9 +2,9 @@ package com.dji.sdk.cloudapi.map;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/map/CreateMapElementResponse.java

@@ -2,8 +2,8 @@ package com.dji.sdk.cloudapi.map;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/map/ElementContent.java

@@ -2,8 +2,8 @@ package com.dji.sdk.cloudapi.map;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/map/ElementCoordinate.java

@@ -2,7 +2,7 @@ package com.dji.sdk.cloudapi.map;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/map/ElementLineStringGeometry.java

@@ -5,8 +5,8 @@ import com.dji.sdk.exception.CloudSDKException;
 import io.swagger.v3.oas.annotations.media.Schema;
 import org.springframework.util.CollectionUtils;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

src/main/java/com/dji/sdk/cloudapi/map/ElementPointGeometry.java

@@ -5,8 +5,8 @@ import com.dji.sdk.exception.CloudSDKException;
 import io.swagger.v3.oas.annotations.media.Schema;
 import org.springframework.util.CollectionUtils;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

src/main/java/com/dji/sdk/cloudapi/map/ElementPolygonGeometry.java

@@ -6,8 +6,8 @@ import com.dji.sdk.exception.CloudSDKException;
 import io.swagger.v3.oas.annotations.media.Schema;
 import org.springframework.util.CollectionUtils;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

src/main/java/com/dji/sdk/cloudapi/map/ElementProperty.java

@@ -3,8 +3,8 @@ package com.dji.sdk.cloudapi.map;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/map/ElementResource.java

@@ -3,8 +3,8 @@ package com.dji.sdk.cloudapi.map;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/map/GetMapElementsResponse.java

@@ -4,9 +4,9 @@ import com.dji.sdk.common.BaseModel;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 import java.util.List;
 
 /**

src/main/java/com/dji/sdk/cloudapi/map/MapElementCreateWsResponse.java

@@ -4,10 +4,10 @@ import com.dji.sdk.common.BaseModel;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/map/MapElementDeleteWsResponse.java

@@ -4,8 +4,8 @@ import com.dji.sdk.common.BaseModel;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/map/MapElementUpdateWsResponse.java

@@ -4,10 +4,10 @@ import com.dji.sdk.common.BaseModel;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/map/MapGroupElement.java

@@ -3,10 +3,10 @@ package com.dji.sdk.cloudapi.map;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/map/MapGroupRefreshWsResponse.java

@@ -4,9 +4,9 @@ import com.dji.sdk.common.BaseModel;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 import java.util.List;
 
 /**

src/main/java/com/dji/sdk/cloudapi/map/UpdateMapElementRequest.java

@@ -2,8 +2,8 @@ package com.dji.sdk.cloudapi.map;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/map/api/IHttpMapService.java

@@ -11,9 +11,9 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import java.util.List;
 
 /**

src/main/java/com/dji/sdk/cloudapi/media/FastUploadExtension.java

@@ -4,7 +4,7 @@ import com.dji.sdk.cloudapi.device.DeviceEnum;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/media/FolderUploadCallbackRequest.java

@@ -3,7 +3,7 @@ package com.dji.sdk.cloudapi.media;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/media/GetFileFingerprintRequest.java

@@ -4,7 +4,7 @@ package com.dji.sdk.cloudapi.media;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
 /**

src/main/java/com/dji/sdk/cloudapi/media/GetFileFingerprintResponse.java

@@ -5,7 +5,7 @@ import com.dji.sdk.common.BaseModel;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
 /**

src/main/java/com/dji/sdk/cloudapi/media/MediaFastUploadRequest.java

@@ -2,8 +2,8 @@ package com.dji.sdk.cloudapi.media;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/media/MediaFileExtension.java

@@ -4,7 +4,7 @@ import com.dji.sdk.cloudapi.device.DeviceEnum;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/media/MediaFileMetadata.java

@@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 /**

src/main/java/com/dji/sdk/cloudapi/media/MediaUploadCallbackRequest.java

@@ -3,8 +3,8 @@ package com.dji.sdk.cloudapi.media;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean

src/main/java/com/dji/sdk/cloudapi/media/Position.java

@@ -2,7 +2,7 @@ package com.dji.sdk.cloudapi.media;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author sean