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

DATAES-650 - Add support for pathPrefix to configuration classes.

Browse Source 
Original pull request: #320.
This commit is contained in:
Huw
2019-09-19 22:33:54 +01:00
committed by Peter-Josef Meisch
parent b820c9a422
commit 948d29ba65
9 changed files with 115 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/test/java/org/springframework/data/elasticsearch/client/ClientConfigurationUnitTests.java
View File

@@ -31,6 +31,7 @@ import org.springframework.http.HttpHeaders;
*
* @author Mark Paluch
* @author Peter-Josef Meisch
* @author Huw Ayling-Miller
*/
public class ClientConfigurationUnitTests {
@@ -42,7 +43,7 @@ public class ClientConfigurationUnitTests {
assertThat(clientConfiguration.getEndpoints()).containsOnly(InetSocketAddress.createUnresolved("localhost", 9200));
}
@Test // DATAES-488, DATAES-504
@Test // DATAES-488, DATAES-504, DATAES-650
public void shouldCreateCustomizedConfiguration() {
HttpHeaders headers = new HttpHeaders();
@@ -52,7 +53,8 @@ public class ClientConfigurationUnitTests {
.connectedTo("foo", "bar") //
.usingSsl() //
.withDefaultHeaders(headers) //
.withConnectTimeout(Duration.ofDays(1)).withSocketTimeout(Duration.ofDays(2)).build();
.withConnectTimeout(Duration.ofDays(1)).withSocketTimeout(Duration.ofDays(2)) //
.withPathPrefix("myPathPrefix").build();
assertThat(clientConfiguration.getEndpoints()).containsOnly(InetSocketAddress.createUnresolved("foo", 9200),
InetSocketAddress.createUnresolved("bar", 9200));
@@ -60,6 +62,7 @@ public class ClientConfigurationUnitTests {
assertThat(clientConfiguration.getDefaultHeaders().get("foo")).containsOnly("bar");
assertThat(clientConfiguration.getConnectTimeout()).isEqualTo(Duration.ofDays(1));
assertThat(clientConfiguration.getSocketTimeout()).isEqualTo(Duration.ofDays(2));
assertThat(clientConfiguration.getPathPrefix()).isEqualTo("myPathPrefix");
}
@Test // DATAES-488, DATAES-504

10
src/test/java/org/springframework/data/elasticsearch/client/reactive/ReactiveMockClientTestsUtils.java
View File

@@ -263,6 +263,16 @@ public class ReactiveMockClientTestsUtils {
public WebClientProvider withErrorListener(Consumer<Throwable> errorListener) {
throw new UnsupportedOperationException();
}
@Override
public String getPathPrefix() {
return null;
}
@Override
public WebClientProvider withPathPrefix(String pathPrefix) {
throw new UnsupportedOperationException();
}
public Send when(String host) {
InetSocketAddress inetSocketAddress = getInetSocketAddress(host);