(incubator-streampark) branch dev-2.1.3 updated: [Improve] minor improve

[benjobs]

This is an automated email from the ASF dual-hosted git repository.

benjobs pushed a commit to branch dev-2.1.3
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git


The following commit(s) were added to refs/heads/dev-2.1.3 by this push:
     new 9fb92e438 [Improve] minor improve
9fb92e438 is described below

commit 9fb92e4389a1e63cc84475a4a7087f9cfc9c038f
Author: benjobs <benj...@gmail.com>
AuthorDate: Sun Dec 31 20:40:04 2023 +0800

    [Improve] minor improve
---
 .../apache/streampark/console/base/domain/RestRequest.java   |  4 ++--
 .../streampark/console/base/mybatis/pager/MybatisPager.java  | 12 ++++--------
 .../core/service/alert/impl/AlertConfigServiceImpl.java      |  2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/RestRequest.java
 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/RestRequest.java
index 42fe5084a..8d2eeeb2f 100644
--- 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/RestRequest.java
+++ 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/RestRequest.java
@@ -36,10 +36,10 @@ public class RestRequest implements Serializable {
   private int pageNum = 1;
 
   @Schema(example = "", description = "e.g. create_time")
-  private String sortField;
+  private String sortField = Constant.DEFAULT_SORT_FIELD;
 
   @Schema(
       example = "",
       allowableValues = {"asc", "desc"})
-  private String sortOrder;
+  private String sortOrder = Constant.ORDER_DESC;
 }
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 9858dfcf1..4685a9818 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
@@ -33,14 +33,10 @@ import java.util.List;
 public final class MybatisPager {
 
   public static <T> Page<T> getPage(RestRequest request) {
-    if (request.getSortField() == null) {
-      request.setSortField(Constant.DEFAULT_SORT_FIELD);
-    } else {
-      boolean invalid = request.getSortField().trim().split("\\s+").length > 1;
-      if (invalid) {
-        throw new IllegalArgumentException(
-            String.format("Invalid argument sortField: %s", 
request.getSortField()));
-      }
+    boolean invalid = request.getSortField().trim().split("\\s+").length > 1;
+    if (invalid) {
+      throw new IllegalArgumentException(
+          String.format("Invalid argument sortField: %s", 
request.getSortField()));
     }
 
     if (request.getSortOrder() == null) {
diff --git 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/AlertConfigServiceImpl.java
 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/AlertConfigServiceImpl.java
index 8ac83604d..218f45dfd 100644
--- 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/AlertConfigServiceImpl.java
+++ 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/AlertConfigServiceImpl.java
@@ -52,7 +52,7 @@ public class AlertConfigServiceImpl extends 
ServiceImpl<AlertConfigMapper, Alert
   @Override
   public IPage<AlertConfigWithParams> page(AlertConfigWithParams params, 
RestRequest request) {
     // build query conditions
-    LambdaQueryWrapper<AlertConfig> wrapper = new LambdaQueryWrapper();
+    LambdaQueryWrapper<AlertConfig> wrapper = new LambdaQueryWrapper<>();
     wrapper.eq(params.getUserId() != null, AlertConfig::getUserId, 
params.getUserId());
 
     Page<AlertConfig> page = MybatisPager.getPage(request);