Skip to content

Commit 02b24b6

Browse files
committed
Specify that log file endpoint's response is UTF-8 encoded
Closes gh-16189
1 parent 22c9364 commit 02b24b6

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/logging/LogFileWebEndpoint.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public LogFileWebEndpoint(Environment environment) {
5555
this(environment, null);
5656
}
5757

58-
@ReadOperation(produces = "text/plain")
58+
@ReadOperation(produces = "text/plain; charset=UTF-8")
5959
public Resource logFile() {
6060
Resource logFileResource = getLogFileResource();
6161
if (logFileResource == null || !logFileResource.isReadable()) {

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LogFileWebEndpointWebIntegrationTests.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ public void getRequestProducesResponseWithLogFile() {
6969
TestPropertyValues.of("logging.file:" + this.logFile.getAbsolutePath())
7070
.applyTo(context);
7171
client.get().uri("/actuator/logfile").exchange().expectStatus().isOk()
72+
.expectHeader().contentType("text/plain; charset=UTF-8")
7273
.expectBody(String.class).isEqualTo("--TEST--");
7374
}
7475

@@ -77,7 +78,9 @@ public void getRequestThatAcceptsTextPlainProducesResponseWithLogFile() {
7778
TestPropertyValues.of("logging.file:" + this.logFile.getAbsolutePath())
7879
.applyTo(context);
7980
client.get().uri("/actuator/logfile").accept(MediaType.TEXT_PLAIN).exchange()
80-
.expectStatus().isOk().expectBody(String.class).isEqualTo("--TEST--");
81+
.expectStatus().isOk().expectHeader()
82+
.contentType("text/plain; charset=UTF-8").expectBody(String.class)
83+
.isEqualTo("--TEST--");
8184
}
8285

8386
@Configuration

0 commit comments

Comments
 (0)