Skip to content

Commit 7a8ec4f

Browse files
jhoellerjhoeller
committed
Consistent use of "URI variables" terminology
Issue: SPR-14969
1 parent d41d3aa commit 7a8ec4f

File tree

7 files changed

+103
-103
lines changed

7 files changed

+103
-103
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public class MockHttpServletRequestBuilder
126126
* {@link #with(RequestPostProcessor)}.
127127
* @param httpMethod the HTTP method (GET, POST, etc)
128128
* @param url a URL template; the resulting URL will be encoded
129-
* @param vars zero or more URL variables
129+
* @param vars zero or more URI variables
130130
*/
131131
MockHttpServletRequestBuilder(HttpMethod httpMethod, String url, Object... vars) {
132132
this(httpMethod.name(), UriComponentsBuilder.fromUriString(url).buildAndExpand(vars).encode().toUri());

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ public class MockMultipartHttpServletRequestBuilder extends MockHttpServletReque
4646
* see {@link #with(RequestPostProcessor)} and the
4747
* {@link RequestPostProcessor} extension point.
4848
* @param urlTemplate a URL template; the resulting URL will be encoded
49-
* @param urlVariables zero or more URL variables
49+
* @param uriVariables zero or more URI variables
5050
*/
51-
MockMultipartHttpServletRequestBuilder(String urlTemplate, Object... urlVariables) {
52-
super(HttpMethod.POST, urlTemplate, urlVariables);
51+
MockMultipartHttpServletRequestBuilder(String urlTemplate, Object... uriVariables) {
52+
super(HttpMethod.POST, urlTemplate, uriVariables);
5353
super.contentType(MediaType.MULTIPART_FORM_DATA);
5454
}
5555

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

Lines changed: 27 additions & 27 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 urlVars zero or more URL variables
53+
* @param uriVars zero or more URI variables
5454
*/
55-
public static MockHttpServletRequestBuilder get(String urlTemplate, Object... urlVars) {
56-
return new MockHttpServletRequestBuilder(HttpMethod.GET, urlTemplate, urlVars);
55+
public static MockHttpServletRequestBuilder get(String urlTemplate, Object... uriVars) {
56+
return new MockHttpServletRequestBuilder(HttpMethod.GET, urlTemplate, uriVars);
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 urlVars zero or more URL variables
71+
* @param uriVars zero or more URI variables
7272
*/
73-
public static MockHttpServletRequestBuilder post(String urlTemplate, Object... urlVars) {
74-
return new MockHttpServletRequestBuilder(HttpMethod.POST, urlTemplate, urlVars);
73+
public static MockHttpServletRequestBuilder post(String urlTemplate, Object... uriVars) {
74+
return new MockHttpServletRequestBuilder(HttpMethod.POST, urlTemplate, uriVars);
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 urlVars zero or more URL variables
89+
* @param uriVars zero or more URI variables
9090
*/
91-
public static MockHttpServletRequestBuilder put(String urlTemplate, Object... urlVars) {
92-
return new MockHttpServletRequestBuilder(HttpMethod.PUT, urlTemplate, urlVars);
91+
public static MockHttpServletRequestBuilder put(String urlTemplate, Object... uriVars) {
92+
return new MockHttpServletRequestBuilder(HttpMethod.PUT, urlTemplate, uriVars);
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 urlVars zero or more URL variables
107+
* @param uriVars zero or more URI variables
108108
*/
109-
public static MockHttpServletRequestBuilder patch(String urlTemplate, Object... urlVars) {
110-
return new MockHttpServletRequestBuilder(HttpMethod.PATCH, urlTemplate, urlVars);
109+
public static MockHttpServletRequestBuilder patch(String urlTemplate, Object... uriVars) {
110+
return new MockHttpServletRequestBuilder(HttpMethod.PATCH, urlTemplate, uriVars);
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 urlVars zero or more URL variables
125+
* @param uriVars zero or more URI variables
126126
*/
127-
public static MockHttpServletRequestBuilder delete(String urlTemplate, Object... urlVars) {
128-
return new MockHttpServletRequestBuilder(HttpMethod.DELETE, urlTemplate, urlVars);
127+
public static MockHttpServletRequestBuilder delete(String urlTemplate, Object... uriVars) {
128+
return new MockHttpServletRequestBuilder(HttpMethod.DELETE, urlTemplate, uriVars);
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 urlVars zero or more URL variables
143+
* @param uriVars zero or more URI variables
144144
*/
145-
public static MockHttpServletRequestBuilder options(String urlTemplate, Object... urlVars) {
146-
return new MockHttpServletRequestBuilder(HttpMethod.OPTIONS, urlTemplate, urlVars);
145+
public static MockHttpServletRequestBuilder options(String urlTemplate, Object... uriVars) {
146+
return new MockHttpServletRequestBuilder(HttpMethod.OPTIONS, urlTemplate, uriVars);
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 urlVars zero or more URL variables
161+
* @param uriVars zero or more URI variables
162162
* @since 4.1
163163
*/
164-
public static MockHttpServletRequestBuilder head(String urlTemplate, Object... urlVars) {
165-
return new MockHttpServletRequestBuilder(HttpMethod.HEAD, urlTemplate, urlVars);
164+
public static MockHttpServletRequestBuilder head(String urlTemplate, Object... uriVars) {
165+
return new MockHttpServletRequestBuilder(HttpMethod.HEAD, urlTemplate, uriVars);
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 urlVars zero or more URL variables
181+
* @param uriVars zero or more URI variables
182182
*/
183-
public static MockHttpServletRequestBuilder request(HttpMethod method, String urlTemplate, Object... urlVars) {
184-
return new MockHttpServletRequestBuilder(method, urlTemplate, urlVars);
183+
public static MockHttpServletRequestBuilder request(HttpMethod method, String urlTemplate, Object... uriVars) {
184+
return new MockHttpServletRequestBuilder(method, urlTemplate, uriVars);
185185
}
186186

187187
/**
@@ -207,10 +207,10 @@ public static MockHttpServletRequestBuilder request(String httpMethod, URI uri)
207207
/**
208208
* Create a {@link MockMultipartHttpServletRequestBuilder} for a multipart request.
209209
* @param urlTemplate a URL template; the resulting URL will be encoded
210-
* @param urlVars zero or more URL variables
210+
* @param uriVars zero or more URI variables
211211
*/
212-
public static MockMultipartHttpServletRequestBuilder fileUpload(String urlTemplate, Object... urlVars) {
213-
return new MockMultipartHttpServletRequestBuilder(urlTemplate, urlVars);
212+
public static MockMultipartHttpServletRequestBuilder fileUpload(String urlTemplate, Object... uriVars) {
213+
return new MockMultipartHttpServletRequestBuilder(urlTemplate, uriVars);
214214
}
215215

216216
/**

‎spring-test/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ public static FlashAttributeResultMatchers flash() {
8383
* Asserts the request was forwarded to the given URL.
8484
* <p>This method accepts exact matches against the expanded URL template.
8585
* @param urlTemplate a URL template; the expanded URL will be encoded
86-
* @param urlVars zero or more URL variables to populate the template
86+
* @param uriVars zero or more URI variables to populate the template
8787
* @see UriComponentsBuilder#fromUriString(String)
8888
*/
89-
public static ResultMatcher forwardedUrl(String urlTemplate, Object... urlVars) {
90-
String uri = UriComponentsBuilder.fromUriString(urlTemplate).buildAndExpand(urlVars).encode().toUriString();
89+
public static ResultMatcher forwardedUrl(String urlTemplate, Object... uriVars) {
90+
String uri = UriComponentsBuilder.fromUriString(urlTemplate).buildAndExpand(uriVars).encode().toUriString();
9191
return result -> assertEquals("Forwarded URL", uri, result.getResponse().getForwardedUrl());
9292
}
9393

@@ -111,11 +111,11 @@ public static ResultMatcher forwardedUrlPattern(String urlPattern) {
111111
* Asserts the request was redirected to the given URL.
112112
* <p>This method accepts exact matches against the expanded URL template.
113113
* @param urlTemplate a URL template; the expanded URL will be encoded
114-
* @param urlVars zero or more URL variables to populate the template
114+
* @param uriVars zero or more URI variables to populate the template
115115
* @see UriComponentsBuilder#fromUriString(String)
116116
*/
117-
public static ResultMatcher redirectedUrl(String urlTemplate, Object... urlVars) {
118-
String uri = UriComponentsBuilder.fromUriString(urlTemplate).buildAndExpand(urlVars).encode().toUriString();
117+
public static ResultMatcher redirectedUrl(String urlTemplate, Object... uriVars) {
118+
String uri = UriComponentsBuilder.fromUriString(urlTemplate).buildAndExpand(uriVars).encode().toUriString();
119119
return result -> assertEquals("Redirected URL", uri, result.getResponse().getRedirectedUrl());
120120
}
121121

‎spring-web/src/main/java/org/springframework/web/client/AsyncRestTemplate.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -221,11 +221,11 @@ public <T> ListenableFuture<ResponseEntity<T>> getForEntity(String url, Class<T>
221221

222222
@Override
223223
public <T> ListenableFuture<ResponseEntity<T>> getForEntity(String url, Class<T> responseType,
224-
Map<String, ?> urlVariables) throws RestClientException {
224+
Map<String, ?> uriVariables) throws RestClientException {
225225

226226
AsyncRequestCallback requestCallback = acceptHeaderRequestCallback(responseType);
227227
ResponseExtractor<ResponseEntity<T>> responseExtractor = responseEntityExtractor(responseType);
228-
return execute(url, HttpMethod.GET, requestCallback, responseExtractor, urlVariables);
228+
return execute(url, HttpMethod.GET, requestCallback, responseExtractor, uriVariables);
229229
}
230230

231231
@Override
@@ -348,13 +348,13 @@ public ListenableFuture<?> put(URI url, HttpEntity<?> request) throws RestClient
348348
// DELETE
349349

350350
@Override
351-
public ListenableFuture<?> delete(String url, Object... urlVariables) throws RestClientException {
352-
return execute(url, HttpMethod.DELETE, null, null, urlVariables);
351+
public ListenableFuture<?> delete(String url, Object... uriVariables) throws RestClientException {
352+
return execute(url, HttpMethod.DELETE, null, null, uriVariables);
353353
}
354354

355355
@Override
356-
public ListenableFuture<?> delete(String url, Map<String, ?> urlVariables) throws RestClientException {
357-
return execute(url, HttpMethod.DELETE, null, null, urlVariables);
356+
public ListenableFuture<?> delete(String url, Map<String, ?> uriVariables) throws RestClientException {
357+
return execute(url, HttpMethod.DELETE, null, null, uriVariables);
358358
}
359359

360360
@Override
@@ -459,17 +459,17 @@ public <T> ListenableFuture<ResponseEntity<T>> exchange(URI url, HttpMethod meth
459459

460460
@Override
461461
public <T> ListenableFuture<T> execute(String url, HttpMethod method, AsyncRequestCallback requestCallback,
462-
ResponseExtractor<T> responseExtractor, Object... urlVariables) throws RestClientException {
462+
ResponseExtractor<T> responseExtractor, Object... uriVariables) throws RestClientException {
463463

464-
URI expanded = getUriTemplateHandler().expand(url, urlVariables);
464+
URI expanded = getUriTemplateHandler().expand(url, uriVariables);
465465
return doExecute(expanded, method, requestCallback, responseExtractor);
466466
}
467467

468468
@Override
469469
public <T> ListenableFuture<T> execute(String url, HttpMethod method, AsyncRequestCallback requestCallback,
470-
ResponseExtractor<T> responseExtractor, Map<String, ?> urlVariables) throws RestClientException {
470+
ResponseExtractor<T> responseExtractor, Map<String, ?> uriVariables) throws RestClientException {
471471

472-
URI expanded = getUriTemplateHandler().expand(url, urlVariables);
472+
URI expanded = getUriTemplateHandler().expand(url, uriVariables);
473473
return doExecute(expanded, method, requestCallback, responseExtractor);
474474
}
475475

0 commit comments

Comments
 (0)