From 5cb679d16170dee4744592c3c1a1781c2cd8c451 Mon Sep 17 00:00:00 2001 From: vran Date: Sun, 13 Mar 2022 09:35:45 +0800 Subject: [PATCH] fix: checkstyle --- .../domain/document/converter/DocumentResponseConverter.java | 1 - .../core/domain/document/service/DocumentService.java | 5 +++-- .../domain/remark/service/DocumentDiscussionService.java | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/databasir/core/domain/document/converter/DocumentResponseConverter.java b/core/src/main/java/com/databasir/core/domain/document/converter/DocumentResponseConverter.java index c9c2501..9d70386 100644 --- a/core/src/main/java/com/databasir/core/domain/document/converter/DocumentResponseConverter.java +++ b/core/src/main/java/com/databasir/core/domain/document/converter/DocumentResponseConverter.java @@ -47,7 +47,6 @@ public interface DocumentResponseConverter { .collect(Collectors.toList()); } - @Mapping(target = "columnNames", source = "columnNameArray") DatabaseDocumentResponse.TableDocumentResponse.IndexDocumentResponse of(TableIndexDocumentPojo indexDocument); diff --git a/core/src/main/java/com/databasir/core/domain/document/service/DocumentService.java b/core/src/main/java/com/databasir/core/domain/document/service/DocumentService.java index 4ee4190..544c689 100644 --- a/core/src/main/java/com/databasir/core/domain/document/service/DocumentService.java +++ b/core/src/main/java/com/databasir/core/domain/document/service/DocumentService.java @@ -233,9 +233,10 @@ public class DocumentService { var subIndexes = indexesGroupByTableMetaId.getOrDefault(tableId, Collections.emptyList()); var subTriggers = triggersGroupByTableMetaId.getOrDefault(tableId, Collections.emptyList()); var discussionCount = discussionCountMapByJoinName.get(table.getName()); - var columnResponseList = + var columnResponses = documentResponseConverter.of(subColumns, table.getName(), discussionCountMapByJoinName); - return documentResponseConverter.of(table, discussionCount, columnResponseList, subIndexes, subTriggers); + return documentResponseConverter.of(table, discussionCount, columnResponses, subIndexes, + subTriggers); }) .collect(Collectors.toList()); } diff --git a/core/src/main/java/com/databasir/core/domain/remark/service/DocumentDiscussionService.java b/core/src/main/java/com/databasir/core/domain/remark/service/DocumentDiscussionService.java index 08dfc79..49edae4 100644 --- a/core/src/main/java/com/databasir/core/domain/remark/service/DocumentDiscussionService.java +++ b/core/src/main/java/com/databasir/core/domain/remark/service/DocumentDiscussionService.java @@ -47,7 +47,8 @@ public class DocumentDiscussionService { Pageable pageable, DiscussionListCondition condition) { if (projectDao.exists(groupId, projectId)) { - Page data = documentDiscussionDao.selectByPage(pageable, condition.toCondition(projectId)); + Page data = + documentDiscussionDao.selectByPage(pageable, condition.toCondition(projectId)); Set userIdList = data.getContent() .stream() .map(DocumentDiscussionPojo::getUserId)