Skip to content

Commit bbbf8c5

Browse files
committed
Polish
See gh-20205
1 parent a7e57e0 commit bbbf8c5

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/codec/CodecProperties.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ public class CodecProperties {
3535

3636
/**
3737
* Limit on the number of bytes that can be buffered whenever the input stream needs
38-
* to be aggregated. By default this is not set, in which case individual codec
38+
* to be aggregated. This applies only to the auto-configured WebFlux server and
39+
* WebClient instances. By default this is not set, in which case individual codec
3940
* defaults apply. Most codecs are limited to 256K by default.
4041
*/
4142
private DataSize maxInMemorySize;

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveRestClientAutoConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@ public ClientConfiguration clientConfiguration(ReactiveRestClientProperties prop
5454
builder.usingSsl();
5555
}
5656
configureTimeouts(builder, properties);
57-
configureWebClient(builder, properties);
57+
configureExchangeStrategies(builder, properties);
5858
return builder.build();
5959
}
6060

@@ -70,7 +70,7 @@ private void configureTimeouts(ClientConfiguration.TerminalClientConfigurationBu
7070
});
7171
}
7272

73-
private void configureWebClient(ClientConfiguration.TerminalClientConfigurationBuilder builder,
73+
private void configureExchangeStrategies(ClientConfiguration.TerminalClientConfigurationBuilder builder,
7474
ReactiveRestClientProperties properties) {
7575
PropertyMapper map = PropertyMapper.get();
7676
builder.withWebClientConfigurer((webClient) -> {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveRestClientProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveRestClientAutoConfigurationTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ void restClientCanQueryElasticsearchNode() {
7777
this.contextRunner.withPropertyValues(
7878
"spring.data.elasticsearch.client.reactive.endpoints=" + elasticsearch.getContainerIpAddress() + ":"
7979
+ elasticsearch.getFirstMappedPort(),
80-
"spring.data.elasticsearch.client.reactive.max-in-memory-size=-1",
8180
"spring.data.elasticsearch.client.reactive.connection-timeout=120s",
8281
"spring.data.elasticsearch.client.reactive.socket-timeout=120s").run((context) -> {
8382
ReactiveElasticsearchClient client = context.getBean(ReactiveElasticsearchClient.class);

0 commit comments

Comments
 (0)