This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch LambdaQueryWrapper
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/LambdaQueryWrapper by this
push:
new fc8b168a9 [Improve] mybatis lambdaQuery improvements
fc8b168a9 is described below
commit fc8b168a9ea30606128a79adc51f5144208e7003
Author: benjobs <[email protected]>
AuthorDate: Sat Nov 30 16:46:31 2024 +0800
[Improve] mybatis lambdaQuery improvements
---
.../core/service/alert/impl/AlertConfigServiceImpl.java | 3 +--
.../impl/FlinkApplicationBackupServiceImpl.java | 9 ++++++---
.../impl/FlinkApplicationConfigServiceImpl.java | 11 ++++++-----
.../impl/FlinkApplicationInfoServiceImpl.java | 2 +-
.../impl/FlinkApplicationManageServiceImpl.java | 17 ++++++++++++-----
.../impl/SparkApplicationConfigServiceImpl.java | 5 ++---
.../console/core/service/impl/FlinkEnvServiceImpl.java | 2 +-
.../console/core/service/impl/FlinkSqlServiceImpl.java | 5 +++--
.../console/core/service/impl/MessageServiceImpl.java | 10 +++++++---
.../console/core/service/impl/SettingServiceImpl.java | 11 ++++-------
.../console/system/service/impl/MemberServiceImpl.java | 6 ++++--
.../console/system/service/impl/UserServiceImpl.java | 2 +-
12 files changed, 48 insertions(+), 35 deletions(-)
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 b0b354273..c9247e873 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
@@ -31,7 +31,6 @@ import org.apache.commons.collections.CollectionUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
@@ -58,7 +57,7 @@ public class AlertConfigServiceImpl extends
ServiceImpl<AlertConfigMapper, Alert
Page<AlertConfig> page = MybatisPager.getPage(request);
IPage<AlertConfig> resultPage = getBaseMapper().selectPage(
page,
- Wrappers.<AlertConfig>lambdaQuery().eq(userId != null,
AlertConfig::getUserId, userId));
+ this.lambdaQuery().eq(userId != null, AlertConfig::getUserId,
userId).getWrapper());
Page<AlertConfigParams> result = new Page<>();
if (CollectionUtils.isNotEmpty(resultPage.getRecords())) {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBackupServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBackupServiceImpl.java
index ae69e01a5..a2f035be9 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBackupServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBackupServiceImpl.java
@@ -70,7 +70,7 @@ public class FlinkApplicationBackupServiceImpl
public IPage<FlinkApplicationBackup> getPage(FlinkApplicationBackup
bakParam, RestRequest request) {
Page<FlinkApplicationBackup> page = MybatisPager.getPage(request);
return this.baseMapper.selectPage(page,
- this.lambdaQuery().eq(FlinkApplicationBackup::getAppId,
bakParam.getAppId()));
+ this.lambdaQuery().eq(FlinkApplicationBackup::getAppId,
bakParam.getAppId()).getWrapper());
}
@Override
@@ -133,9 +133,12 @@ public class FlinkApplicationBackupServiceImpl
public void revoke(FlinkApplication appParam) {
Page<FlinkApplicationBackup> page = new Page<>();
page.setCurrent(0).setSize(1).setSearchCount(false);
+
Page<FlinkApplicationBackup> backUpPages =
- baseMapper.selectPage(page,
this.lambdaQuery().eq(FlinkApplicationBackup::getAppId, appParam.getId())
- .orderByDesc(FlinkApplicationBackup::getCreateTime));
+ baseMapper.selectPage(page, this.lambdaQuery().eq(
+ FlinkApplicationBackup::getAppId,
+ appParam.getId())
+
.orderByDesc(FlinkApplicationBackup::getCreateTime).getWrapper());
if (!backUpPages.getRecords().isEmpty()) {
FlinkApplicationBackup backup = backUpPages.getRecords().get(0);
String path = backup.getPath();
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationConfigServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationConfigServiceImpl.java
index a1e53ad66..78f7c7f90 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationConfigServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationConfigServiceImpl.java
@@ -219,8 +219,10 @@ public class FlinkApplicationConfigServiceImpl
@Override
public List<FlinkApplicationConfig> list(Long appId) {
List<FlinkApplicationConfig> configList =
-
this.baseMapper.selectList(this.lambdaQuery().eq(FlinkApplicationConfig::getAppId,
appId)
- .orderByDesc(FlinkApplicationConfig::getVersion));
+ this.baseMapper.selectList(
+ this.lambdaQuery().eq(FlinkApplicationConfig::getAppId, appId)
+ .orderByDesc(FlinkApplicationConfig::getVersion)
+ .getWrapper());
fillEffectiveField(appId, configList);
return configList;
}
@@ -228,9 +230,8 @@ public class FlinkApplicationConfigServiceImpl
@Override
public synchronized String readTemplate() {
if (flinkConfTemplate == null) {
- try {
- Resource resource =
resourceLoader.getResource("classpath:flink-application.conf");
- Scanner scanner = new Scanner(resource.getInputStream());
+ Resource resource =
resourceLoader.getResource("classpath:flink-application.conf");
+ try (Scanner scanner = new Scanner(resource.getInputStream())) {
StringBuilder stringBuffer = new StringBuilder();
while (scanner.hasNextLine()) {
stringBuffer.append(scanner.nextLine()).append(System.lineSeparator());
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationInfoServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationInfoServiceImpl.java
index 966255189..d602eb7f4 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationInfoServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationInfoServiceImpl.java
@@ -426,7 +426,7 @@ public class FlinkApplicationInfoServiceImpl extends
ServiceImpl<FlinkApplicatio
return AppExistsStateEnum.INVALID;
}
- FlinkApplication application =
this.lambdaQuery().eq(FlinkApplication::getJobName, jobName).getEntity();
+ FlinkApplication application =
this.lambdaQuery().eq(FlinkApplication::getJobName, jobName).one();
if (application != null && !application.getId().equals(appParamId)) {
return AppExistsStateEnum.IN_DB;
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationManageServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationManageServiceImpl.java
index a76c12d0d..5452419b4 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationManageServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationManageServiceImpl.java
@@ -68,6 +68,7 @@ import org.apache.commons.lang3.StringUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import
com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.annotations.VisibleForTesting;
@@ -701,11 +702,17 @@ public class FlinkApplicationManageServiceImpl extends
ServiceImpl<FlinkApplicat
public boolean checkBuildAndUpdate(FlinkApplication appParam) {
boolean build = appParam.getBuild();
if (!build) {
- this.lambdaUpdate().eq(FlinkApplication::getId, appParam.getId())
- .set(appParam.isRunning(), FlinkApplication::getRelease,
ReleaseStateEnum.NEED_RESTART.get())
- .set(!appParam.isRunning(), FlinkApplication::getRelease,
ReleaseStateEnum.DONE.get())
- .set(!appParam.isRunning(), FlinkApplication::getOptionState,
OptionStateEnum.NONE.getValue())
- .update();
+ LambdaUpdateChainWrapper<FlinkApplication> update =
this.lambdaUpdate()
+ .eq(FlinkApplication::getId, appParam.getId());
+ if (appParam.isRunning()) {
+ update.set(FlinkApplication::getRelease,
ReleaseStateEnum.NEED_RESTART.get());
+ } else {
+ update
+ .set(FlinkApplication::getRelease,
ReleaseStateEnum.DONE.get())
+ .set(FlinkApplication::getOptionState,
OptionStateEnum.NONE.getValue());
+ }
+ this.update(update);
+
// backup
if (appParam.isFlinkSqlJob()) {
FlinkSql newFlinkSql =
flinkSqlService.getCandidate(appParam.getId(), CandidateTypeEnum.NEW);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationConfigServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationConfigServiceImpl.java
index 592d8ab2f..b6fef769a 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationConfigServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationConfigServiceImpl.java
@@ -190,9 +190,8 @@ public class SparkApplicationConfigServiceImpl
@Override
public void toEffective(Long appId, Long configId) {
- LambdaUpdateWrapper<SparkApplicationConfig> updateWrapper =
Wrappers.lambdaUpdate();
- updateWrapper.eq(SparkApplicationConfig::getAppId,
appId).set(SparkApplicationConfig::getLatest, false);
- this.update(updateWrapper);
+ this.lambdaUpdate().eq(SparkApplicationConfig::getAppId,
appId).set(SparkApplicationConfig::getLatest, false)
+ .update();
effectiveService.saveOrUpdate(appId, EffectiveTypeEnum.SPARKCONFIG,
configId);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEnvServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEnvServiceImpl.java
index a151c0ea2..e1fbaf7f0 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEnvServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEnvServiceImpl.java
@@ -138,7 +138,7 @@ public class FlinkEnvServiceImpl extends
ServiceImpl<FlinkEnvMapper, FlinkEnv>
@Override
public FlinkEnv getDefault() {
- return this.lambdaQuery().eq(FlinkEnv::getIsDefault, true).getEntity();
+ return this.lambdaQuery().eq(FlinkEnv::getIsDefault, true).one();
}
@Override
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java
index 3ab8348b4..dc02d0151 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java
@@ -82,7 +82,7 @@ public class FlinkSqlServiceImpl extends
ServiceImpl<FlinkSqlMapper, FlinkSql>
Page<FlinkSql> page = new Page<>();
page.setCurrent(0).setSize(1).setSearchCount(false);
Page<FlinkSql> flinkSqlPage = baseMapper.selectPage(page,
this.lambdaQuery().eq(FlinkSql::getAppId, appId)
- .orderByDesc(FlinkSql::getVersion));
+ .orderByDesc(FlinkSql::getVersion).getWrapper());
return Optional.ofNullable(flinkSqlPage.getRecords())
.filter(records -> !records.isEmpty())
.map(records -> records.get(0))
@@ -212,7 +212,8 @@ public class FlinkSqlServiceImpl extends
ServiceImpl<FlinkSqlMapper, FlinkSql>
public IPage<FlinkSql> getPage(Long appId, RestRequest request) {
request.setSortField("version");
Page<FlinkSql> page = MybatisPager.getPage(request);
- IPage<FlinkSql> sqlList = this.baseMapper.selectPage(page,
this.lambdaQuery().eq(FlinkSql::getAppId, appId));
+ IPage<FlinkSql> sqlList =
+ this.baseMapper.selectPage(page,
this.lambdaQuery().eq(FlinkSql::getAppId, appId).getWrapper());
FlinkSql effectiveSql = baseMapper.getEffective(appId);
if (effectiveSql != null) {
for (FlinkSql sql : sqlList.getRecords()) {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java
index 864f05430..4abcec7e1 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java
@@ -49,8 +49,12 @@ public class MessageServiceImpl extends
ServiceImpl<MessageMapper, Message>
@Override
public IPage<Message> getUnReadPage(NoticeTypeEnum noticeTypeEnum,
RestRequest request) {
Page<Message> page = MybatisPager.getPage(request);
- return this.baseMapper.selectPage(page,
this.lambdaQuery().eq(Message::getIsRead, false)
- .orderByDesc(Message::getCreateTime)
- .eq(Message::getType, noticeTypeEnum));
+ return this.baseMapper.selectPage(
+ page,
+ this.lambdaQuery()
+ .eq(Message::getIsRead, false)
+ .orderByDesc(Message::getCreateTime)
+ .eq(Message::getType, noticeTypeEnum)
+ .getWrapper());
}
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SettingServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SettingServiceImpl.java
index f40fdaaef..902772147 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SettingServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SettingServiceImpl.java
@@ -68,19 +68,16 @@ public class SettingServiceImpl extends
ServiceImpl<SettingMapper, Setting>
@Override
public Setting get(String key) {
- return this.lambdaQuery().eq(Setting::getSettingKey, key).getEntity();
+ return this.lambdaQuery().eq(Setting::getSettingKey, key).one();
}
@Override
public boolean update(Setting setting) {
try {
String value = StringUtils.trimToNull(setting.getSettingValue());
- setting.setSettingValue(value);
-
- Setting entity = new Setting();
- entity.setSettingValue(setting.getSettingValue());
-
- this.lambdaUpdate().set(Setting::getSettingKey,
setting.getSettingKey()).update(entity);
+ this.lambdaUpdate().eq(Setting::getSettingKey,
setting.getSettingKey())
+ .set(Setting::getSettingValue, value)
+ .update();
getMavenConfig().updateConfig();
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java
index 3e07a9d95..45c027ddc 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/MemberServiceImpl.java
@@ -100,8 +100,10 @@ public class MemberServiceImpl extends
ServiceImpl<MemberMapper, Member> impleme
private Member findByUserId(Long teamId, Long userId) {
ApiAlertException.throwIfNull(teamId, "The team id is required.");
- return this.lambdaQuery().eq(Member::getTeamId, teamId)
- .eq(Member::getUserId, userId).getEntity();
+ return this.lambdaQuery()
+ .eq(Member::getTeamId, teamId)
+ .eq(Member::getUserId, userId)
+ .one();
}
@Override
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 3c52bb04e..7f484f916 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
@@ -92,7 +92,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper,
User> implements Us
@Override
public User getByUsername(String username) {
- return this.lambdaQuery().eq(User::getUsername, username).getEntity();
+ return this.lambdaQuery().eq(User::getUsername, username).one();
}
@Override
