Skip to content

Commit 1fa4701

Browse files
committed
Polish "Validate overrides against CharsetMapperDefault.properties"
See gh-30692
1 parent 407ae3b commit 1fa4701

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@
8181
import org.springframework.boot.web.servlet.server.AbstractServletWebServerFactory;
8282
import org.springframework.boot.web.servlet.server.AbstractServletWebServerFactoryTests;
8383
import org.springframework.core.io.ByteArrayResource;
84+
import org.springframework.core.io.ClassPathResource;
85+
import org.springframework.core.io.support.PropertiesLoaderUtils;
8486
import org.springframework.http.HttpEntity;
8587
import org.springframework.http.HttpHeaders;
8688
import org.springframework.http.HttpStatus;
@@ -410,8 +412,8 @@ void defaultLocaleCharsetMappingsAreOverridden() throws IOException {
410412
TomcatServletWebServerFactory factory = getFactory();
411413
this.webServer = factory.getWebServer();
412414
// override defaults, see org.apache.catalina.util.CharsetMapperDefault.properties
413-
Properties charsetMapperDefault = new Properties();
414-
charsetMapperDefault.load(CharsetMapper.class.getResourceAsStream("CharsetMapperDefault.properties"));
415+
Properties charsetMapperDefault = PropertiesLoaderUtils
416+
.loadProperties(new ClassPathResource("CharsetMapperDefault.properties", CharsetMapper.class));
415417
for (String language : charsetMapperDefault.stringPropertyNames()) {
416418
assertThat(getCharset(new Locale(language))).isEqualTo(StandardCharsets.UTF_8);
417419
}

0 commit comments

Comments
 (0)