Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Elasticsearch 6.2.4

Browse Source 
Closes gh-13178
This commit is contained in:
Andy Wilkinson
2018-05-15 16:40:34 +01:00
parent 795ff45a65
commit 148997fd43
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientAutoConfiguration.java
View File

@@ -62,12 +62,13 @@ public class RestClientAutoConfiguration {
@Bean(destroyMethod = "close")
@ConditionalOnMissingBean
public RestClient restClient() {
RestClientBuilder builder = configureBuilder();
public RestClient restClient(RestClientBuilder builder) {
return builder.build();
}
protected RestClientBuilder configureBuilder() {
@Bean
@ConditionalOnMissingBean
public RestClientBuilder restClientBuilder() {
HttpHost[] hosts = this.properties.getUris().stream().map(HttpHost::create)
.toArray(HttpHost[]::new);
RestClientBuilder builder = RestClient.builder(hosts);
@@ -90,8 +91,9 @@ public class RestClientAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public RestHighLevelClient restHighLevelClient(RestClient restClient) {
return new RestHighLevelClient(restClient);
public RestHighLevelClient restHighLevelClient(
RestClientBuilder restClientBuilder) {
return new RestHighLevelClient(restClientBuilder);
}
}

2
spring-boot-project/spring-boot-dependencies/pom.xml
View File

@@ -59,7 +59,7 @@
<embedded-mongo.version>2.0.3</embedded-mongo.version>
<flyway.version>5.0.7</flyway.version>
<freemarker.version>2.3.28</freemarker.version>
<elasticsearch.version>5.6.9</elasticsearch.version>
<elasticsearch.version>6.2.4</elasticsearch.version>
<glassfish-el.version>3.0.0</glassfish-el.version>
<groovy.version>2.4.15</groovy.version>
<gson.version>2.8.4</gson.version>