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

Include filename in Content-Disposition header when available

Browse Source 
Closes gh-425
This commit is contained in:
Andy Wilkinson
2017-09-23 17:39:24 +01:00
parent 7c6c2e7523
commit d22dc1e211
2 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-restdocs-core/src/main/java/org/springframework/restdocs/http/HttpRequestSnippet.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2016 the original author or authors.
* Copyright 2014-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -158,12 +158,12 @@ public class HttpRequestSnippet extends TemplatedSnippet {
for (Entry<String, List<String>> parameter : request.getParameters().entrySet()) {
if (parameter.getValue().isEmpty()) {
writePartBoundary(writer);
writePart(parameter.getKey(), "", null, writer);
writePart(parameter.getKey(), "", null, null, writer);
}
else {
for (String value : parameter.getValue()) {
writePartBoundary(writer);
writePart(parameter.getKey(), value, null, writer);
writePart(parameter.getKey(), value, null, null, writer);
writer.println();
}
}
@@ -181,13 +181,17 @@ public class HttpRequestSnippet extends TemplatedSnippet {
}
private void writePart(OperationRequestPart part, PrintWriter writer) {
writePart(part.getName(), part.getContentAsString(),
writePart(part.getName(), part.getContentAsString(), part.getSubmittedFileName(),
part.getHeaders().getContentType(), writer);
}
private void writePart(String name, String value, MediaType contentType,
PrintWriter writer) {
writer.printf("Content-Disposition: form-data; name=%s%n", name);
private void writePart(String name, String value, String filename,
MediaType contentType, PrintWriter writer) {
writer.printf("Content-Disposition: form-data; name=%s", name);
if (StringUtils.hasText(filename)) {
writer.printf("; filename=%s", filename);
}
writer.printf("%n");
if (contentType != null) {
writer.printf("Content-Type: %s%n", contentType);
}