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

Auto-configure Elasticsearch REST client in Spring Data

Browse Source 
This commit auto-configures the Elasticsearch REST client support
as a template for Spring Data Elasticsearch. As of this commit,
using the transport client is still possible but developers
should migrate.

This commit also removes the deprecated annotation on the
Elasticsearch auto-configuration for the transport client, since
this deprecation notice is already present on the configuration
property.

Closes gh-17024
Closes gh-16542
This commit is contained in:
Brian Clozel
2019-06-03 21:20:06 +02:00
parent ae5b5be597
commit c74badd4f2
9 changed files with 216 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/ElasticsearchContainer.java
View File

@@ -26,16 +26,20 @@ import java.time.Duration;
public class ElasticsearchContainer extends Container {
public ElasticsearchContainer() {
super("elasticsearch:6.4.3", 9200,
super("elasticsearch:6.7.2", 9200,
(container) -> container.withStartupTimeout(Duration.ofSeconds(120))
.withStartupAttempts(5).withEnv("discovery.type", "single-node")
.addExposedPort(9300));
.addExposedPorts(9200, 9300));
}
public int getMappedTransportPort() {
return getContainer().getMappedPort(9300);
}
public int getMappedHttpPort() {
return getContainer().getMappedPort(9200);
}
@Override
public void start() {
System.setProperty("es.set.netty.runtime.available.processors", "false");