Skip to content

MimeMappings copies of DEFAULT are empty and equals is asymmetric #52282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhoubiao188 wants to merge 1 commit into
base: 4.0.x
Choose a base branch
from
+25 −2
Open

MimeMappings copies of DEFAULT are empty and equals is asymmetric #52282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...pring-boot-web-server/src/main/java/org/springframework/boot/web/server/MimeMappings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ public MimeMappings(Map<String, String> mappings) {
*/
MimeMappings(MimeMappings mappings, boolean mutable) {
Assert.notNull(mappings, "'mappings' must not be null");
this.map = (mutable ? new LinkedHashMap<>(mappings.map) : Collections.unmodifiableMap(mappings.map));
Map<String, Mapping> source = mappings.getMap();
this.map = (mutable ? new LinkedHashMap<>(source) : Collections.unmodifiableMap(source));
}

/**
Expand Down Expand Up @@ -132,7 +133,7 @@ public boolean equals(Object obj) {
return true;
}
if (obj instanceof MimeMappings other) {
return getMap().equals(other.map);
return getMap().equals(other.getMap());
}
return false;
}
Expand Down
22 changes: 22 additions & 0 deletions ...-boot-web-server/src/test/java/org/springframework/boot/web/server/MimeMappingsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,28 @@ void createFromExisting() {
assertThat(clone.get("baz")).isNull();
}

@Test
void createFromDefault() {
MimeMappings clone = new MimeMappings(MimeMappings.DEFAULT);
assertThat(clone).hasSameSizeAs(MimeMappings.DEFAULT);
assertThat(clone.get("html")).isEqualTo("text/html");
clone.add("foo", "bar");
assertThat(MimeMappings.DEFAULT.get("foo")).isNull();
}

@Test
void makeUnmodifiableFromDefault() {
MimeMappings unmodifiable = MimeMappings.unmodifiableMappings(MimeMappings.DEFAULT);
assertThat(unmodifiable.get("html")).isEqualTo("text/html");
}

@Test
void equalsIsSymmetricWithDefault() {
MimeMappings clone = new MimeMappings(MimeMappings.DEFAULT);
assertThat(clone).isEqualTo(MimeMappings.DEFAULT);
assertThat(MimeMappings.DEFAULT).isEqualTo(clone);
}

@Test
void createFromMap() {
Map<String, String> mappings = new HashMap<>();
Expand Down
Loading