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

Merge branch '5.2.x'

This commit is contained in:
Stephane Nicoll 2020-08-06 09:30:17 +02:00
parent c7b74c4358 b6842730f7
commit 6d164b1445
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/docs/asciidoc/integration.adoc
View File

@ -320,7 +320,7 @@ To send multipart data, you need to provide a `MultiValueMap<String, Object>` wh
may be an `Object` for part content, a `Resource` for a file part, or an `HttpEntity` for may be an `Object` for part content, a `Resource` for a file part, or an `HttpEntity` for
part content with headers. For example: part content with headers. For example:
[source,java,intent=0] [source,java,indent=0]
[subs="verbatim,quotes"] [subs="verbatim,quotes"]
---- ----
MultiValueMap<String, Object> parts = new LinkedMultiValueMap<>(); MultiValueMap<String, Object> parts = new LinkedMultiValueMap<>();
@ -341,7 +341,7 @@ explicitly provide the `MediaType` with an `HttpEntity` wrapper.
Once the `MultiValueMap` is ready, you can pass it to the `RestTemplate`, as show below: Once the `MultiValueMap` is ready, you can pass it to the `RestTemplate`, as show below:
[source,java,intent=0] [source,java,indent=0]
[subs="verbatim,quotes"] [subs="verbatim,quotes"]
---- ----
MultiValueMap<String, Object> parts = ...; MultiValueMap<String, Object> parts = ...;