Specify that log file endpoint's response is UTF-8 encoded

Closes gh-16189
This commit is contained in:
Andy Wilkinson
2019-04-02 10:52:18 +01:00
parent 22c9364237
commit 02b24b6ed3
2 changed files with 5 additions and 2 deletions
@@ -55,7 +55,7 @@ public class LogFileWebEndpoint {
this(environment, null);
}
@ReadOperation(produces = "text/plain")
@ReadOperation(produces = "text/plain; charset=UTF-8")
public Resource logFile() {
Resource logFileResource = getLogFileResource();
if (logFileResource == null || !logFileResource.isReadable()) {
@@ -69,6 +69,7 @@ public class LogFileWebEndpointWebIntegrationTests {
TestPropertyValues.of("logging.file:" + this.logFile.getAbsolutePath())
.applyTo(context);
client.get().uri("/actuator/logfile").exchange().expectStatus().isOk()
.expectHeader().contentType("text/plain; charset=UTF-8")
.expectBody(String.class).isEqualTo("--TEST--");
}
@@ -77,7 +78,9 @@ public class LogFileWebEndpointWebIntegrationTests {
TestPropertyValues.of("logging.file:" + this.logFile.getAbsolutePath())
.applyTo(context);
client.get().uri("/actuator/logfile").accept(MediaType.TEXT_PLAIN).exchange()
.expectStatus().isOk().expectBody(String.class).isEqualTo("--TEST--");
.expectStatus().isOk().expectHeader()
.contentType("text/plain; charset=UTF-8").expectBody(String.class)
.isEqualTo("--TEST--");
}
@Configuration