diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java index cff0d2c1a79..64a364c1831 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java @@ -129,7 +129,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()); diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java index b56e8a9f152..9b7d1f14df1 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 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. @@ -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); } diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java index f0e21adbe8e..17322025a53 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java @@ -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); } /** diff --git a/spring-web/src/main/java/org/springframework/web/client/AsyncRestTemplate.java b/spring-web/src/main/java/org/springframework/web/client/AsyncRestTemplate.java index acbe795361b..cd0df5ba02f 100644 --- a/spring-web/src/main/java/org/springframework/web/client/AsyncRestTemplate.java +++ b/spring-web/src/main/java/org/springframework/web/client/AsyncRestTemplate.java @@ -221,11 +221,11 @@ public class AsyncRestTemplate extends InterceptingAsyncHttpAccessor implements @Override public ListenableFuture> getForEntity(String url, Class responseType, - Map urlVariables) throws RestClientException { + Map uriVariables) throws RestClientException { AsyncRequestCallback requestCallback = acceptHeaderRequestCallback(responseType); ResponseExtractor> responseExtractor = responseEntityExtractor(responseType); - return execute(url, HttpMethod.GET, requestCallback, responseExtractor, urlVariables); + return execute(url, HttpMethod.GET, requestCallback, responseExtractor, uriVariables); } @Override @@ -348,13 +348,13 @@ public class AsyncRestTemplate extends InterceptingAsyncHttpAccessor implements // DELETE @Override - public ListenableFuture delete(String url, Object... urlVariables) throws RestClientException { - return execute(url, HttpMethod.DELETE, null, null, urlVariables); + public ListenableFuture delete(String url, Object... uriVariables) throws RestClientException { + return execute(url, HttpMethod.DELETE, null, null, uriVariables); } @Override - public ListenableFuture delete(String url, Map urlVariables) throws RestClientException { - return execute(url, HttpMethod.DELETE, null, null, urlVariables); + public ListenableFuture delete(String url, Map uriVariables) throws RestClientException { + return execute(url, HttpMethod.DELETE, null, null, uriVariables); } @Override @@ -459,17 +459,17 @@ public class AsyncRestTemplate extends InterceptingAsyncHttpAccessor implements @Override public ListenableFuture execute(String url, HttpMethod method, AsyncRequestCallback requestCallback, - ResponseExtractor responseExtractor, Object... urlVariables) throws RestClientException { + ResponseExtractor responseExtractor, Object... uriVariables) throws RestClientException { - URI expanded = getUriTemplateHandler().expand(url, urlVariables); + URI expanded = getUriTemplateHandler().expand(url, uriVariables); return doExecute(expanded, method, requestCallback, responseExtractor); } @Override public ListenableFuture execute(String url, HttpMethod method, AsyncRequestCallback requestCallback, - ResponseExtractor responseExtractor, Map urlVariables) throws RestClientException { + ResponseExtractor responseExtractor, Map uriVariables) throws RestClientException { - URI expanded = getUriTemplateHandler().expand(url, urlVariables); + URI expanded = getUriTemplateHandler().expand(url, uriVariables); return doExecute(expanded, method, requestCallback, responseExtractor); } diff --git a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java index 8a7f79a2ae0..24312094fe6 100644 --- a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java +++ b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java @@ -280,19 +280,19 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat // GET @Override - public T getForObject(String url, Class responseType, Object... urlVariables) throws RestClientException { + public T getForObject(String url, Class responseType, Object... uriVariables) throws RestClientException { RequestCallback requestCallback = acceptHeaderRequestCallback(responseType); HttpMessageConverterExtractor responseExtractor = new HttpMessageConverterExtractor(responseType, getMessageConverters(), logger); - return execute(url, HttpMethod.GET, requestCallback, responseExtractor, urlVariables); + return execute(url, HttpMethod.GET, requestCallback, responseExtractor, uriVariables); } @Override - public T getForObject(String url, Class responseType, Map urlVariables) throws RestClientException { + public T getForObject(String url, Class responseType, Map uriVariables) throws RestClientException { RequestCallback requestCallback = acceptHeaderRequestCallback(responseType); HttpMessageConverterExtractor responseExtractor = new HttpMessageConverterExtractor(responseType, getMessageConverters(), logger); - return execute(url, HttpMethod.GET, requestCallback, responseExtractor, urlVariables); + return execute(url, HttpMethod.GET, requestCallback, responseExtractor, uriVariables); } @Override @@ -304,21 +304,21 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat } @Override - public ResponseEntity getForEntity(String url, Class responseType, Object... urlVariables) + public ResponseEntity getForEntity(String url, Class responseType, Object... uriVariables) throws RestClientException { RequestCallback requestCallback = acceptHeaderRequestCallback(responseType); ResponseExtractor> responseExtractor = responseEntityExtractor(responseType); - return execute(url, HttpMethod.GET, requestCallback, responseExtractor, urlVariables); + return execute(url, HttpMethod.GET, requestCallback, responseExtractor, uriVariables); } @Override - public ResponseEntity getForEntity(String url, Class responseType, Map urlVariables) + public ResponseEntity getForEntity(String url, Class responseType, Map uriVariables) throws RestClientException { RequestCallback requestCallback = acceptHeaderRequestCallback(responseType); ResponseExtractor> responseExtractor = responseEntityExtractor(responseType); - return execute(url, HttpMethod.GET, requestCallback, responseExtractor, urlVariables); + return execute(url, HttpMethod.GET, requestCallback, responseExtractor, uriVariables); } @Override @@ -332,13 +332,13 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat // HEAD @Override - public HttpHeaders headForHeaders(String url, Object... urlVariables) throws RestClientException { - return execute(url, HttpMethod.HEAD, null, headersExtractor(), urlVariables); + public HttpHeaders headForHeaders(String url, Object... uriVariables) throws RestClientException { + return execute(url, HttpMethod.HEAD, null, headersExtractor(), uriVariables); } @Override - public HttpHeaders headForHeaders(String url, Map urlVariables) throws RestClientException { - return execute(url, HttpMethod.HEAD, null, headersExtractor(), urlVariables); + public HttpHeaders headForHeaders(String url, Map uriVariables) throws RestClientException { + return execute(url, HttpMethod.HEAD, null, headersExtractor(), uriVariables); } @Override @@ -350,16 +350,16 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat // POST @Override - public URI postForLocation(String url, Object request, Object... urlVariables) throws RestClientException { + public URI postForLocation(String url, Object request, Object... uriVariables) throws RestClientException { RequestCallback requestCallback = httpEntityCallback(request); - HttpHeaders headers = execute(url, HttpMethod.POST, requestCallback, headersExtractor(), urlVariables); + HttpHeaders headers = execute(url, HttpMethod.POST, requestCallback, headersExtractor(), uriVariables); return headers.getLocation(); } @Override - public URI postForLocation(String url, Object request, Map urlVariables) throws RestClientException { + public URI postForLocation(String url, Object request, Map uriVariables) throws RestClientException { RequestCallback requestCallback = httpEntityCallback(request); - HttpHeaders headers = execute(url, HttpMethod.POST, requestCallback, headersExtractor(), urlVariables); + HttpHeaders headers = execute(url, HttpMethod.POST, requestCallback, headersExtractor(), uriVariables); return headers.getLocation(); } @@ -427,15 +427,15 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat // PUT @Override - public void put(String url, Object request, Object... urlVariables) throws RestClientException { + public void put(String url, Object request, Object... uriVariables) throws RestClientException { RequestCallback requestCallback = httpEntityCallback(request); - execute(url, HttpMethod.PUT, requestCallback, null, urlVariables); + execute(url, HttpMethod.PUT, requestCallback, null, uriVariables); } @Override - public void put(String url, Object request, Map urlVariables) throws RestClientException { + public void put(String url, Object request, Map uriVariables) throws RestClientException { RequestCallback requestCallback = httpEntityCallback(request); - execute(url, HttpMethod.PUT, requestCallback, null, urlVariables); + execute(url, HttpMethod.PUT, requestCallback, null, uriVariables); } @Override @@ -448,13 +448,13 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat // DELETE @Override - public void delete(String url, Object... urlVariables) throws RestClientException { - execute(url, HttpMethod.DELETE, null, null, urlVariables); + public void delete(String url, Object... uriVariables) throws RestClientException { + execute(url, HttpMethod.DELETE, null, null, uriVariables); } @Override - public void delete(String url, Map urlVariables) throws RestClientException { - execute(url, HttpMethod.DELETE, null, null, urlVariables); + public void delete(String url, Map uriVariables) throws RestClientException { + execute(url, HttpMethod.DELETE, null, null, uriVariables); } @Override @@ -466,16 +466,16 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat // OPTIONS @Override - public Set optionsForAllow(String url, Object... urlVariables) throws RestClientException { + public Set optionsForAllow(String url, Object... uriVariables) throws RestClientException { ResponseExtractor headersExtractor = headersExtractor(); - HttpHeaders headers = execute(url, HttpMethod.OPTIONS, null, headersExtractor, urlVariables); + HttpHeaders headers = execute(url, HttpMethod.OPTIONS, null, headersExtractor, uriVariables); return headers.getAllow(); } @Override - public Set optionsForAllow(String url, Map urlVariables) throws RestClientException { + public Set optionsForAllow(String url, Map uriVariables) throws RestClientException { ResponseExtractor headersExtractor = headersExtractor(); - HttpHeaders headers = execute(url, HttpMethod.OPTIONS, null, headersExtractor, urlVariables); + HttpHeaders headers = execute(url, HttpMethod.OPTIONS, null, headersExtractor, uriVariables); return headers.getAllow(); } @@ -574,17 +574,17 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat @Override public T execute(String url, HttpMethod method, RequestCallback requestCallback, - ResponseExtractor responseExtractor, Object... urlVariables) throws RestClientException { + ResponseExtractor responseExtractor, Object... uriVariables) throws RestClientException { - URI expanded = getUriTemplateHandler().expand(url, urlVariables); + URI expanded = getUriTemplateHandler().expand(url, uriVariables); return doExecute(expanded, method, requestCallback, responseExtractor); } @Override public T execute(String url, HttpMethod method, RequestCallback requestCallback, - ResponseExtractor responseExtractor, Map urlVariables) throws RestClientException { + ResponseExtractor responseExtractor, Map uriVariables) throws RestClientException { - URI expanded = getUriTemplateHandler().expand(url, urlVariables); + URI expanded = getUriTemplateHandler().expand(url, uriVariables); return doExecute(expanded, method, requestCallback, responseExtractor); }