From adf580d24cc41835b1f27098bead3900ab5687dd Mon Sep 17 00:00:00 2001 From: koosco Date: Mon, 10 Jun 2024 12:05:43 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20elasticsearch=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/ElasticsearchConfig.java | 41 ++++--------------- 1 file changed, 8 insertions(+), 33 deletions(-) diff --git a/src/main/java/kcs/funding/fundingboost/elasticsearch/config/ElasticsearchConfig.java b/src/main/java/kcs/funding/fundingboost/elasticsearch/config/ElasticsearchConfig.java index 2d7d3520..66f84305 100644 --- a/src/main/java/kcs/funding/fundingboost/elasticsearch/config/ElasticsearchConfig.java +++ b/src/main/java/kcs/funding/fundingboost/elasticsearch/config/ElasticsearchConfig.java @@ -1,40 +1,15 @@ package kcs.funding.fundingboost.elasticsearch.config; -import co.elastic.clients.elasticsearch.ElasticsearchClient; -import co.elastic.clients.json.jackson.JacksonJsonpMapper; -import co.elastic.clients.transport.ElasticsearchTransport; -import co.elastic.clients.transport.rest_client.RestClientTransport; -import org.apache.http.HttpHost; -import org.elasticsearch.client.RestClient; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories; +import org.springframework.data.elasticsearch.client.ClientConfiguration; +import org.springframework.data.elasticsearch.client.elc.ElasticsearchConfiguration; @Configuration -@EnableElasticsearchRepositories -public class ElasticsearchConfig { - - @Value("${spring.data.elasticsearch.host}") - private String host; - - @Value("${spring.data.elasticsearch.port}") - private int port; - - @Bean - public RestClient restClient() { - return RestClient - .builder(new HttpHost(host, port, "http")) +public class ElasticsearchConfig extends ElasticsearchConfiguration { + @Override + public ClientConfiguration clientConfiguration() { + return ClientConfiguration.builder() + .connectedTo("localhost:9200") .build(); } - - @Bean - public ElasticsearchTransport elasticsearchTransport(RestClient restClient) { - return new RestClientTransport(restClient, new JacksonJsonpMapper()); - } - - @Bean - public ElasticsearchClient elasticsearchClient(ElasticsearchTransport transport) { - return new ElasticsearchClient(transport); - } -} +} \ No newline at end of file From 10b0a8e6fdbba1fff6a6722a8b4ac254ff1a3394 Mon Sep 17 00:00:00 2001 From: koosco Date: Mon, 10 Jun 2024 12:10:53 +0900 Subject: [PATCH 2/2] =?UTF-8?q?docs:=20elasticsearch=20config=EC=97=90?= =?UTF-8?q?=EC=84=9C=20host,=20port=20=EB=8F=99=EC=A0=81=EC=9C=BC=EB=A1=9C?= =?UTF-8?q?=20=EB=B0=9B=EC=9D=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elasticsearch/config/ElasticsearchConfig.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/kcs/funding/fundingboost/elasticsearch/config/ElasticsearchConfig.java b/src/main/java/kcs/funding/fundingboost/elasticsearch/config/ElasticsearchConfig.java index 66f84305..814701c9 100644 --- a/src/main/java/kcs/funding/fundingboost/elasticsearch/config/ElasticsearchConfig.java +++ b/src/main/java/kcs/funding/fundingboost/elasticsearch/config/ElasticsearchConfig.java @@ -1,15 +1,23 @@ package kcs.funding.fundingboost.elasticsearch.config; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.data.elasticsearch.client.ClientConfiguration; import org.springframework.data.elasticsearch.client.elc.ElasticsearchConfiguration; @Configuration public class ElasticsearchConfig extends ElasticsearchConfiguration { + + @Value("${spring.data.elasticsearch.host}") + private String host; + + @Value("${spring.data.elasticsearch.port}") + private int port; + @Override public ClientConfiguration clientConfiguration() { return ClientConfiguration.builder() - .connectedTo("localhost:9200") + .connectedTo(host + ":" + port) .build(); } } \ No newline at end of file