From 7f2e85b212e841bda91f2bbd98cd0c5f69a42ecf Mon Sep 17 00:00:00 2001 From: zzx <2651787250@qq.com> Date: Mon, 5 Feb 2024 18:01:49 +0800 Subject: [PATCH] change some resource file --- .../src/main/resources/application-dev.yml | 3 +++ ...TestGroupDao.java => TestGroupMapper.java} | 18 +++++++-------- ...berDao.java => testGroupMemberMapper.java} | 22 +++++++++---------- ...testTopicDao.java => testTopicMapper.java} | 22 +++++++++---------- 4 files changed, 34 insertions(+), 31 deletions(-) rename eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/group/{TestGroupDao.java => TestGroupMapper.java} (86%) rename eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/groupmember/{testGroupMemberDao.java => testGroupMemberMapper.java} (86%) rename eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/topic/{testTopicDao.java => testTopicMapper.java} (85%) diff --git a/eventmesh-dashboard-console/src/main/resources/application-dev.yml b/eventmesh-dashboard-console/src/main/resources/application-dev.yml index 00724de5..0ff18a15 100644 --- a/eventmesh-dashboard-console/src/main/resources/application-dev.yml +++ b/eventmesh-dashboard-console/src/main/resources/application-dev.yml @@ -44,6 +44,9 @@ spring: test-while-idle: true min-evictable-idle-time-millis: 300000 +mybatis: + type-aliases-package: org.apache.eventmesh.dashboard.console.entity + # cron job config, use cron expression cron: #health check job diff --git a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/group/TestGroupDao.java b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/group/TestGroupMapper.java similarity index 86% rename from eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/group/TestGroupDao.java rename to eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/group/TestGroupMapper.java index abc33d66..ca4bf9d5 100644 --- a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/group/TestGroupDao.java +++ b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/group/TestGroupMapper.java @@ -17,16 +17,16 @@ @RunWith(SpringRunner.class) @SpringBootTest(classes = EventMeshDashboardApplication.class) -public class TestGroupDao { +public class TestGroupMapper { @Autowired - private OprGroupMapper groupDao; + private OprGroupMapper groupMapper; public List insertGroupData(String name) { List groupEntities = new ArrayList<>(); for (int i = 0; i < 10; i++) { GroupEntity groupEntity = new GroupEntity(null, (long) i, name, 0, null, 1, "OK", null, null); - groupDao.addGroup(groupEntity); + groupMapper.addGroup(groupEntity); groupEntities.add(groupEntity); } return groupEntities; @@ -35,7 +35,7 @@ public List insertGroupData(String name) { public List getRemovedTimeList(String name) { GroupEntity groupEntity = new GroupEntity(); groupEntity.setName(name); - List groupEntities = groupDao.selectGroupByDynamic(groupEntity); + List groupEntities = groupMapper.selectGroupByDynamic(groupEntity); for (GroupEntity groupEntity1 : groupEntities) { groupEntity1.setCreateTime(null); groupEntity1.setUpdateTime(null); @@ -48,7 +48,7 @@ public void test_addGroup() { List groupEntities = this.insertGroupData("addGroup"); GroupEntity groupEntity = new GroupEntity(); groupEntity.setName("addGroup"); - List groupEntities1 = groupDao.selectGroupByDynamic(groupEntity); + List groupEntities1 = groupMapper.selectGroupByDynamic(groupEntity); Assert.assertEquals(groupEntities, this.getRemovedTimeList("addGroup")); } @@ -60,7 +60,7 @@ public void test_updateGroupById() { groupEntity.setMembers("1,"); groupEntity.setState("fail"); groupEntity.setMemberCount(1); - groupDao.updateGroup(groupEntity); + groupMapper.updateGroup(groupEntity); Assert.assertEquals(groupEntities, this.getRemovedTimeList("updateById2")); } @@ -68,7 +68,7 @@ public void test_updateGroupById() { public void test_deleteGroupById() { List groupEntities = this.insertGroupData("deleteById"); GroupEntity groupEntity = groupEntities.get(9); - groupDao.deleteGroup(groupEntity); + groupMapper.deleteGroup(groupEntity); groupEntities.remove(9); Assert.assertEquals(groupEntities, this.getRemovedTimeList("deleteById")); } @@ -76,7 +76,7 @@ public void test_deleteGroupById() { @Test public void test_selectGroupById() { List groupEntities = this.insertGroupData("selectById"); - GroupEntity groupEntity = groupDao.selectGroupById(groupEntities.get(0)); + GroupEntity groupEntity = groupMapper.selectGroupById(groupEntities.get(0)); groupEntity.setCreateTime(null); groupEntity.setUpdateTime(null); Assert.assertEquals(groupEntities.get(0), groupEntity); @@ -88,7 +88,7 @@ public void test_selectGroupByClusterId() { GroupEntity groupEntity1 = new GroupEntity(); groupEntity1.setClusterId(groupEntities.get(0).getClusterId()); groupEntity1.setName(groupEntities.get(0).getName()); - GroupEntity groupEntity = groupDao.selectGroupByUnique(groupEntity1); + GroupEntity groupEntity = groupMapper.selectGroupByUnique(groupEntity1); groupEntity.setCreateTime(null); groupEntity.setUpdateTime(null); Assert.assertEquals(groupEntities.get(0), groupEntity); diff --git a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/groupmember/testGroupMemberDao.java b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/groupmember/testGroupMemberMapper.java similarity index 86% rename from eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/groupmember/testGroupMemberDao.java rename to eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/groupmember/testGroupMemberMapper.java index f5d3451e..2a02f997 100644 --- a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/groupmember/testGroupMemberDao.java +++ b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/groupmember/testGroupMemberMapper.java @@ -16,16 +16,16 @@ @RunWith(SpringRunner.class) @SpringBootTest(classes = EventMeshDashboardApplication.class) -public class testGroupMemberDao { +public class testGroupMemberMapper { @Autowired - OprGroupMemberMapper groupMemberDao; + OprGroupMemberMapper groupMemberMapper; public List insertGroupData(String topicName, String groupName) { List groupMemberEntities = new ArrayList<>(); for (int i = 0; i < 10; i++) { GroupMemberEntity groupMemberEntity = new GroupMemberEntity(null, (long) i, topicName, groupName, "admin", "active", null, null); - groupMemberDao.addGroupMember(groupMemberEntity); + groupMemberMapper.addGroupMember(groupMemberEntity); groupMemberEntities.add(groupMemberEntity); } return groupMemberEntities; @@ -35,7 +35,7 @@ public List getRemovedTimeList(String topicName, String group GroupMemberEntity groupMemberEntity = new GroupMemberEntity(); groupMemberEntity.setTopicName(topicName); groupMemberEntity.setGroupName(groupName); - List groupEntities = groupMemberDao.selectAllMemberByDynamic(groupMemberEntity); + List groupEntities = groupMemberMapper.selectAllMemberByDynamic(groupMemberEntity); for (GroupMemberEntity groupEntity1 : groupEntities) { groupEntity1.setCreateTime(null); groupEntity1.setUpdateTime(null); @@ -54,7 +54,7 @@ public void test_getGroupMemberByClusterId() { List add1 = this.insertGroupData("getByCluster", "groupMember"); GroupMemberEntity groupMemberEntity = new GroupMemberEntity(); groupMemberEntity.setClusterId(add1.get(1).getClusterId()); - List groupByClusterId = groupMemberDao.getGroupByClusterId(groupMemberEntity); + List groupByClusterId = groupMemberMapper.getGroupByClusterId(groupMemberEntity); GroupMemberEntity groupMemberEntity1 = groupByClusterId.get(0); groupMemberEntity1.setCreateTime(null); groupMemberEntity1.setUpdateTime(null); @@ -67,7 +67,7 @@ public void test_deleteGroupMemberById() { List add1 = this.insertGroupData("getById", "groupMember"); GroupMemberEntity groupMemberEntity = new GroupMemberEntity(); groupMemberEntity.setId(add1.get(2).getId()); - GroupMemberEntity groupMemberEntity1 = groupMemberDao.selectGroupMemberById(groupMemberEntity); + GroupMemberEntity groupMemberEntity1 = groupMemberMapper.selectGroupMemberById(groupMemberEntity); groupMemberEntity1.setUpdateTime(null); groupMemberEntity1.setCreateTime(null); Assert.assertEquals(groupMemberEntity1, add1.get(2)); @@ -80,8 +80,8 @@ public void test_updateGroupMemberById() { add1.get(1).setState("fail1"); groupMemberEntity.setState("fail1"); groupMemberEntity.setId(add1.get(1).getId()); - groupMemberDao.updateGroupMember(groupMemberEntity); - GroupMemberEntity groupMemberEntity1 = groupMemberDao.selectGroupMemberById(add1.get(1)); + groupMemberMapper.updateGroupMember(groupMemberEntity); + GroupMemberEntity groupMemberEntity1 = groupMemberMapper.selectGroupMemberById(add1.get(1)); groupMemberEntity1.setUpdateTime(null); groupMemberEntity1.setCreateTime(null); Assert.assertEquals(groupMemberEntity1, add1.get(1)); @@ -94,7 +94,7 @@ public void test_selectGroupMemberByUnique() { groupMemberEntity.setClusterId(groupMemberEntities.get(1).getClusterId()); groupMemberEntity.setTopicName(groupMemberEntities.get(1).getTopicName()); groupMemberEntity.setGroupName(groupMemberEntities.get(1).getGroupName()); - GroupMemberEntity groupMemberEntity1 = groupMemberDao.selectGroupMemberByUnique(groupMemberEntity); + GroupMemberEntity groupMemberEntity1 = groupMemberMapper.selectGroupMemberByUnique(groupMemberEntity); groupMemberEntity1.setUpdateTime(null); groupMemberEntity1.setCreateTime(null); Assert.assertEquals(groupMemberEntity1, groupMemberEntities.get(1)); @@ -123,7 +123,7 @@ public void test_updateGroupMemberByTopic() { GroupMemberEntity groupMemberEntity = new GroupMemberEntity(); groupMemberEntity.setState("fail2"); groupMemberEntity.setTopicName("updateByTopic1"); - groupMemberDao.updateMemberByTopic(groupMemberEntity); + groupMemberMapper.updateMemberByTopic(groupMemberEntity); Assert.assertEquals(this.getRemovedTimeList("updateByTopic1", null), groupMemberEntities); } @@ -132,7 +132,7 @@ public void test_selectGroupMemberById() { List groupMemberEntities = this.insertGroupData("updateById1", "groupMember2"); GroupMemberEntity groupMemberEntity = new GroupMemberEntity(); groupMemberEntity.setId(groupMemberEntities.get(5).getId()); - GroupMemberEntity groupMemberEntity1 = groupMemberDao.selectGroupMemberById(groupMemberEntity); + GroupMemberEntity groupMemberEntity1 = groupMemberMapper.selectGroupMemberById(groupMemberEntity); groupMemberEntity1.setCreateTime(null); groupMemberEntity1.setUpdateTime(null); Assert.assertEquals(groupMemberEntity1, groupMemberEntities.get(5)); diff --git a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/topic/testTopicDao.java b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/topic/testTopicMapper.java similarity index 85% rename from eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/topic/testTopicDao.java rename to eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/topic/testTopicMapper.java index 6b1c962a..1fdc01e8 100644 --- a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/topic/testTopicDao.java +++ b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/topic/testTopicMapper.java @@ -16,16 +16,16 @@ @RunWith(SpringRunner.class) @SpringBootTest(classes = EventMeshDashboardApplication.class) -public class testTopicDao { +public class testTopicMapper { @Autowired - private TopicMapper topicDao; + private TopicMapper topicMapper; public List insertGroupData(String topicName) { List topicEntities = new ArrayList<>(); for (int i = 0; i < 10; i++) { TopicEntity topicEntity = new TopicEntity(null, (long) i, topicName, "10", "10", 100L, 1, "testTopic", null, null); - topicDao.addTopic(topicEntity); + topicMapper.addTopic(topicEntity); topicEntities.add(topicEntity); } return topicEntities; @@ -35,7 +35,7 @@ public List getRemovedTimeList(String topicName, Long clusterId) { TopicEntity topicEntity = new TopicEntity(); topicEntity.setTopicName(topicName); topicEntity.setClusterId(clusterId); - List topicEntities = topicDao.getTopicListByDynamic(topicEntity); + List topicEntities = topicMapper.getTopicListByDynamic(topicEntity); for (TopicEntity topic : topicEntities) { topic.setCreateTime(null); topic.setUpdateTime(null); @@ -48,7 +48,7 @@ public void test_selectTopicByClusterId() { List topicEntities = this.insertGroupData("SelectById111"); TopicEntity topicEntity = new TopicEntity(); topicEntity.setClusterId(topicEntities.get(9).getClusterId()); - List topicEntity1 = topicDao.getTopicListByDynamic(topicEntity); + List topicEntity1 = topicMapper.getTopicListByDynamic(topicEntity); topicEntity1.get(0).setCreateTime(null); topicEntity1.get(0).setUpdateTime(null); Assert.assertEquals(topicEntity1.get(0), topicEntities.get(9)); @@ -71,8 +71,8 @@ public void test_UpdateTopic() { topicEntity.setDescription("updateTest1"); topicEntity.setType(-1); topicEntity.setId(topicEntities.get(5).getId()); - topicDao.updateTopic(topicEntity); - TopicEntity topicEntity1 = topicDao.selectTopicById(topicEntity); + topicMapper.updateTopic(topicEntity); + TopicEntity topicEntity1 = topicMapper.selectTopicById(topicEntity); topicEntity1.setUpdateTime(null); topicEntity1.setCreateTime(null); Assert.assertEquals(topicEntity1, topicEntities.get(5)); @@ -85,8 +85,8 @@ public void test_DeleteTopic() { topicEntity.setId(topicEntities.get(5).getId()); topicEntity.setClusterId(topicEntities.get(5).getClusterId()); topicEntity.setTopicName("update72"); - topicDao.deleteTopic(topicEntity); - List topicEntity1 = topicDao.getTopicListByDynamic(topicEntity); + topicMapper.deleteTopic(topicEntity); + List topicEntity1 = topicMapper.getTopicListByDynamic(topicEntity); Assert.assertEquals(true, topicEntity1.isEmpty()); } @@ -96,7 +96,7 @@ public void test_selectTopicByUnique() { TopicEntity topicEntity = new TopicEntity(); topicEntity.setTopicName("unique11"); topicEntity.setClusterId(topicEntities.get(1).getClusterId()); - TopicEntity topicEntity1 = topicDao.selectTopicByUnique(topicEntity); + TopicEntity topicEntity1 = topicMapper.selectTopicByUnique(topicEntity); topicEntity1.setUpdateTime(null); topicEntity1.setCreateTime(null); Assert.assertEquals(topicEntity1, topicEntities.get(1)); @@ -107,7 +107,7 @@ public void test_selectTopicById() { List topicEntities = this.insertGroupData("id1"); TopicEntity topicEntity = new TopicEntity(); topicEntity.setId(topicEntities.get(2).getId()); - TopicEntity topicEntity1 = topicDao.selectTopicById(topicEntity); + TopicEntity topicEntity1 = topicMapper.selectTopicById(topicEntity); topicEntity1.setCreateTime(null); topicEntity1.setUpdateTime(null); Assert.assertEquals(topicEntity1, topicEntities.get(2));