udpate jdk version to jdk21

add docker compose dev support

run dev mode twice.
on first run it will auto create oss bucket and exit

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.3</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -15,19 +15,20 @@
     <name>cloud-api-sample</name>
 
     <properties>
-        <java.version>11</java.version>
+        <java.version>21</java.version>
-        <mybatis-plus.version>3.4.2</mybatis-plus.version>
+        <mybatis-plus.version>3.5.3.2</mybatis-plus.version>
-        <druid.version>1.2.6</druid.version>
+        <druid.version>1.2.18</druid.version>
         <jwt.version>3.12.1</jwt.version>
-        <mqtt.version>5.5.5</mqtt.version>
+        <mqtt.version>6.1.2</mqtt.version>
-        <minio.version>8.3.7</minio.version>
+        <minio.version>8.5.4</minio.version>
-        <okhttp3.version>4.9.1</okhttp3.version>
+        <okhttp3.version>4.11.0</okhttp3.version>
-        <aliyun-sdk-sts.version>3.1.0</aliyun-sdk-sts.version>
+        <aliyun-sdk-sts.version>3.1.1</aliyun-sdk-sts.version>
-        <aliyun-oss.version>3.12.0</aliyun-oss.version>
+        <aliyun-oss.version>3.17.1</aliyun-oss.version>
-        <javax-activation.version>1.1.1</javax-activation.version>
+        <log4j2.version>2.20.0</log4j2.version>
-        <glassfish-jaxb.version>2.3.3</glassfish-jaxb.version>
+        <mysql-connector-j.version>8.1.0</mysql-connector-j.version>
-        <log4j2.version>2.15.0</log4j2.version>
+        <lombok.version>1.18.30</lombok.version>
-        <javax-jaxb.version>2.3.0</javax-jaxb.version>
+        <snakeyaml.version>2.2</snakeyaml.version>
+        <jetbrains.annotations.version>24.0.1</jetbrains.annotations.version>
     </properties>
 
     <dependencies>
@@ -35,16 +36,17 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-
+        <!-- yml解析器 -->
         <dependency>
-            <groupId>mysql</groupId>
+            <groupId>org.yaml</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <artifactId>snakeyaml</artifactId>
-            <version>8.0.31</version>
+            <version>${snakeyaml.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -59,12 +61,19 @@
             <version>${mybatis-plus.version}</version>
         </dependency>
 
+
         <dependency>
             <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
+            <artifactId>druid-spring-boot-3-starter</artifactId>
             <version>${druid.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <version>${mysql-connector-j.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>
@@ -81,10 +90,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-websocket</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>RELEASE</version>
+            <version>${jetbrains.annotations.version}</version>
             <scope>compile</scope>
         </dependency>
 
@@ -112,22 +122,6 @@
             <version>${aliyun-oss.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
-            <version>${javax-activation.version}</version>
-        </dependency>
-        <!-- no more than 2.3.3-->
-        <dependency>
-            <groupId>org.glassfish.jaxb</groupId>
-            <artifactId>jaxb-runtime</artifactId>
-            <version>${glassfish-jaxb.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
@@ -140,12 +134,12 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-s3</artifactId>
-            <version>1.12.261</version>
+            <version>1.12.528</version>
         </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-sts</artifactId>
-            <version>1.12.261</version>
+            <version>1.12.528</version>
         </dependency>
 
         <dependency>
@@ -159,32 +153,41 @@
         </dependency>
 
         <dependency>
-            <groupId>org.dom4j</groupId>
+            <groupId>org.bouncycastle</groupId>
-            <artifactId>dom4j</artifactId>
+            <artifactId>bcpkix-jdk18on</artifactId>
-            <version>2.1.3</version>
+            <version>1.76</version>
         </dependency>
 
         <dependency>
-            <groupId>jaxen</groupId>
+            <groupId>org.springframework.boot</groupId>
-            <artifactId>jaxen</artifactId>
+            <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.bouncycastle</groupId>
+            <groupId>org.springdoc</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
+            <artifactId>springdoc-openapi-ui</artifactId>
-            <version>1.69</version>
+            <version>1.7.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
+            <artifactId>spring-boot-docker-compose</artifactId>
+            <optional>true</optional>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/org.springdoc/springdoc-openapi-ui -->
         <dependency>
-            <groupId>org.springdoc</groupId>
+            <groupId>org.dom4j</groupId>
-            <artifactId>springdoc-openapi-ui</artifactId>
+            <artifactId>dom4j</artifactId>
-            <version>1.7.0</version>
+            <version>2.1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>jaxen</groupId>
+            <artifactId>jaxen</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20230618</version>
         </dependency>
 
     </dependencies>

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

@@ -3,6 +3,8 @@ package com.dji.sample.component;
 import com.dji.sample.common.error.CommonErrorEnum;
 import com.dji.sample.common.model.CustomClaim;
 import com.dji.sample.common.util.JwtUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
@@ -11,8 +13,6 @@ 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 java.util.Optional;
 
 @Slf4j

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

@@ -1,10 +1,10 @@
 package com.dji.sample.component;
 
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.stereotype.Component;
 
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 import static com.dji.sample.component.AuthInterceptor.PARAM_TOKEN;
@@ -32,4 +32,4 @@ public class CorsFilter implements Filter {
         }
         filterChain.doFilter(request, response);
     }
-}
+}

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

@@ -16,10 +16,10 @@ import com.dji.sample.component.oss.model.OssConfiguration;
 import com.dji.sample.component.oss.service.IOssService;
 import com.dji.sdk.cloudapi.storage.CredentialsToken;
 import com.dji.sdk.cloudapi.storage.OssTypeEnum;
+import jakarta.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PostConstruct;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.ArrayList;
@@ -37,7 +37,7 @@ import java.util.Objects;
 public class AmazonS3ServiceImpl implements IOssService {
 
     private AmazonS3 client;
-    
+
     @Override
     public OssTypeEnum getOssType() {
         return OssTypeEnum.AWS;
@@ -120,6 +120,6 @@ public class AmazonS3ServiceImpl implements IOssService {
 
         client.setBucketCrossOriginConfiguration(OssConfiguration.bucket,
                 new BucketCrossOriginConfiguration().withRules(rule));
-        
+
     }
 }

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

@@ -14,6 +14,8 @@ import org.springframework.stereotype.Service;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
@@ -29,7 +31,7 @@ import java.util.Objects;
 public class MinIOServiceImpl implements IOssService {
 
     private MinioClient client;
-    
+
     @Override
     public OssTypeEnum getOssType() {
         return OssTypeEnum.MINIO;
@@ -52,15 +54,15 @@ public class MinIOServiceImpl implements IOssService {
     @Override
     public URL getObjectUrl(String bucket, String objectKey) {
         try {
-            return new URL(
+            return new URI(
                     client.getPresignedObjectUrl(
                                     GetPresignedObjectUrlArgs.builder()
                                             .method(Method.GET)
                                             .bucket(bucket)
                                             .object(objectKey)
                                             .expiry(Math.toIntExact(OssConfiguration.expire))
-                                            .build()));
+                                            .build())).toURL();
-        } catch (ErrorResponseException | InsufficientDataException | InternalException |
+        } catch (ErrorResponseException | URISyntaxException | InsufficientDataException | InternalException |
                 InvalidKeyException | InvalidResponseException | IOException |
                 NoSuchAlgorithmException | XmlParserException | ServerException e) {
             throw new RuntimeException("The file does not exist on the OssConfiguration.");

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;
@@ -67,4 +67,4 @@ public class AuthPrincipalHandler extends DefaultHandshakeHandler {
         }
         return () -> null;
     }
-}
+}

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

@@ -5,12 +5,11 @@ import com.dji.sample.control.model.enums.RemoteDebugMethodEnum;
 import com.dji.sample.control.model.param.*;
 import com.dji.sample.control.service.IControlService;
 import com.dji.sdk.common.HttpResultResponse;
+import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
-
 /**
  * @author sean
  * @version 1.2

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

@@ -7,12 +7,12 @@ import com.dji.sample.control.model.param.DrcModeParam;
 import com.dji.sample.control.service.IDrcService;
 import com.dji.sdk.cloudapi.control.DrcModeMqttBroker;
 import com.dji.sdk.common.HttpResultResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.Valid;
 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 static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
 

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

@@ -1,14 +1,14 @@
 package com.dji.sample.control.model.param;
 
 import com.dji.sample.component.redis.RedisConst;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.Range;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
 
 /**
  * @author sean

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

@@ -3,12 +3,11 @@ package com.dji.sample.control.model.param;
 import com.dji.sdk.cloudapi.control.CameraTypeEnum;
 import com.dji.sdk.cloudapi.control.GimbalResetModeEnum;
 import com.dji.sdk.cloudapi.device.CameraModeEnum;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 import lombok.Data;
 import org.hibernate.validator.constraints.Range;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-
 /**
  * @author sean
  * @version 1.4

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

@@ -1,14 +1,14 @@
 package com.dji.sample.control.model.param;
 
 import com.dji.sdk.cloudapi.control.Point;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.AllArgsConstructor;
 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 java.util.List;
 
 /**

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

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

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

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

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

@@ -5,12 +5,12 @@ import com.dji.sdk.cloudapi.control.CommanderModeLostActionEnum;
 import com.dji.sdk.cloudapi.device.ExitWaylineWhenRcLostEnum;
 import com.dji.sdk.cloudapi.device.RcLostActionEnum;
 import com.dji.sdk.cloudapi.wayline.RthModeEnum;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import org.hibernate.validator.constraints.Range;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
 
 /**
  * @author sean

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

@@ -10,14 +10,13 @@ import com.dji.sample.manage.model.param.DeviceFirmwareUploadParam;
 import com.dji.sample.manage.service.IDeviceFirmwareService;
 import com.dji.sdk.common.HttpResultResponse;
 import com.dji.sdk.common.PaginationData;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 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 java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;

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

@@ -9,12 +9,12 @@ import com.dji.sample.manage.service.IDeviceLogsService;
 import com.dji.sdk.cloudapi.log.FileUploadUpdateRequest;
 import com.dji.sdk.common.HttpResultResponse;
 import com.dji.sdk.common.PaginationData;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 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 java.net.URL;
 
 import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;

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

@@ -6,11 +6,11 @@ import com.dji.sample.manage.model.dto.LiveTypeDTO;
 import com.dji.sample.manage.service.ILiveStreamService;
 import com.dji.sdk.common.HttpResultResponse;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
@@ -82,4 +82,4 @@ public class LiveStreamController {
         return liveStreamService.liveLensChange(liveParam);
     }
 
-}
+}

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

@@ -5,6 +5,8 @@ import com.dji.sample.manage.model.dto.UserDTO;
 import com.dji.sample.manage.model.dto.UserLoginDTO;
 import com.dji.sample.manage.service.IUserService;
 import com.dji.sdk.common.HttpResultResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -12,8 +14,6 @@ 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 java.util.Optional;
 
 import static com.dji.sample.component.AuthInterceptor.PARAM_TOKEN;

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

@@ -5,11 +5,11 @@ import com.dji.sdk.cloudapi.tsa.TopologyList;
 import com.dji.sdk.cloudapi.tsa.TopologyResponse;
 import com.dji.sdk.cloudapi.tsa.api.IHttpTsaService;
 import com.dji.sdk.common.HttpResultResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 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 java.util.List;
 
 /**

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

@@ -5,11 +5,10 @@ import com.dji.sample.manage.model.dto.UserListDTO;
 import com.dji.sample.manage.service.IUserService;
 import com.dji.sdk.common.HttpResultResponse;
 import com.dji.sdk.common.PaginationData;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-
 import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
 
 

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

@@ -4,12 +4,12 @@ import com.dji.sample.common.model.CustomClaim;
 import com.dji.sample.manage.model.dto.WorkspaceDTO;
 import com.dji.sample.manage.service.IWorkspaceService;
 import com.dji.sdk.common.HttpResultResponse;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 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 java.util.Optional;
 
 import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
@@ -38,4 +38,4 @@ public class WorkspaceController {
 
         return workspaceOpt.isEmpty() ? HttpResultResponse.error() : HttpResultResponse.success(workspaceOpt.get());
     }
-}
+}

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

@@ -2,12 +2,12 @@ package com.dji.sample.manage.model.common;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
 import java.io.IOException;
 import java.io.InputStream;
 

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

@@ -1,12 +1,12 @@
 package com.dji.sample.manage.model.param;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotNull;
 
 /**
  * @author sean

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

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

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

@@ -1,9 +1,9 @@
 package com.dji.sample.manage.model.param;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -17,7 +17,7 @@ public class DeviceFirmwareUploadParam {
     @NotNull
     @JsonProperty("release_note")
     private String releaseNote;
-    
+
     @NotNull
     private Boolean status;
 

src/main/java/com/dji/sample/manage/service/impl/DeviceRedisServiceImpl.java

@@ -78,7 +78,7 @@ public class DeviceRedisServiceImpl implements IDeviceRedisService {
 
     @Override
     public void addEndHmsKeys(String sn, String... keys) {
-        RedisOpsUtils.listRPush(RedisConst.HMS_PREFIX + sn, keys);
+        RedisOpsUtils.listRPush(RedisConst.HMS_PREFIX + sn, (Object[]) keys);
     }
 
     @Override

src/main/java/com/dji/sample/manage/service/impl/DeviceServiceImpl.java

@@ -330,7 +330,7 @@ public class DeviceServiceImpl implements IDeviceService {
      * @return
      */
     public Boolean saveOrUpdateDevice(DeviceDTO device) {
-        int count = mapper.selectCount(
+        long count = mapper.selectCount(
                 new LambdaQueryWrapper<DeviceEntity>()
                         .eq(DeviceEntity::getDeviceSn, device.getDeviceSn()));
         return count > 0 ? updateDevice(device) : saveDevice(device) > 0;
@@ -680,4 +680,4 @@ public class DeviceServiceImpl implements IDeviceService {
                 .deviceDesc(dto.getDeviceDesc())
                 .build();
     }
-}
+}

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

@@ -9,14 +9,14 @@ import com.dji.sdk.cloudapi.map.GetMapElementsResponse;
 import com.dji.sdk.cloudapi.map.UpdateMapElementRequest;
 import com.dji.sdk.cloudapi.map.api.IHttpMapService;
 import com.dji.sdk.common.HttpResultResponse;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 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 jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
 import java.util.List;
 
 import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
@@ -73,7 +73,7 @@ public class WorkspaceElementController implements IHttpMapService {
      */
     @Override
     public HttpResultResponse<CreateMapElementResponse> createMapElement(String workspaceId, String groupId,
-                     @Valid CreateMapElementRequest elementCreate, HttpServletRequest req, HttpServletResponse rsp) {
+                 @Valid CreateMapElementRequest elementCreate, HttpServletRequest req, HttpServletResponse rsp) {
         CustomClaim claims = (CustomClaim) req.getAttribute(TOKEN_CLAIM);
         // Set the creator of the element
         elementCreate.getResource().setUsername(claims.getUsername());
@@ -118,4 +118,4 @@ public class WorkspaceElementController implements IHttpMapService {
 
         return elementService.deleteElement(workspaceId, elementId);
     }
-}
+}

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

@@ -4,13 +4,13 @@ import com.dji.sample.media.service.IMediaService;
 import com.dji.sdk.cloudapi.media.*;
 import com.dji.sdk.cloudapi.media.api.IHttpMediaService;
 import com.dji.sdk.common.HttpResultResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 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 java.util.List;
 
 /**
@@ -68,4 +68,4 @@ public class MediaController implements IHttpMediaService {
     public HttpResultResponse folderUploadCallback(String workspaceId, @Valid FolderUploadCallbackRequest request, HttpServletRequest req, HttpServletResponse rsp) {
         return null;
     }
-}
+}

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

@@ -4,11 +4,11 @@ import com.dji.sample.storage.service.IStorageService;
 import com.dji.sdk.cloudapi.storage.StsCredentialsResponse;
 import com.dji.sdk.cloudapi.storage.api.IHttpStorageService;
 import com.dji.sdk.common.HttpResultResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 /**
  * @author sean

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

@@ -8,6 +8,11 @@ import com.dji.sdk.cloudapi.wayline.*;
 import com.dji.sdk.cloudapi.wayline.api.IHttpWaylineService;
 import com.dji.sdk.common.HttpResultResponse;
 import com.dji.sdk.common.PaginationData;
+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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -15,11 +20,6 @@ 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 java.io.IOException;
 import java.net.URL;
 import java.sql.SQLException;

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

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

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

@@ -3,11 +3,11 @@ package com.dji.sample.wayline.model.param;
 import com.dji.sdk.cloudapi.wayline.OutOfControlActionEnum;
 import com.dji.sdk.cloudapi.wayline.TaskTypeEnum;
 import com.dji.sdk.cloudapi.wayline.WaylineTypeEnum;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import org.hibernate.validator.constraints.Range;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**

src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java

@@ -1,5 +1,7 @@
 package com.dji.sample.wayline.service.impl;
 
+import com.fasterxml.jackson.core.JsonPointer;
+import org.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,10 +19,10 @@ import com.dji.sdk.cloudapi.wayline.GetWaylineListResponse;
 import com.dji.sdk.cloudapi.wayline.WaylineTypeEnum;
 import com.dji.sdk.common.Pagination;
 import com.dji.sdk.common.PaginationData;
-import org.dom4j.Document;
+import org.dom4j.*;
-import org.dom4j.DocumentException;
-import org.dom4j.Node;
 import org.dom4j.io.SAXReader;
+import org.json.JSONPointer;
+import org.json.XML;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -194,14 +196,16 @@ public class WaylineFileServiceImpl implements IWaylineFileService {
                     nextEntry = unzipFile.getNextEntry();
                     continue;
                 }
+
                 SAXReader reader = new SAXReader();
                 Document document = reader.read(unzipFile);
                 if (!StandardCharsets.UTF_8.name().equals(document.getXMLEncoding())) {
                     throw new RuntimeException("The file encoding format is incorrect.");
                 }
+                Node droneNode =document.selectSingleNode( "//"+ KmzFileProperties.TAG_WPML_PREFIX + KmzFileProperties.TAG_DRONE_INFO);;
+
+                Node payloadNode = document.selectSingleNode("//"+KmzFileProperties.TAG_WPML_PREFIX + KmzFileProperties.TAG_PAYLOAD_INFO );;
 
-                Node droneNode = document.selectSingleNode("//" + KmzFileProperties.TAG_WPML_PREFIX + KmzFileProperties.TAG_DRONE_INFO);
-                Node payloadNode = document.selectSingleNode("//" + KmzFileProperties.TAG_WPML_PREFIX + KmzFileProperties.TAG_PAYLOAD_INFO);
                 if (Objects.isNull(droneNode) || Objects.isNull(payloadNode)) {
                     throw new RuntimeException("The file format is incorrect.");
                 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,8 +1,9 @@
 package com.dji.sdk.cloudapi.control;
 
-import javax.validation.constraints.Max;
+
-import javax.validation.constraints.Min;
+import jakarta.validation.constraints.Max;
-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/TakeoffToPointRequest.java

@@ -6,11 +6,11 @@ import com.dji.sdk.cloudapi.device.RcLostActionEnum;
 import com.dji.sdk.cloudapi.wayline.RthModeEnum;
 import com.dji.sdk.common.BaseModel;
 import com.dji.sdk.common.CloudSDKVersionEnum;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
 
 /**
  * @author sean

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

@@ -18,11 +18,11 @@ import com.dji.sdk.mqtt.events.TopicEventsResponse;
 import com.dji.sdk.mqtt.services.ServicesPublish;
 import com.dji.sdk.mqtt.services.ServicesReplyData;
 import com.dji.sdk.mqtt.services.TopicServicesResponse;
+import jakarta.annotation.Resource;
 import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
 
-import javax.annotation.Resource;
 import java.util.Objects;
 
 /**

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

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

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

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

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

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

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

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

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

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

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

@@ -17,11 +17,11 @@ import com.dji.sdk.mqtt.services.ServicesPublish;
 import com.dji.sdk.mqtt.services.ServicesReplyData;
 import com.dji.sdk.mqtt.services.TopicServicesResponse;
 import com.fasterxml.jackson.core.type.TypeReference;
+import jakarta.annotation.Resource;
 import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
 
-import javax.annotation.Resource;
 import java.util.Objects;
 
 /**

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,8 @@
 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

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

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

@@ -14,11 +14,11 @@ import com.dji.sdk.mqtt.services.ServicesPublish;
 import com.dji.sdk.mqtt.services.ServicesReplyData;
 import com.dji.sdk.mqtt.services.TopicServicesResponse;
 import com.fasterxml.jackson.core.type.TypeReference;
+import jakarta.annotation.Resource;
 import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
 
-import javax.annotation.Resource;
 
 /**
  * @author sean

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

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

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

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

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

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

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

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

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

@@ -8,11 +8,11 @@ import com.dji.sdk.mqtt.services.ServicesReplyData;
 import com.dji.sdk.mqtt.services.TopicServicesResponse;
 import com.dji.sdk.mqtt.state.TopicStateRequest;
 import com.fasterxml.jackson.core.type.TypeReference;
+import jakarta.annotation.Resource;
 import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
 
-import javax.annotation.Resource;
 
 /**
  * @author sean

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

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

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,7 @@
 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

@@ -11,11 +11,11 @@ import com.dji.sdk.mqtt.services.ServicesPublish;
 import com.dji.sdk.mqtt.services.ServicesReplyData;
 import com.dji.sdk.mqtt.services.TopicServicesResponse;
 import com.fasterxml.jackson.core.type.TypeReference;
+import jakarta.annotation.Resource;
 import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
 
-import javax.annotation.Resource;
 
 /**
  * @author sean

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

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

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

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

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

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

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

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

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

@@ -3,10 +3,10 @@ package com.dji.sdk.cloudapi.map;
 import com.dji.sdk.exception.CloudSDKErrorEnum;
 import com.dji.sdk.exception.CloudSDKException;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import org.springframework.util.CollectionUtils;
 
-import javax.validation.constraints.NotNull;
-import javax.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

@@ -3,10 +3,9 @@ package com.dji.sdk.cloudapi.map;
 import com.dji.sdk.exception.CloudSDKErrorEnum;
 import com.dji.sdk.exception.CloudSDKException;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import org.springframework.util.CollectionUtils;
-
-import javax.validation.constraints.NotNull;
-import javax.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

@@ -4,10 +4,10 @@ import com.dji.sample.map.model.enums.ElementTypeEnum;
 import com.dji.sdk.exception.CloudSDKErrorEnum;
 import com.dji.sdk.exception.CloudSDKException;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import org.springframework.util.CollectionUtils;
 
-import javax.validation.constraints.NotNull;
-import javax.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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -9,11 +9,11 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -121,4 +121,4 @@ public interface IHttpMapService {
             @PathVariable(name = "element_id") String elementId,
             HttpServletRequest req, HttpServletResponse rsp);
 
-}
+}

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

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

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

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

src/main/java/com/dji/sdk/cloudapi/media/GetFileFingerprintRequest.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 jakarta.validation.constraints.NotNull;
 
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**

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

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

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

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

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

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