This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 079bd2d2c code polish. (#3353)
079bd2d2c is described below
commit 079bd2d2ce501251bafdd9944db7798f89137f10
Author: Kevin Clair <[email protected]>
AuthorDate: Thu Apr 28 23:48:12 2022 +0800
code polish. (#3353)
---
.../shenyu/admin/mapper/PluginHandleMapper.java | 7 +++---
.../shenyu/admin/mapper/ShenyuDictMapper.java | 7 +++---
.../admin/service/impl/PermissionServiceImpl.java | 4 +--
.../service/impl/PluginHandleServiceImpl.java | 29 ++++++++--------------
.../resources/mappers/plugin-handle-sqlmap.xml | 4 +--
.../main/resources/mappers/shenyu-dict-sqlmap.xml | 2 +-
.../admin/mapper/PluginHandleMapperTest.java | 7 +++---
.../shenyu/admin/mapper/ShenyuDictMapperTest.java | 7 +++---
.../admin/service/PluginHandleServiceTest.java | 7 ++----
9 files changed, 28 insertions(+), 46 deletions(-)
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/PluginHandleMapper.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/PluginHandleMapper.java
index cf418b9d9..37a34b56f 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/PluginHandleMapper.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/PluginHandleMapper.java
@@ -25,7 +25,6 @@ import org.apache.shenyu.admin.validation.ExistProvider;
import java.io.Serializable;
import java.util.List;
-import java.util.Set;
/**
* The interface Plugin handle mapper.
@@ -115,12 +114,12 @@ public interface PluginHandleMapper extends ExistProvider
{
int delete(String id);
/**
- * bach delete by idSet.
+ * bach delete by idList.
*
- * @param idSet a set of ids
+ * @param idList a list of ids
* @return the count of deleted
*/
- int deleteByIdSet(@Param("idSet") Set<String> idSet);
+ int deleteByIdList(@Param("idList") List<String> idList);
/**
* delete string id.
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/ShenyuDictMapper.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/ShenyuDictMapper.java
index bccee6f31..ee69a6fb0 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/ShenyuDictMapper.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/ShenyuDictMapper.java
@@ -25,7 +25,6 @@ import org.apache.shenyu.admin.validation.ExistProvider;
import java.io.Serializable;
import java.util.List;
-import java.util.Set;
/**
* The shenyu dict mapper.
@@ -68,12 +67,12 @@ public interface ShenyuDictMapper extends ExistProvider {
List<ShenyuDictDO> findByType(@Param("type") String type);
/**
- * find shenyu dict do list by a set of types.
+ * find shenyu dict do list by a list of types.
*
- * @param typeSet a set of types
+ * @param typeList a list of types
* @return the list
*/
- List<ShenyuDictDO> findByTypeBatch(@Param("typeSet") Set<String> typeSet);
+ List<ShenyuDictDO> findByTypeBatch(@Param("typeList") List<String>
typeList);
/**
* insert shenyu dict.
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/PermissionServiceImpl.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/PermissionServiceImpl.java
index c5567573c..c58cd0c2e 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/PermissionServiceImpl.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/PermissionServiceImpl.java
@@ -36,11 +36,9 @@ import org.apache.shenyu.admin.utils.JwtUtils;
import org.apache.shenyu.common.constant.ResourceTypeConstants;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
-import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
@@ -130,7 +128,7 @@ public class PermissionServiceImpl implements
PermissionService {
return Collections.emptyList();
}
- return
Optional.ofNullable(resourceMapper.selectByIdsBatch(resourceIds)).orElseGet(ArrayList::new)
+ return resourceMapper.selectByIdsBatch(resourceIds)
.stream().map(ResourceVO::buildResourceVO).collect(Collectors.toList());
}
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/PluginHandleServiceImpl.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/PluginHandleServiceImpl.java
index c66dc1325..5b2db72a6 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/PluginHandleServiceImpl.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/PluginHandleServiceImpl.java
@@ -33,15 +33,12 @@ import org.apache.shenyu.admin.model.vo.PluginHandleVO;
import org.apache.shenyu.admin.model.vo.ShenyuDictVO;
import org.apache.shenyu.admin.service.PluginHandleService;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
-import java.util.Set;
import java.util.stream.Collectors;
/**
@@ -65,8 +62,7 @@ public class PluginHandleServiceImpl implements
PluginHandleService {
@Pageable
public CommonPager<PluginHandleVO> listByPage(final PluginHandleQuery
pluginHandleQuery) {
- List<PluginHandleDO> pluginHandleDOList =
Optional.ofNullable(pluginHandleMapper.selectByQuery(pluginHandleQuery))
- .orElseGet(ArrayList::new);
+ List<PluginHandleDO> pluginHandleDOList =
pluginHandleMapper.selectByQuery(pluginHandleQuery);
return PageResultUtils.result(pluginHandleQuery.getPageParameter(),
() -> this.buildPluginHandleVO(pluginHandleDOList));
@@ -85,15 +81,12 @@ public class PluginHandleServiceImpl implements
PluginHandleService {
}
@Override
- @Transactional(rollbackFor = Exception.class)
public Integer deletePluginHandles(final List<String> ids) {
-
- int ret = 0;
- Set<String> idSet = new
HashSet<>(Optional.ofNullable(ids).orElseGet(ArrayList::new));
- if (CollectionUtils.isNotEmpty(idSet)) {
- ret = pluginHandleMapper.deleteByIdSet(idSet);
+ List<String> distinctIds =
ids.stream().distinct().collect(Collectors.toList());
+ if (CollectionUtils.isNotEmpty(distinctIds)) {
+ return pluginHandleMapper.deleteByIdList(distinctIds);
}
- return ret;
+ return 0;
}
@Override
@@ -108,9 +101,7 @@ public class PluginHandleServiceImpl implements
PluginHandleService {
.type(type)
.build();
- List<PluginHandleDO> pluginHandleDOList =
Optional.ofNullable(pluginHandleMapper.selectByQuery(pluginHandleQuery))
- .orElseGet(ArrayList::new);
-
+ List<PluginHandleDO> pluginHandleDOList =
pluginHandleMapper.selectByQuery(pluginHandleQuery);
return buildPluginHandleVO(pluginHandleDOList);
}
@@ -128,13 +119,13 @@ public class PluginHandleServiceImpl implements
PluginHandleService {
private List<PluginHandleVO> buildPluginHandleVO(final
List<PluginHandleDO> pluginHandleDOList) {
- Set<String> fieldSet = pluginHandleDOList.stream()
+ List<String> fieldList = pluginHandleDOList.stream()
.filter(pluginHandleDO -> pluginHandleDO.getDataType() ==
SELECT_BOX_DATA_TYPE)
- .map(PluginHandleDO::getField).collect(Collectors.toSet());
+
.map(PluginHandleDO::getField).distinct().collect(Collectors.toList());
Map<String, List<ShenyuDictVO>> shenyuDictDOMap = new HashMap<>();
- if (CollectionUtils.isNotEmpty(fieldSet)) {
- List<ShenyuDictDO> shenyuDictDOList =
shenyuDictMapper.findByTypeBatch(fieldSet);
+ if (CollectionUtils.isNotEmpty(fieldList)) {
+ List<ShenyuDictDO> shenyuDictDOList =
shenyuDictMapper.findByTypeBatch(fieldList);
shenyuDictDOMap.putAll(Optional.ofNullable(shenyuDictDOList).orElseGet(ArrayList::new)
.stream().map(ShenyuDictVO::buildShenyuDictVO)
.collect(Collectors.toMap(ShenyuDictVO::getType,
Lists::newArrayList,
diff --git a/shenyu-admin/src/main/resources/mappers/plugin-handle-sqlmap.xml
b/shenyu-admin/src/main/resources/mappers/plugin-handle-sqlmap.xml
index 24c386475..a0e0da0e9 100644
--- a/shenyu-admin/src/main/resources/mappers/plugin-handle-sqlmap.xml
+++ b/shenyu-admin/src/main/resources/mappers/plugin-handle-sqlmap.xml
@@ -63,10 +63,10 @@
WHERE id = #{id, jdbcType=VARCHAR}
</delete>
- <delete id="deleteByIdSet">
+ <delete id="deleteByIdList">
DELETE FROM plugin_handle
WHERE id IN
- <foreach collection="idSet" item="id" open="("
separator="," close=")">
+ <foreach collection="idList" item="id" open="("
separator="," close=")">
#{id, jdbcType=VARCHAR}
</foreach>
</delete>
diff --git a/shenyu-admin/src/main/resources/mappers/shenyu-dict-sqlmap.xml
b/shenyu-admin/src/main/resources/mappers/shenyu-dict-sqlmap.xml
index 7773f6cee..7fa7f0438 100644
--- a/shenyu-admin/src/main/resources/mappers/shenyu-dict-sqlmap.xml
+++ b/shenyu-admin/src/main/resources/mappers/shenyu-dict-sqlmap.xml
@@ -71,7 +71,7 @@
<include refid="Base_Column_List"/>
FROM shenyu_dict
WHERE `type` IN
- <foreach collection="typeSet" item="type" open="(" separator=","
close=")">
+ <foreach collection="typeList" item="type" open="(" separator=","
close=")">
#{type, jdbcType=VARCHAR}
</foreach>
</select>
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/PluginHandleMapperTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/PluginHandleMapperTest.java
index 23622f7d5..7dad83e6a 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/PluginHandleMapperTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/PluginHandleMapperTest.java
@@ -26,7 +26,6 @@ import org.junit.jupiter.api.Test;
import javax.annotation.Resource;
import java.sql.Timestamp;
import java.util.List;
-import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -196,9 +195,9 @@ public final class PluginHandleMapperTest extends
AbstractSpringIntegrationTest
int insert = pluginHandleMapper.insert(pluginHandleDO);
assertThat(insert, equalTo(1));
- Set<String> idSetStrings = Stream.of(pluginHandleDO1.getId(),
pluginHandleDO.getId()).collect(Collectors.toSet());
- int count = pluginHandleMapper.deleteByIdSet(idSetStrings);
- assertThat(idSetStrings.size(), equalTo(count));
+ List<String> idListStrings = Stream.of(pluginHandleDO1.getId(),
pluginHandleDO.getId()).collect(Collectors.toList());
+ int count = pluginHandleMapper.deleteByIdList(idListStrings);
+ assertThat(idListStrings.size(), equalTo(count));
PluginHandleDO resultPluginHandleDO1 =
pluginHandleMapper.selectById(pluginHandleDO1.getId());
assertThat(resultPluginHandleDO1, equalTo(null));
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/ShenyuDictMapperTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/ShenyuDictMapperTest.java
index 97fec7f81..bddd31ed0 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/ShenyuDictMapperTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/ShenyuDictMapperTest.java
@@ -27,14 +27,13 @@ import org.junit.jupiter.api.Test;
import javax.annotation.Resource;
import java.sql.Timestamp;
import java.util.List;
-import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.hasItems;
-import static org.hamcrest.MatcherAssert.assertThat;
/**
* Test cases for ShenyuDictMapper.
@@ -113,8 +112,8 @@ public final class ShenyuDictMapperTest extends
AbstractSpringIntegrationTest {
int count = shenyuDictMapper.insert(record);
assertThat(count, equalTo(1));
- final Set<String> fieldSet = Stream.of(record1.getType(),
record.getType()).collect(Collectors.toSet());
- List<ShenyuDictDO> shenyuDictDOList =
shenyuDictMapper.findByTypeBatch(fieldSet);
+ final List<String> fieldString = Stream.of(record1.getType(),
record.getType()).distinct().collect(Collectors.toList());
+ List<ShenyuDictDO> shenyuDictDOList =
shenyuDictMapper.findByTypeBatch(fieldString);
assertThat(shenyuDictDOList, hasItems(record1, record));
}
}
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/PluginHandleServiceTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/PluginHandleServiceTest.java
index e3cd74245..f904e3947 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/PluginHandleServiceTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/PluginHandleServiceTest.java
@@ -40,9 +40,7 @@ import org.mockito.quality.Strictness;
import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.util.Collections;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
@@ -147,10 +145,9 @@ public final class PluginHandleServiceTest {
@Test
public void testDeletePluginHandles() {
final List<String> ids = Lists.list("1", "2", "3");
- final Set<String> idSet = new HashSet<>(ids);
- given(this.pluginHandleMapper.deleteByIdSet(idSet)).willReturn(3);
+ given(this.pluginHandleMapper.deleteByIdList(ids)).willReturn(3);
final Integer result =
this.pluginHandleService.deletePluginHandles(ids);
- assertThat(result, equalTo(idSet.size()));
+ assertThat(result, equalTo(ids.size()));
}
@Test
