Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Separate commonly used DepositionTypeCheck into methods

Browse Source 
Closes gh-34573

Signed-off-by: ChanHyeongLee <cksgud410@gmail.com>
[brian.clozel@broadcom.com: apply code conventions]
Signed-off-by: Brian Clozel <brian.clozel@broadcom.com>
This commit is contained in:
ChanHyeongLee
2025-03-11 17:46:03 +09:00
committed by Brian Clozel
parent de75b6e1a2
commit 8ee09e5766
2 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-web/src/main/java/org/springframework/http/ContentDisposition.java
View File

@@ -99,7 +99,7 @@ public final class ContentDisposition {
* @since 5.3 * @since 5.3
*/ */
public boolean isAttachment() { public boolean isAttachment() {
return (this.type != null && this.type.equalsIgnoreCase("attachment")); return isDispositionType("attachment");
} }
/** /**
@@ -107,7 +107,7 @@ public final class ContentDisposition {
* @since 5.3 * @since 5.3
*/ */
public boolean isFormData() { public boolean isFormData() {
return (this.type != null && this.type.equalsIgnoreCase("form-data")); return isDispositionType("form-data");
} }
/** /**
@@ -115,7 +115,11 @@ public final class ContentDisposition {
* @since 5.3 * @since 5.3
*/ */
public boolean isInline() { public boolean isInline() {
return (this.type != null && this.type.equalsIgnoreCase("inline")); return isDispositionType("inline");
}
private boolean isDispositionType(String type) {
return this.type != null && this.type.equalsIgnoreCase(type);
} }
/** /**
@@ -556,6 +560,7 @@ public final class ContentDisposition {
} }
/** /**
* A mutable builder for {@code ContentDisposition}. * A mutable builder for {@code ContentDisposition}.
*/ */

24
spring-web/src/test/java/org/springframework/http/ContentDispositionTests.java
View File

@@ -310,4 +310,28 @@ class ContentDispositionTests {
.isEqualTo(filename); .isEqualTo(filename);
} }
@Test
void attachmentType(){
ContentDisposition attachment = ContentDisposition.attachment().build();
assertThat(attachment.isAttachment()).isTrue();
assertThat(attachment.isFormData()).isFalse();
assertThat(attachment.isInline()).isFalse();
}
@Test
void formDataType(){
ContentDisposition formData = ContentDisposition.formData().build();
assertThat(formData.isAttachment()).isFalse();
assertThat(formData.isFormData()).isTrue();
assertThat(formData.isInline()).isFalse();
}
@Test
void inlineType(){
ContentDisposition inline = ContentDisposition.inline().build();
assertThat(inline.isAttachment()).isFalse();
assertThat(inline.isFormData()).isFalse();
assertThat(inline.isInline()).isTrue();
}
} }