This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new a3c96ebb3 [Improve] @Nonnull annotation improvemenets (#3808)
a3c96ebb3 is described below
commit a3c96ebb39e2442e254abb74054bf5382b677ce8
Author: benjobs <[email protected]>
AuthorDate: Sat Jun 29 01:10:11 2024 +0800
[Improve] @Nonnull annotation improvemenets (#3808)
* [Improve] @Nonnull annotation improvements
---
.../base/exception/AbstractApiException.java | 7 +++---
.../interceptor/UploadFileTypeInterceptor.java | 27 +++++++++++++++-------
.../console/base/mybatis/pager/MybatisPager.java | 1 -
.../console/base/util/BashJavaUtils.java | 2 +-
.../console/base/util/SpringContextUtils.java | 4 +++-
.../impl/ApplicationActionServiceImpl.java | 5 ++--
.../core/service/impl/AppBuildPipeServiceImpl.java | 21 ++++++++---------
.../core/service/impl/SavePointServiceImpl.java | 3 +--
.../service/impl/SparkAppBuildPipeServiceImpl.java | 3 +--
9 files changed, 40 insertions(+), 33 deletions(-)
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/exception/AbstractApiException.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/exception/AbstractApiException.java
index 0d602bbdc..ccdd76068 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/exception/AbstractApiException.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/exception/AbstractApiException.java
@@ -17,6 +17,8 @@
package org.apache.streampark.console.base.exception;
+import lombok.Getter;
+
/**
*
*
@@ -24,6 +26,7 @@ package org.apache.streampark.console.base.exception;
* An exception message that needs to be notified to front-end.
* </pre>
*/
+@Getter
public abstract class AbstractApiException extends RuntimeException {
private final long responseCode;
@@ -42,8 +45,4 @@ public abstract class AbstractApiException extends
RuntimeException {
super(message, cause);
this.responseCode = responseCode;
}
-
- public long getResponseCode() {
- return responseCode;
- }
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/interceptor/UploadFileTypeInterceptor.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/interceptor/UploadFileTypeInterceptor.java
index cec0554c1..be7e459dc 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/interceptor/UploadFileTypeInterceptor.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/interceptor/UploadFileTypeInterceptor.java
@@ -36,6 +36,7 @@ import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView;
import org.xml.sax.helpers.DefaultHandler;
+import javax.annotation.Nonnull;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -49,7 +50,10 @@ public class UploadFileTypeInterceptor implements
HandlerInterceptor {
private static final Logger logger =
LoggerFactory.getLogger(UploadFileTypeInterceptor.class);
@Override
- public boolean preHandle(HttpServletRequest request, HttpServletResponse
response, Object handler)
+ public boolean preHandle(
+ @Nonnull HttpServletRequest request,
+ @Nonnull HttpServletResponse response,
+ @Nonnull Object handler)
throws Exception {
if (request instanceof MultipartHttpServletRequest) {
MultipartHttpServletRequest multipartRequest =
(MultipartHttpServletRequest) request;
@@ -58,9 +62,13 @@ public class UploadFileTypeInterceptor implements
HandlerInterceptor {
MultipartFile multipartFile = multipartRequest.getFile(file);
ApiAlertException.throwIfNull(
multipartFile, "File to upload can't be null. Upload file
failed.");
- boolean isJarOrPyFile =
- FileUtils.isJarFileType(multipartFile.getInputStream())
- || isPythonFileType(multipartFile.getContentType(),
multipartFile.getInputStream());
+ boolean isJarOrPyFile = false;
+ if (multipartFile != null) {
+ isJarOrPyFile =
+ FileUtils.isJarFileType(multipartFile.getInputStream())
+ || isPythonFileType(
+ multipartFile.getContentType(),
multipartFile.getInputStream());
+ }
ApiAlertException.throwIfFalse(
isJarOrPyFile,
"Illegal file type, Only support standard jar files. Upload file
failed.");
@@ -88,9 +96,9 @@ public class UploadFileTypeInterceptor implements
HandlerInterceptor {
@Override
public void postHandle(
- HttpServletRequest request,
- HttpServletResponse response,
- Object handler,
+ @Nonnull HttpServletRequest request,
+ @Nonnull HttpServletResponse response,
+ @Nonnull Object handler,
ModelAndView modelAndView)
throws Exception {
HandlerInterceptor.super.postHandle(request, response, handler,
modelAndView);
@@ -98,7 +106,10 @@ public class UploadFileTypeInterceptor implements
HandlerInterceptor {
@Override
public void afterCompletion(
- HttpServletRequest request, HttpServletResponse response, Object
handler, Exception ex)
+ @Nonnull HttpServletRequest request,
+ @Nonnull HttpServletResponse response,
+ @Nonnull Object handler,
+ Exception ex)
throws Exception {
HandlerInterceptor.super.afterCompletion(request, response, handler, ex);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/mybatis/pager/MybatisPager.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/mybatis/pager/MybatisPager.java
index e8f7cc897..f5ed35cb6 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/mybatis/pager/MybatisPager.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/mybatis/pager/MybatisPager.java
@@ -29,7 +29,6 @@ import
com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.ArrayList;
import java.util.List;
-@SuppressWarnings("unchecked")
public final class MybatisPager<T> {
public static <T> Page<T> getPage(RestRequest request) {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/BashJavaUtils.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/BashJavaUtils.java
index 999167fde..247902273 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/BashJavaUtils.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/BashJavaUtils.java
@@ -39,7 +39,7 @@ import java.util.Map;
public class BashJavaUtils {
- private static String localhost = "localhost";
+ private static final String localhost = "localhost";
public static void main(String[] args) throws IOException {
String action = args[0].toLowerCase();
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/SpringContextUtils.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/SpringContextUtils.java
index 7154919e5..c5075e619 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/SpringContextUtils.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/SpringContextUtils.java
@@ -22,13 +22,15 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.stereotype.Component;
+import javax.annotation.Nonnull;
+
@Component
public class SpringContextUtils implements ApplicationContextAware {
private static ApplicationContext applicationContext;
@Override
- public synchronized void setApplicationContext(ApplicationContext
applicationContext)
+ public synchronized void setApplicationContext(@Nonnull ApplicationContext
applicationContext)
throws BeansException {
SpringContextUtils.applicationContext = applicationContext;
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationActionServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationActionServiceImpl.java
index 0ce35b2e1..e37d7950c 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationActionServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationActionServiceImpl.java
@@ -100,13 +100,14 @@ import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Sets;
import io.fabric8.kubernetes.client.KubernetesClientException;
import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Nonnull;
+
import java.io.File;
import java.net.URI;
import java.util.Date;
@@ -469,7 +470,7 @@ public class ApplicationActionServiceImpl extends
ServiceImpl<ApplicationMapper,
});
}
- @NotNull
+ @Nonnull
private ApplicationLog constructAppLog(Application application) {
ApplicationLog applicationLog = new ApplicationLog();
applicationLog.setOptionName(OperationEnum.START.getValue());
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/AppBuildPipeServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/AppBuildPipeServiceImpl.java
index d7f1b0f9a..c021093de 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/AppBuildPipeServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/AppBuildPipeServiceImpl.java
@@ -91,7 +91,6 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
@@ -479,18 +478,16 @@ public class AppBuildPipeServiceImpl
}
}
- @NotNull
+ @Nonnull
private FlinkYarnApplicationBuildRequest
buildFlinkYarnApplicationBuildRequest(
- @NotNull Application app, String mainClass, String localWorkspace,
String yarnProvidedPath) {
- FlinkYarnApplicationBuildRequest yarnAppRequest =
- new FlinkYarnApplicationBuildRequest(
- app.getJobName(),
- mainClass,
- localWorkspace,
- yarnProvidedPath,
- app.getDevelopmentMode(),
- getMergedDependencyInfo(app));
- return yarnAppRequest;
+ @Nonnull Application app, String mainClass, String localWorkspace,
String yarnProvidedPath) {
+ return new FlinkYarnApplicationBuildRequest(
+ app.getJobName(),
+ mainClass,
+ localWorkspace,
+ yarnProvidedPath,
+ app.getDevelopmentMode(),
+ getMergedDependencyInfo(app));
}
@Nonnull
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java
index d2e1703e5..d269416a5 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java
@@ -59,7 +59,6 @@ import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.google.common.annotations.VisibleForTesting;
import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
@@ -183,7 +182,7 @@ public class SavePointServiceImpl extends
ServiceImpl<SavePointMapper, SavePoint
handleSavepointResponseFuture(application, applicationLog,
savepointFuture);
}
- @NotNull
+ @Nonnull
private ApplicationLog getApplicationLog(Application application) {
ApplicationLog applicationLog = new ApplicationLog();
applicationLog.setOptionName(OperationEnum.SAVEPOINT.getValue());
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SparkAppBuildPipeServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SparkAppBuildPipeServiceImpl.java
index 22f3d6050..1c6d68f5b 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SparkAppBuildPipeServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SparkAppBuildPipeServiceImpl.java
@@ -74,7 +74,6 @@ import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fasterxml.jackson.core.JsonProcessingException;
import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
@@ -139,7 +138,7 @@ public class SparkAppBuildPipeServiceImpl
* @return Whether the pipeline was successfully started
*/
@Override
- public boolean buildApplication(@NotNull Long appId, boolean forceBuild) {
+ public boolean buildApplication(@Nonnull Long appId, boolean forceBuild) {
// check the build environment
checkBuildEnv(appId, forceBuild);
