From 1eebb5d031c338ad5610551e7e5280c5a3e38a30 Mon Sep 17 00:00:00 2001 From: liaozan <378024053@qq.com> Date: Thu, 4 Jan 2024 15:05:50 +0800 Subject: [PATCH] Refine struct --- .../starrocks/operation/StarrocksService.java | 9 ++++----- .../starrocks/operation/StarrocksServiceImpl.java | 6 +++--- .../operation/StarrocksStreamLoadHandler.java | 11 +++++------ .../starrocks/{helper => util}/ConvertUtils.java | 2 +- 4 files changed, 13 insertions(+), 15 deletions(-) rename starters/starrocks-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/starrocks/{helper => util}/ConvertUtils.java (96%) diff --git a/starters/starrocks-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/starrocks/operation/StarrocksService.java b/starters/starrocks-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/starrocks/operation/StarrocksService.java index 959b17d..98806a7 100644 --- a/starters/starrocks-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/starrocks/operation/StarrocksService.java +++ b/starters/starrocks-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/starrocks/operation/StarrocksService.java @@ -1,7 +1,6 @@ package com.schbrain.framework.autoconfigure.starrocks.operation; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @author liaozan @@ -17,7 +16,7 @@ public interface StarrocksService { /** * 批量保存/更新 */ - void upsertBatch(List entityList); + void upsertBatch(Collection entityList); /** * 单个保存/更新,传入 columns 只会处理相应的 columns @@ -27,7 +26,7 @@ public interface StarrocksService { /** * 批量保存/更新,传入 columns 只会处理相应的 columns */ - void upsertBatch(List entityList, List columns); + void upsertBatch(Collection entityList, List columns); /** * 删除 @@ -37,7 +36,7 @@ public interface StarrocksService { /** * 批量删除 */ - void deleteBatch(List entityList); + void deleteBatch(Collection entityList); /** * 根据 sql 查询 diff --git a/starters/starrocks-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/starrocks/operation/StarrocksServiceImpl.java b/starters/starrocks-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/starrocks/operation/StarrocksServiceImpl.java index b84bd07..e9658c0 100644 --- a/starters/starrocks-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/starrocks/operation/StarrocksServiceImpl.java +++ b/starters/starrocks-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/starrocks/operation/StarrocksServiceImpl.java @@ -44,7 +44,7 @@ public class StarrocksServiceImpl implements StarrocksService, Initializin } @Override - public void upsertBatch(List entityList) { + public void upsertBatch(Collection entityList) { upsertBatch(entityList, Collections.emptyList()); } @@ -54,7 +54,7 @@ public class StarrocksServiceImpl implements StarrocksService, Initializin } @Override - public void upsertBatch(List entityList, List columns) { + public void upsertBatch(Collection entityList, List columns) { handler.upsertBatch(ValidateUtils.notEmpty(entityList, "entityList不能为空"), columns); } @@ -64,7 +64,7 @@ public class StarrocksServiceImpl implements StarrocksService, Initializin } @Override - public void deleteBatch(List entityList) { + public void deleteBatch(Collection entityList) { handler.deleteBatch(ValidateUtils.notNull(entityList, "entityList不能为空")); } diff --git a/starters/starrocks-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/starrocks/operation/StarrocksStreamLoadHandler.java b/starters/starrocks-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/starrocks/operation/StarrocksStreamLoadHandler.java index 6a92557..f3d8e2c 100644 --- a/starters/starrocks-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/starrocks/operation/StarrocksStreamLoadHandler.java +++ b/starters/starrocks-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/starrocks/operation/StarrocksStreamLoadHandler.java @@ -7,8 +7,7 @@ import com.schbrain.common.util.JacksonUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; -import java.util.List; -import java.util.Optional; +import java.util.*; /** * @author liaozan @@ -27,8 +26,8 @@ public class StarrocksStreamLoadHandler { this.password = password; } - public void upsertBatch(List entityList, List columns) { - log.info("Starrocks upsert, dataSize: {}, sample data: {}", entityList.size(), entityList.get(0)); + public void upsertBatch(Collection entityList, List columns) { + log.info("Starrocks upsert, dataSize: {}, sample data: {}", entityList.size(), entityList.iterator().next()); String content = JacksonUtils.toJsonString(entityList); String upsertResult = createUpsertRequest(content, columns).execute().body(); @@ -40,8 +39,8 @@ public class StarrocksStreamLoadHandler { checkResponse(upsertResult); } - public void deleteBatch(List entityList) { - log.info("Starrocks delete, dataSize: {}, sample data: {}", entityList.size(), entityList.get(0)); + public void deleteBatch(Collection entityList) { + log.info("Starrocks delete, dataSize: {}, sample data: {}", entityList.size(), entityList.iterator().next()); String content = JacksonUtils.toJsonString(entityList); String deleteResult = createCommonRequest(content).header("columns", "__op='delete'").execute().body(); diff --git a/starters/starrocks-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/starrocks/helper/ConvertUtils.java b/starters/starrocks-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/starrocks/util/ConvertUtils.java similarity index 96% rename from starters/starrocks-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/starrocks/helper/ConvertUtils.java rename to starters/starrocks-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/starrocks/util/ConvertUtils.java index 6755b88..a0bbfcb 100644 --- a/starters/starrocks-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/starrocks/helper/ConvertUtils.java +++ b/starters/starrocks-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/starrocks/util/ConvertUtils.java @@ -1,4 +1,4 @@ -package com.schbrain.framework.autoconfigure.starrocks.helper; +package com.schbrain.framework.autoconfigure.starrocks.util; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.PropertyNamingStrategies; -- GitLab