From 9208dcfa9e842ed18a00e0ecab45a0b4bb6a4238 Mon Sep 17 00:00:00 2001
From: "dengchao@xgtl" <2325690622@qq.com>
Date: Fri, 17 Apr 2020 17:36:22 +0800
Subject: [PATCH] Fix KbsTopicCommentRepositoryImpl's dependencies injection

---
 .../es/KbsTopicCommentRepositoryImpl.java           | 13 +++++++++++--
 .../cc/persistence/es/UKAggResultExtractor.java     |  2 --
 .../cc/persistence/es/UKAggTopResultExtractor.java  |  2 --
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/contact-center/app/src/main/java/com/chatopera/cc/persistence/es/KbsTopicCommentRepositoryImpl.java b/contact-center/app/src/main/java/com/chatopera/cc/persistence/es/KbsTopicCommentRepositoryImpl.java
index 978db0aa..026aea85 100644
--- a/contact-center/app/src/main/java/com/chatopera/cc/persistence/es/KbsTopicCommentRepositoryImpl.java
+++ b/contact-center/app/src/main/java/com/chatopera/cc/persistence/es/KbsTopicCommentRepositoryImpl.java
@@ -18,7 +18,6 @@ package com.chatopera.cc.persistence.es;
 
 import com.chatopera.cc.model.KbsTopicComment;
 import com.chatopera.cc.model.Topic;
-import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.elasticsearch.index.query.Operator;
 import org.elasticsearch.index.query.QueryStringQueryBuilder;
@@ -28,8 +27,12 @@ import org.elasticsearch.search.sort.SortOrder;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
+import org.springframework.data.elasticsearch.core.EntityMapper;
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
 import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
 import org.springframework.data.elasticsearch.core.query.SearchQuery;
+import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Component;
 
@@ -38,7 +41,6 @@ import java.util.List;
 import static org.elasticsearch.index.query.QueryBuilders.termQuery;
 
 @Component
-@RequiredArgsConstructor
 public class KbsTopicCommentRepositoryImpl implements KbsTopicCommentEsCommonRepository {
 
     @NonNull
@@ -50,6 +52,13 @@ public class KbsTopicCommentRepositoryImpl implements KbsTopicCommentEsCommonRep
     @NonNull
     private final UKAggTopResultExtractor ukAggTopResultExtractor;
 
+    public KbsTopicCommentRepositoryImpl(@NonNull UKResultMapper resultMapper, @NonNull ElasticsearchTemplate elasticsearchTemplate, @NonNull EntityMapper entityMapper, @NonNull MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext) {
+        this.resultMapper = resultMapper;
+        this.elasticsearchTemplate = elasticsearchTemplate;
+        ukAggTopResultExtractor = new UKAggTopResultExtractor(entityMapper, mappingContext);
+        ukAggResultExtractor = new UKAggResultExtractor(entityMapper, mappingContext);
+    }
+
     @Override
     public Page<KbsTopicComment> findByDataid(String id, int p, int ps) {
         Page<KbsTopicComment> pages = null;
diff --git a/contact-center/app/src/main/java/com/chatopera/cc/persistence/es/UKAggResultExtractor.java b/contact-center/app/src/main/java/com/chatopera/cc/persistence/es/UKAggResultExtractor.java
index 83922415..6d8bd86e 100644
--- a/contact-center/app/src/main/java/com/chatopera/cc/persistence/es/UKAggResultExtractor.java
+++ b/contact-center/app/src/main/java/com/chatopera/cc/persistence/es/UKAggResultExtractor.java
@@ -31,12 +31,10 @@ import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersiste
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.lang.Nullable;
-import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@Component
 public class UKAggResultExtractor extends UKResultMapper {
 
     @Nullable
diff --git a/contact-center/app/src/main/java/com/chatopera/cc/persistence/es/UKAggTopResultExtractor.java b/contact-center/app/src/main/java/com/chatopera/cc/persistence/es/UKAggTopResultExtractor.java
index 02ac8e03..1704fe9e 100644
--- a/contact-center/app/src/main/java/com/chatopera/cc/persistence/es/UKAggTopResultExtractor.java
+++ b/contact-center/app/src/main/java/com/chatopera/cc/persistence/es/UKAggTopResultExtractor.java
@@ -31,12 +31,10 @@ import org.springframework.data.elasticsearch.core.aggregation.impl.AggregatedPa
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
 import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@Component
 public class UKAggTopResultExtractor extends UKResultMapper {
 
     @Setter