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

Consistent use of "URI variables" terminology

Browse Source 
Issue: SPR-14969
This commit is contained in:
Juergen Hoeller
2016-12-01 12:30:10 +01:00
parent d41d3aa1d6
commit 7a8ec4f6eb
7 changed files with 103 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
View File

@@ -126,7 +126,7 @@ public class MockHttpServletRequestBuilder
* {@link #with(RequestPostProcessor)}.
* @param httpMethod the HTTP method (GET, POST, etc)
* @param url a URL template; the resulting URL will be encoded
* @param vars zero or more URL variables
* @param vars zero or more URI variables
*/
MockHttpServletRequestBuilder(HttpMethod httpMethod, String url, Object... vars) {
this(httpMethod.name(), UriComponentsBuilder.fromUriString(url).buildAndExpand(vars).encode().toUri());

6
spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java
View File

@@ -46,10 +46,10 @@ public class MockMultipartHttpServletRequestBuilder extends MockHttpServletReque
* see {@link #with(RequestPostProcessor)} and the
* {@link RequestPostProcessor} extension point.
* @param urlTemplate a URL template; the resulting URL will be encoded
* @param urlVariables zero or more URL variables
* @param uriVariables zero or more URI variables
*/
MockMultipartHttpServletRequestBuilder(String urlTemplate, Object... urlVariables) {
super(HttpMethod.POST, urlTemplate, urlVariables);
MockMultipartHttpServletRequestBuilder(String urlTemplate, Object... uriVariables) {
super(HttpMethod.POST, urlTemplate, uriVariables);
super.contentType(MediaType.MULTIPART_FORM_DATA);
}

54
spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java
View File

@@ -50,10 +50,10 @@ public abstract class MockMvcRequestBuilders {
/**
* Create a {@link MockHttpServletRequestBuilder} for a GET request.
* @param urlTemplate a URL template; the resulting URL will be encoded
* @param urlVars zero or more URL variables
* @param uriVars zero or more URI variables
*/
public static MockHttpServletRequestBuilder get(String urlTemplate, Object... urlVars) {
return new MockHttpServletRequestBuilder(HttpMethod.GET, urlTemplate, urlVars);
public static MockHttpServletRequestBuilder get(String urlTemplate, Object... uriVars) {
return new MockHttpServletRequestBuilder(HttpMethod.GET, urlTemplate, uriVars);
}
/**
@@ -68,10 +68,10 @@ public abstract class MockMvcRequestBuilders {
/**
* Create a {@link MockHttpServletRequestBuilder} for a POST request.
* @param urlTemplate a URL template; the resulting URL will be encoded
* @param urlVars zero or more URL variables
* @param uriVars zero or more URI variables
*/
public static MockHttpServletRequestBuilder post(String urlTemplate, Object... urlVars) {
return new MockHttpServletRequestBuilder(HttpMethod.POST, urlTemplate, urlVars);
public static MockHttpServletRequestBuilder post(String urlTemplate, Object... uriVars) {
return new MockHttpServletRequestBuilder(HttpMethod.POST, urlTemplate, uriVars);
}
/**
@@ -86,10 +86,10 @@ public abstract class MockMvcRequestBuilders {
/**
* Create a {@link MockHttpServletRequestBuilder} for a PUT request.
* @param urlTemplate a URL template; the resulting URL will be encoded
* @param urlVars zero or more URL variables
* @param uriVars zero or more URI variables
*/
public static MockHttpServletRequestBuilder put(String urlTemplate, Object... urlVars) {
return new MockHttpServletRequestBuilder(HttpMethod.PUT, urlTemplate, urlVars);
public static MockHttpServletRequestBuilder put(String urlTemplate, Object... uriVars) {
return new MockHttpServletRequestBuilder(HttpMethod.PUT, urlTemplate, uriVars);
}
/**
@@ -104,10 +104,10 @@ public abstract class MockMvcRequestBuilders {
/**
* Create a {@link MockHttpServletRequestBuilder} for a PATCH request.
* @param urlTemplate a URL template; the resulting URL will be encoded
* @param urlVars zero or more URL variables
* @param uriVars zero or more URI variables
*/
public static MockHttpServletRequestBuilder patch(String urlTemplate, Object... urlVars) {
return new MockHttpServletRequestBuilder(HttpMethod.PATCH, urlTemplate, urlVars);
public static MockHttpServletRequestBuilder patch(String urlTemplate, Object... uriVars) {
return new MockHttpServletRequestBuilder(HttpMethod.PATCH, urlTemplate, uriVars);
}
/**
@@ -122,10 +122,10 @@ public abstract class MockMvcRequestBuilders {
/**
* Create a {@link MockHttpServletRequestBuilder} for a DELETE request.
* @param urlTemplate a URL template; the resulting URL will be encoded
* @param urlVars zero or more URL variables
* @param uriVars zero or more URI variables
*/
public static MockHttpServletRequestBuilder delete(String urlTemplate, Object... urlVars) {
return new MockHttpServletRequestBuilder(HttpMethod.DELETE, urlTemplate, urlVars);
public static MockHttpServletRequestBuilder delete(String urlTemplate, Object... uriVars) {
return new MockHttpServletRequestBuilder(HttpMethod.DELETE, urlTemplate, uriVars);
}
/**
@@ -140,10 +140,10 @@ public abstract class MockMvcRequestBuilders {
/**
* Create a {@link MockHttpServletRequestBuilder} for an OPTIONS request.
* @param urlTemplate a URL template; the resulting URL will be encoded
* @param urlVars zero or more URL variables
* @param uriVars zero or more URI variables
*/
public static MockHttpServletRequestBuilder options(String urlTemplate, Object... urlVars) {
return new MockHttpServletRequestBuilder(HttpMethod.OPTIONS, urlTemplate, urlVars);
public static MockHttpServletRequestBuilder options(String urlTemplate, Object... uriVars) {
return new MockHttpServletRequestBuilder(HttpMethod.OPTIONS, urlTemplate, uriVars);
}
/**
@@ -158,11 +158,11 @@ public abstract class MockMvcRequestBuilders {
/**
* Create a {@link MockHttpServletRequestBuilder} for a HEAD request.
* @param urlTemplate a URL template; the resulting URL will be encoded
* @param urlVars zero or more URL variables
* @param uriVars zero or more URI variables
* @since 4.1
*/
public static MockHttpServletRequestBuilder head(String urlTemplate, Object... urlVars) {
return new MockHttpServletRequestBuilder(HttpMethod.HEAD, urlTemplate, urlVars);
public static MockHttpServletRequestBuilder head(String urlTemplate, Object... uriVars) {
return new MockHttpServletRequestBuilder(HttpMethod.HEAD, urlTemplate, uriVars);
}
/**
@@ -178,10 +178,10 @@ public abstract class MockMvcRequestBuilders {
* Create a {@link MockHttpServletRequestBuilder} for a request with the given HTTP method.
* @param method the HTTP method (GET, POST, etc)
* @param urlTemplate a URL template; the resulting URL will be encoded
* @param urlVars zero or more URL variables
* @param uriVars zero or more URI variables
*/
public static MockHttpServletRequestBuilder request(HttpMethod method, String urlTemplate, Object... urlVars) {
return new MockHttpServletRequestBuilder(method, urlTemplate, urlVars);
public static MockHttpServletRequestBuilder request(HttpMethod method, String urlTemplate, Object... uriVars) {
return new MockHttpServletRequestBuilder(method, urlTemplate, uriVars);
}
/**
@@ -207,10 +207,10 @@ public abstract class MockMvcRequestBuilders {
/**
* Create a {@link MockMultipartHttpServletRequestBuilder} for a multipart request.
* @param urlTemplate a URL template; the resulting URL will be encoded
* @param urlVars zero or more URL variables
* @param uriVars zero or more URI variables
*/
public static MockMultipartHttpServletRequestBuilder fileUpload(String urlTemplate, Object... urlVars) {
return new MockMultipartHttpServletRequestBuilder(urlTemplate, urlVars);
public static MockMultipartHttpServletRequestBuilder fileUpload(String urlTemplate, Object... uriVars) {
return new MockMultipartHttpServletRequestBuilder(urlTemplate, uriVars);
}
/**

12
spring-test/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java
View File

@@ -83,11 +83,11 @@ public abstract class MockMvcResultMatchers {
* Asserts the request was forwarded to the given URL.
* <p>This method accepts exact matches against the expanded URL template.
* @param urlTemplate a URL template; the expanded URL will be encoded
* @param urlVars zero or more URL variables to populate the template
* @param uriVars zero or more URI variables to populate the template
* @see UriComponentsBuilder#fromUriString(String)
*/
public static ResultMatcher forwardedUrl(String urlTemplate, Object... urlVars) {
String uri = UriComponentsBuilder.fromUriString(urlTemplate).buildAndExpand(urlVars).encode().toUriString();
public static ResultMatcher forwardedUrl(String urlTemplate, Object... uriVars) {
String uri = UriComponentsBuilder.fromUriString(urlTemplate).buildAndExpand(uriVars).encode().toUriString();
return result -> assertEquals("Forwarded URL", uri, result.getResponse().getForwardedUrl());
}
@@ -111,11 +111,11 @@ public abstract class MockMvcResultMatchers {
* Asserts the request was redirected to the given URL.
* <p>This method accepts exact matches against the expanded URL template.
* @param urlTemplate a URL template; the expanded URL will be encoded
* @param urlVars zero or more URL variables to populate the template
* @param uriVars zero or more URI variables to populate the template
* @see UriComponentsBuilder#fromUriString(String)
*/
public static ResultMatcher redirectedUrl(String urlTemplate, Object... urlVars) {
String uri = UriComponentsBuilder.fromUriString(urlTemplate).buildAndExpand(urlVars).encode().toUriString();
public static ResultMatcher redirectedUrl(String urlTemplate, Object... uriVars) {
String uri = UriComponentsBuilder.fromUriString(urlTemplate).buildAndExpand(uriVars).encode().toUriString();
return result -> assertEquals("Redirected URL", uri, result.getResponse().getRedirectedUrl());
}