Skip to content

Commit fb1fa07

Browse files
sbrannensbrannen
committed
Polishing
1 parent e9806a9 commit fb1fa07

File tree

2 files changed

+59
-60
lines changed

2 files changed

+59
-60
lines changed

‎spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ public abstract class MockMvcRequestBuilders {
5050
/**
5151
* Create a {@link MockHttpServletRequestBuilder} for a GET request.
5252
* @param urlTemplate a URL template; the resulting URL will be encoded
53-
* @param uriVars zero or more URI variables
53+
* @param uriVariables zero or more URI variables
5454
*/
55-
public static MockHttpServletRequestBuilder get(String urlTemplate, Object... uriVars) {
56-
return new MockHttpServletRequestBuilder(HttpMethod.GET, urlTemplate, uriVars);
55+
public static MockHttpServletRequestBuilder get(String urlTemplate, Object... uriVariables) {
56+
return new MockHttpServletRequestBuilder(HttpMethod.GET, urlTemplate, uriVariables);
5757
}
5858

5959
/**
@@ -68,10 +68,10 @@ public static MockHttpServletRequestBuilder get(URI uri) {
6868
/**
6969
* Create a {@link MockHttpServletRequestBuilder} for a POST request.
7070
* @param urlTemplate a URL template; the resulting URL will be encoded
71-
* @param uriVars zero or more URI variables
71+
* @param uriVariables zero or more URI variables
7272
*/
73-
public static MockHttpServletRequestBuilder post(String urlTemplate, Object... uriVars) {
74-
return new MockHttpServletRequestBuilder(HttpMethod.POST, urlTemplate, uriVars);
73+
public static MockHttpServletRequestBuilder post(String urlTemplate, Object... uriVariables) {
74+
return new MockHttpServletRequestBuilder(HttpMethod.POST, urlTemplate, uriVariables);
7575
}
7676

7777
/**
@@ -86,10 +86,10 @@ public static MockHttpServletRequestBuilder post(URI uri) {
8686
/**
8787
* Create a {@link MockHttpServletRequestBuilder} for a PUT request.
8888
* @param urlTemplate a URL template; the resulting URL will be encoded
89-
* @param uriVars zero or more URI variables
89+
* @param uriVariables zero or more URI variables
9090
*/
91-
public static MockHttpServletRequestBuilder put(String urlTemplate, Object... uriVars) {
92-
return new MockHttpServletRequestBuilder(HttpMethod.PUT, urlTemplate, uriVars);
91+
public static MockHttpServletRequestBuilder put(String urlTemplate, Object... uriVariables) {
92+
return new MockHttpServletRequestBuilder(HttpMethod.PUT, urlTemplate, uriVariables);
9393
}
9494

9595
/**
@@ -104,10 +104,10 @@ public static MockHttpServletRequestBuilder put(URI uri) {
104104
/**
105105
* Create a {@link MockHttpServletRequestBuilder} for a PATCH request.
106106
* @param urlTemplate a URL template; the resulting URL will be encoded
107-
* @param uriVars zero or more URI variables
107+
* @param uriVariables zero or more URI variables
108108
*/
109-
public static MockHttpServletRequestBuilder patch(String urlTemplate, Object... uriVars) {
110-
return new MockHttpServletRequestBuilder(HttpMethod.PATCH, urlTemplate, uriVars);
109+
public static MockHttpServletRequestBuilder patch(String urlTemplate, Object... uriVariables) {
110+
return new MockHttpServletRequestBuilder(HttpMethod.PATCH, urlTemplate, uriVariables);
111111
}
112112

113113
/**
@@ -122,10 +122,10 @@ public static MockHttpServletRequestBuilder patch(URI uri) {
122122
/**
123123
* Create a {@link MockHttpServletRequestBuilder} for a DELETE request.
124124
* @param urlTemplate a URL template; the resulting URL will be encoded
125-
* @param uriVars zero or more URI variables
125+
* @param uriVariables zero or more URI variables
126126
*/
127-
public static MockHttpServletRequestBuilder delete(String urlTemplate, Object... uriVars) {
128-
return new MockHttpServletRequestBuilder(HttpMethod.DELETE, urlTemplate, uriVars);
127+
public static MockHttpServletRequestBuilder delete(String urlTemplate, Object... uriVariables) {
128+
return new MockHttpServletRequestBuilder(HttpMethod.DELETE, urlTemplate, uriVariables);
129129
}
130130

131131
/**
@@ -140,10 +140,10 @@ public static MockHttpServletRequestBuilder delete(URI uri) {
140140
/**
141141
* Create a {@link MockHttpServletRequestBuilder} for an OPTIONS request.
142142
* @param urlTemplate a URL template; the resulting URL will be encoded
143-
* @param uriVars zero or more URI variables
143+
* @param uriVariables zero or more URI variables
144144
*/
145-
public static MockHttpServletRequestBuilder options(String urlTemplate, Object... uriVars) {
146-
return new MockHttpServletRequestBuilder(HttpMethod.OPTIONS, urlTemplate, uriVars);
145+
public static MockHttpServletRequestBuilder options(String urlTemplate, Object... uriVariables) {
146+
return new MockHttpServletRequestBuilder(HttpMethod.OPTIONS, urlTemplate, uriVariables);
147147
}
148148

149149
/**
@@ -158,11 +158,11 @@ public static MockHttpServletRequestBuilder options(URI uri) {
158158
/**
159159
* Create a {@link MockHttpServletRequestBuilder} for a HEAD request.
160160
* @param urlTemplate a URL template; the resulting URL will be encoded
161-
* @param uriVars zero or more URI variables
161+
* @param uriVariables zero or more URI variables
162162
* @since 4.1
163163
*/
164-
public static MockHttpServletRequestBuilder head(String urlTemplate, Object... uriVars) {
165-
return new MockHttpServletRequestBuilder(HttpMethod.HEAD, urlTemplate, uriVars);
164+
public static MockHttpServletRequestBuilder head(String urlTemplate, Object... uriVariables) {
165+
return new MockHttpServletRequestBuilder(HttpMethod.HEAD, urlTemplate, uriVariables);
166166
}
167167

168168
/**
@@ -178,10 +178,10 @@ public static MockHttpServletRequestBuilder head(URI uri) {
178178
* Create a {@link MockHttpServletRequestBuilder} for a request with the given HTTP method.
179179
* @param method the HTTP method (GET, POST, etc)
180180
* @param urlTemplate a URL template; the resulting URL will be encoded
181-
* @param uriVars zero or more URI variables
181+
* @param uriVariables zero or more URI variables
182182
*/
183-
public static MockHttpServletRequestBuilder request(HttpMethod method, String urlTemplate, Object... uriVars) {
184-
return new MockHttpServletRequestBuilder(method, urlTemplate, uriVars);
183+
public static MockHttpServletRequestBuilder request(HttpMethod method, String urlTemplate, Object... uriVariables) {
184+
return new MockHttpServletRequestBuilder(method, urlTemplate, uriVariables);
185185
}
186186

187187
/**
@@ -208,23 +208,23 @@ public static MockHttpServletRequestBuilder request(String httpMethod, URI uri)
208208
* Create a {@link MockMultipartHttpServletRequestBuilder} for a multipart request,
209209
* using POST as the HTTP method.
210210
* @param urlTemplate a URL template; the resulting URL will be encoded
211-
* @param uriVars zero or more URI variables
211+
* @param uriVariables zero or more URI variables
212212
* @since 5.0
213213
*/
214-
public static MockMultipartHttpServletRequestBuilder multipart(String urlTemplate, Object... uriVars) {
215-
return new MockMultipartHttpServletRequestBuilder(urlTemplate, uriVars);
214+
public static MockMultipartHttpServletRequestBuilder multipart(String urlTemplate, Object... uriVariables) {
215+
return new MockMultipartHttpServletRequestBuilder(urlTemplate, uriVariables);
216216
}
217217

218218
/**
219219
* Variant of {@link #multipart(String, Object...)} that also accepts an
220220
* {@link HttpMethod}.
221221
* @param httpMethod the HTTP method to use
222222
* @param urlTemplate a URL template; the resulting URL will be encoded
223-
* @param uriVars zero or more URI variables
223+
* @param uriVariables zero or more URI variables
224224
* @since 5.3.22
225225
*/
226-
public static MockMultipartHttpServletRequestBuilder multipart(HttpMethod httpMethod, String urlTemplate, Object... uriVars) {
227-
return new MockMultipartHttpServletRequestBuilder(httpMethod, urlTemplate, uriVars);
226+
public static MockMultipartHttpServletRequestBuilder multipart(HttpMethod httpMethod, String urlTemplate, Object... uriVariables) {
227+
return new MockMultipartHttpServletRequestBuilder(httpMethod, urlTemplate, uriVariables);
228228
}
229229

230230
/**
@@ -250,12 +250,12 @@ public static MockMultipartHttpServletRequestBuilder multipart(HttpMethod httpMe
250250
/**
251251
* Create a {@link MockMultipartHttpServletRequestBuilder} for a multipart request.
252252
* @param urlTemplate a URL template; the resulting URL will be encoded
253-
* @param uriVars zero or more URI variables
253+
* @param uriVariables zero or more URI variables
254254
* @deprecated in favor of {@link #multipart(String, Object...)}
255255
*/
256256
@Deprecated
257-
public static MockMultipartHttpServletRequestBuilder fileUpload(String urlTemplate, Object... uriVars) {
258-
return new MockMultipartHttpServletRequestBuilder(urlTemplate, uriVars);
257+
public static MockMultipartHttpServletRequestBuilder fileUpload(String urlTemplate, Object... uriVariables) {
258+
return new MockMultipartHttpServletRequestBuilder(urlTemplate, uriVariables);
259259
}
260260

261261
/**

‎spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/MultipartControllerTests.java

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@
4444
import org.springframework.ui.Model;
4545
import org.springframework.util.StreamUtils;
4646
import org.springframework.validation.BindingResult;
47-
import org.springframework.web.bind.annotation.RequestMapping;
48-
import org.springframework.web.bind.annotation.RequestMethod;
47+
import org.springframework.web.bind.annotation.PostMapping;
4948
import org.springframework.web.bind.annotation.PutMapping;
5049
import org.springframework.web.bind.annotation.RequestParam;
5150
import org.springframework.web.bind.annotation.RequestPart;
@@ -65,7 +64,7 @@
6564
* @author Jaebin Joo
6665
* @author Sam Brannen
6766
*/
68-
public class MultipartControllerTests {
67+
class MultipartControllerTests {
6968

7069
@ParameterizedTest
7170
@ValueSource(strings = {"/multipartfile", "/multipartfile-via-put", "/part"})
@@ -96,14 +95,14 @@ void multipartRequestWithSingleFileOrPart(String url) throws Exception {
9695
}
9796

9897
@Test
99-
public void multipartRequestWithSingleFileNotPresent() throws Exception {
98+
void multipartRequestWithSingleFileNotPresent() throws Exception {
10099
standaloneSetup(new MultipartController()).build()
101100
.perform(multipart("/multipartfile"))
102101
.andExpect(status().isFound());
103102
}
104103

105104
@Test
106-
public void multipartRequestWithFileArray() throws Exception {
105+
void multipartRequestWithFileArray() throws Exception {
107106
byte[] fileContent = "bar".getBytes(StandardCharsets.UTF_8);
108107
MockMultipartFile filePart1 = new MockMultipartFile("file", "orig", null, fileContent);
109108
MockMultipartFile filePart2 = new MockMultipartFile("file", "orig", null, fileContent);
@@ -119,21 +118,21 @@ public void multipartRequestWithFileArray() throws Exception {
119118
}
120119

121120
@Test
122-
public void multipartRequestWithFileArrayNotPresent() throws Exception {
121+
void multipartRequestWithFileArrayNotPresent() throws Exception {
123122
standaloneSetup(new MultipartController()).build()
124123
.perform(multipart("/multipartfilearray"))
125124
.andExpect(status().isFound());
126125
}
127126

128127
@Test
129-
public void multipartRequestWithFileArrayNoMultipart() throws Exception {
128+
void multipartRequestWithFileArrayNoMultipart() throws Exception {
130129
standaloneSetup(new MultipartController()).build()
131130
.perform(post("/multipartfilearray"))
132131
.andExpect(status().isFound());
133132
}
134133

135134
@Test
136-
public void multipartRequestWithFileList() throws Exception {
135+
void multipartRequestWithFileList() throws Exception {
137136
byte[] fileContent = "bar".getBytes(StandardCharsets.UTF_8);
138137
MockMultipartFile filePart1 = new MockMultipartFile("file", "orig", null, fileContent);
139138
MockMultipartFile filePart2 = new MockMultipartFile("file", "orig", null, fileContent);
@@ -149,21 +148,21 @@ public void multipartRequestWithFileList() throws Exception {
149148
}
150149

151150
@Test
152-
public void multipartRequestWithFileListNotPresent() throws Exception {
151+
void multipartRequestWithFileListNotPresent() throws Exception {
153152
standaloneSetup(new MultipartController()).build()
154153
.perform(multipart("/multipartfilelist"))
155154
.andExpect(status().isFound());
156155
}
157156

158157
@Test
159-
public void multipartRequestWithFileListNoMultipart() throws Exception {
158+
void multipartRequestWithFileListNoMultipart() throws Exception {
160159
standaloneSetup(new MultipartController()).build()
161160
.perform(post("/multipartfilelist"))
162161
.andExpect(status().isFound());
163162
}
164163

165164
@Test
166-
public void multipartRequestWithOptionalFile() throws Exception {
165+
void multipartRequestWithOptionalFile() throws Exception {
167166
byte[] fileContent = "bar".getBytes(StandardCharsets.UTF_8);
168167
MockMultipartFile filePart = new MockMultipartFile("file", "orig", null, fileContent);
169168

@@ -178,7 +177,7 @@ public void multipartRequestWithOptionalFile() throws Exception {
178177
}
179178

180179
@Test
181-
public void multipartRequestWithOptionalFileNotPresent() throws Exception {
180+
void multipartRequestWithOptionalFileNotPresent() throws Exception {
182181
byte[] json = "{\"name\":\"yeeeah\"}".getBytes(StandardCharsets.UTF_8);
183182
MockMultipartFile jsonPart = new MockMultipartFile("json", "json", "application/json", json);
184183

@@ -190,7 +189,7 @@ public void multipartRequestWithOptionalFileNotPresent() throws Exception {
190189
}
191190

192191
@Test
193-
public void multipartRequestWithOptionalFileArray() throws Exception {
192+
void multipartRequestWithOptionalFileArray() throws Exception {
194193
byte[] fileContent = "bar".getBytes(StandardCharsets.UTF_8);
195194
MockMultipartFile filePart1 = new MockMultipartFile("file", "orig", null, fileContent);
196195
MockMultipartFile filePart2 = new MockMultipartFile("file", "orig", null, fileContent);
@@ -206,7 +205,7 @@ public void multipartRequestWithOptionalFileArray() throws Exception {
206205
}
207206

208207
@Test
209-
public void multipartRequestWithOptionalFileArrayNotPresent() throws Exception {
208+
void multipartRequestWithOptionalFileArrayNotPresent() throws Exception {
210209
byte[] json = "{\"name\":\"yeeeah\"}".getBytes(StandardCharsets.UTF_8);
211210
MockMultipartFile jsonPart = new MockMultipartFile("json", "json", "application/json", json);
212211

@@ -218,7 +217,7 @@ public void multipartRequestWithOptionalFileArrayNotPresent() throws Exception {
218217
}
219218

220219
@Test
221-
public void multipartRequestWithOptionalFileList() throws Exception {
220+
void multipartRequestWithOptionalFileList() throws Exception {
222221
byte[] fileContent = "bar".getBytes(StandardCharsets.UTF_8);
223222
MockMultipartFile filePart1 = new MockMultipartFile("file", "orig", null, fileContent);
224223
MockMultipartFile filePart2 = new MockMultipartFile("file", "orig", null, fileContent);
@@ -234,7 +233,7 @@ public void multipartRequestWithOptionalFileList() throws Exception {
234233
}
235234

236235
@Test
237-
public void multipartRequestWithOptionalFileListNotPresent() throws Exception {
236+
void multipartRequestWithOptionalFileListNotPresent() throws Exception {
238237
byte[] json = "{\"name\":\"yeeeah\"}".getBytes(StandardCharsets.UTF_8);
239238
MockMultipartFile jsonPart = new MockMultipartFile("json", "json", "application/json", json);
240239

@@ -246,7 +245,7 @@ public void multipartRequestWithOptionalFileListNotPresent() throws Exception {
246245
}
247246

248247
@Test
249-
public void multipartRequestWithDataBindingToFile() throws Exception {
248+
void multipartRequestWithDataBindingToFile() throws Exception {
250249
byte[] fileContent = "bar".getBytes(StandardCharsets.UTF_8);
251250
MockPart filePart = new MockPart("file", "orig", fileContent);
252251

@@ -257,7 +256,7 @@ public void multipartRequestWithDataBindingToFile() throws Exception {
257256
}
258257

259258
@Test // SPR-13317
260-
public void multipartRequestWrapped() throws Exception {
259+
void multipartRequestWrapped() throws Exception {
261260
byte[] json = "{\"name\":\"yeeeah\"}".getBytes(StandardCharsets.UTF_8);
262261
MockMultipartFile jsonPart = new MockMultipartFile("json", "json", "application/json", json);
263262

@@ -272,7 +271,7 @@ public void multipartRequestWrapped() throws Exception {
272271
@Controller
273272
private static class MultipartController {
274273

275-
@RequestMapping(value = "/multipartfile", method = RequestMethod.POST)
274+
@PostMapping("/multipartfile")
276275
public String processMultipartFile(@RequestParam(required = false) MultipartFile file,
277276
@RequestPart(required = false) Map<String, String> json, Model model) throws IOException {
278277

@@ -286,14 +285,14 @@ public String processMultipartFile(@RequestParam(required = false) MultipartFile
286285
return "redirect:/index";
287286
}
288287

289-
@RequestMapping(value = "/multipartfilearray", method = RequestMethod.POST)
290288
@PutMapping("/multipartfile-via-put")
291289
public String processMultipartFileViaHttpPut(@RequestParam(required = false) MultipartFile file,
292290
@RequestPart(required = false) Map<String, String> json, Model model) throws IOException {
293291

294292
return processMultipartFile(file, json, model);
295293
}
296294

295+
@PostMapping("/multipartfilearray")
297296
public String processMultipartFileArray(@RequestParam(required = false) MultipartFile[] file,
298297
@RequestPart(required = false) Map<String, String> json, Model model) throws IOException {
299298

@@ -309,7 +308,7 @@ public String processMultipartFileArray(@RequestParam(required = false) Multipar
309308
return "redirect:/index";
310309
}
311310

312-
@RequestMapping(value = "/multipartfilelist", method = RequestMethod.POST)
311+
@PostMapping("/multipartfilelist")
313312
public String processMultipartFileList(@RequestParam(required = false) List<MultipartFile> file,
314313
@RequestPart(required = false) Map<String, String> json, Model model) throws IOException {
315314

@@ -325,7 +324,7 @@ public String processMultipartFileList(@RequestParam(required = false) List<Mult
325324
return "redirect:/index";
326325
}
327326

328-
@RequestMapping(value = "/optionalfile", method = RequestMethod.POST)
327+
@PostMapping("/optionalfile")
329328
public String processOptionalFile(@RequestParam Optional<MultipartFile> file,
330329
@RequestPart Map<String, String> json, Model model) throws IOException {
331330

@@ -337,7 +336,7 @@ public String processOptionalFile(@RequestParam Optional<MultipartFile> file,
337336
return "redirect:/index";
338337
}
339338

340-
@RequestMapping(value = "/optionalfilearray", method = RequestMethod.POST)
339+
@PostMapping("/optionalfilearray")
341340
public String processOptionalFileArray(@RequestParam Optional<MultipartFile[]> file,
342341
@RequestPart Map<String, String> json, Model model) throws IOException {
343342

@@ -351,7 +350,7 @@ public String processOptionalFileArray(@RequestParam Optional<MultipartFile[]> f
351350
return "redirect:/index";
352351
}
353352

354-
@RequestMapping(value = "/optionalfilelist", method = RequestMethod.POST)
353+
@PostMapping("/optionalfilelist")
355354
public String processOptionalFileList(@RequestParam Optional<List<MultipartFile>> file,
356355
@RequestPart Map<String, String> json, Model model) throws IOException {
357356

@@ -365,7 +364,7 @@ public String processOptionalFileList(@RequestParam Optional<List<MultipartFile>
365364
return "redirect:/index";
366365
}
367366

368-
@RequestMapping(value = "/part", method = RequestMethod.POST)
367+
@PostMapping("/part")
369368
public String processPart(@RequestPart Part part,
370369
@RequestPart Map<String, String> json, Model model) throws IOException {
371370

@@ -378,13 +377,13 @@ public String processPart(@RequestPart Part part,
378377
return "redirect:/index";
379378
}
380379

381-
@RequestMapping(value = "/json", method = RequestMethod.POST)
380+
@PostMapping("/json")
382381
public String processMultipart(@RequestPart Map<String, String> json, Model model) {
383382
model.addAttribute("json", json);
384383
return "redirect:/index";
385384
}
386385

387-
@RequestMapping(value = "/multipartfilebinding", method = RequestMethod.POST)
386+
@PostMapping("/multipartfilebinding")
388387
public String processMultipartFileBean(
389388
MultipartFileBean multipartFileBean, Model model, BindingResult bindingResult) throws IOException {
390389

0 commit comments

Comments
 (0)