You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampark.apache.org by be...@apache.org on 2023/02/14 01:53:29 UTC
[incubator-streampark] branch assertutils updated: notNull improvement
This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch assertutils
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/assertutils by this push:
new 496fed48a notNull improvement
496fed48a is described below
commit 496fed48a1e43d249fde4068bfab26aeb8198ea6
Author: benjobs <be...@apache.org>
AuthorDate: Tue Feb 14 09:53:16 2023 +0800
notNull improvement
---
.../java/org/apache/streampark/console/base/util/CommonUtils.java | 2 +-
.../apache/streampark/console/system/controller/UserController.java | 6 ++++--
.../streampark/console/system/service/impl/UserServiceImpl.java | 1 -
.../apache/streampark/flink/connector/jdbc/sink/JdbcJavaSink.java | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/CommonUtils.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/CommonUtils.java
index 477443b6f..0efb46a12 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/CommonUtils.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/CommonUtils.java
@@ -451,7 +451,7 @@ public final class CommonUtils implements Serializable {
}
public static <T> T[] arrayRemoveElements(T[] array, T... elem) {
- Utils.notNull(array);
+ Utils.required(array != null);
List<T> arrayList = new ArrayList<>(0);
Collections.addAll(arrayList, array);
if (isEmpty(elem)) {
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
index d43cc3069..09b5cf1d0 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
@@ -20,6 +20,7 @@ package org.apache.streampark.console.system.controller;
import org.apache.streampark.console.base.domain.ResponseCode;
import org.apache.streampark.console.base.domain.RestRequest;
import org.apache.streampark.console.base.domain.RestResponse;
+import org.apache.streampark.console.base.exception.ApiAlertException;
import org.apache.streampark.console.base.util.ShaHashUtils;
import org.apache.streampark.console.core.enums.UserType;
import org.apache.streampark.console.core.service.CommonService;
@@ -172,9 +173,10 @@ public class UserController {
if (team == null) {
return RestResponse.fail("teamId is invalid", ResponseCode.CODE_FAIL_ALERT);
}
-
User user = commonService.getCurrentUser();
-
+ if (user == null) {
+ throw new ApiAlertException("current login user is null, set team failed");
+ }
// 1) set the latest team
userService.setLastTeam(teamId, user.getUserId());
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
index 18173a9a4..99ba05aad 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
@@ -238,7 +238,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
*/
@Override
public Map<String, Object> generateFrontendUserInfo(User user, Long teamId, JWTToken token) {
- Utils.notNull(user);
Map<String, Object> userInfo = new HashMap<>(8);
// 1) token & expire
diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-jdbc/src/main/scala/org/apache/streampark/flink/connector/jdbc/sink/JdbcJavaSink.java b/streampark-flink/streampark-flink-connector/streampark-flink-connector-jdbc/src/main/scala/org/apache/streampark/flink/connector/jdbc/sink/JdbcJavaSink.java
index 8260d4121..1bbb0cc8a 100644
--- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-jdbc/src/main/scala/org/apache/streampark/flink/connector/jdbc/sink/JdbcJavaSink.java
+++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-jdbc/src/main/scala/org/apache/streampark/flink/connector/jdbc/sink/JdbcJavaSink.java
@@ -55,7 +55,7 @@ public class JdbcJavaSink<T> {
}
public DataStreamSink<T> sink(DataStream<T> dataStream) {
- Utils.notNull(sqlFunc);
+ Utils.required(sqlFunc != null, "transformFunction can not be null");
this.jdbc = this.jdbc == null ? ConfigUtils.getJdbcConf(context.parameter().toMap(), alias) : this.jdbc;
JdbcSinkFunction<T> sinkFun = new JdbcSinkFunction<>(this.jdbc, this.sqlFunc);
return dataStream.addSink(sinkFun);