root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge pull request #32298 from izeye 

* pr/32298:
  Polish MimeMappings changes

Closes gh-32298
This commit is contained in:
Stephane Nicoll 2022-09-12 18:00:56 +02:00
parent 26cec61f32 4cbabc40b3
commit c4e47c6fad
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/MimeMappings.java
View File

@ -168,8 +168,8 @@ public sealed class MimeMappings implements Iterable<MimeMappings.Mapping> {
} }
/** /**
* Crate a new lazy copy of the given mappings will only copy entries if the mappings * Create a new lazy copy of the given mappings that will only copy entries if the
* are mutated. * mappings are mutated.
* @param mappings the source mappings * @param mappings the source mappings
* @return a new mappings instance * @return a new mappings instance
* @since 3.0.0 * @since 3.0.0
@ -349,7 +349,7 @@ public sealed class MimeMappings implements Iterable<MimeMappings.Mapping> {
private final MimeMappings source; private final MimeMappings source;
private AtomicBoolean copied = new AtomicBoolean(); private final AtomicBoolean copied = new AtomicBoolean();
LazyMimeMappingsCopy(MimeMappings source) { LazyMimeMappingsCopy(MimeMappings source) {
this.source = source; this.source = source;

6
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/MimeMappingsTests.java
View File

@ -181,7 +181,6 @@ class MimeMappingsTests {
void commonMappingsAreSubsetOfAllMappings() { void commonMappingsAreSubsetOfAllMappings() {
MimeMappings defaultMappings = new DefaultMimeMappings(); MimeMappings defaultMappings = new DefaultMimeMappings();
MimeMappings commonMappings = (MimeMappings) ReflectionTestUtils.getField(DefaultMimeMappings.class, "COMMON"); MimeMappings commonMappings = (MimeMappings) ReflectionTestUtils.getField(DefaultMimeMappings.class, "COMMON");
defaultMappings.getAll();
for (Mapping commonMapping : commonMappings) { for (Mapping commonMapping : commonMappings) {
assertThat(defaultMappings.get(commonMapping.getExtension())).isEqualTo(commonMapping.getMimeType()); assertThat(defaultMappings.get(commonMapping.getExtension())).isEqualTo(commonMapping.getMimeType());
} }
@ -209,10 +208,11 @@ class MimeMappingsTests {
MimeMappings mappings = new MimeMappings(); MimeMappings mappings = new MimeMappings();
mappings.add("json", "one/json"); mappings.add("json", "one/json");
MimeMappings lazyCopy = MimeMappings.lazyCopy(mappings); MimeMappings lazyCopy = MimeMappings.lazyCopy(mappings);
lazyCopy.add("first", "copy/yes");
assertThat(lazyCopy.get("json")).isEqualTo("one/json"); assertThat(lazyCopy.get("json")).isEqualTo("one/json");
mappings.add("json", "two/json"); mappings.add("json", "two/json");
lazyCopy.add("json", "other/json"); lazyCopy.add("second", "copy/no");
assertThat(lazyCopy.get("json")).isEqualTo("other/json"); assertThat(lazyCopy.get("json")).isEqualTo("one/json");
} }
@Test @Test