|
|
|
@ -280,19 +280,19 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat |
|
|
|
// GET
|
|
|
|
// GET
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public <T> T getForObject(String url, Class<T> responseType, Object... urlVariables) throws RestClientException { |
|
|
|
public <T> T getForObject(String url, Class<T> responseType, Object... uriVariables) throws RestClientException { |
|
|
|
RequestCallback requestCallback = acceptHeaderRequestCallback(responseType); |
|
|
|
RequestCallback requestCallback = acceptHeaderRequestCallback(responseType); |
|
|
|
HttpMessageConverterExtractor<T> responseExtractor = |
|
|
|
HttpMessageConverterExtractor<T> responseExtractor = |
|
|
|
new HttpMessageConverterExtractor<T>(responseType, getMessageConverters(), logger); |
|
|
|
new HttpMessageConverterExtractor<T>(responseType, getMessageConverters(), logger); |
|
|
|
return execute(url, HttpMethod.GET, requestCallback, responseExtractor, urlVariables); |
|
|
|
return execute(url, HttpMethod.GET, requestCallback, responseExtractor, uriVariables); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public <T> T getForObject(String url, Class<T> responseType, Map<String, ?> urlVariables) throws RestClientException { |
|
|
|
public <T> T getForObject(String url, Class<T> responseType, Map<String, ?> uriVariables) throws RestClientException { |
|
|
|
RequestCallback requestCallback = acceptHeaderRequestCallback(responseType); |
|
|
|
RequestCallback requestCallback = acceptHeaderRequestCallback(responseType); |
|
|
|
HttpMessageConverterExtractor<T> responseExtractor = |
|
|
|
HttpMessageConverterExtractor<T> responseExtractor = |
|
|
|
new HttpMessageConverterExtractor<T>(responseType, getMessageConverters(), logger); |
|
|
|
new HttpMessageConverterExtractor<T>(responseType, getMessageConverters(), logger); |
|
|
|
return execute(url, HttpMethod.GET, requestCallback, responseExtractor, urlVariables); |
|
|
|
return execute(url, HttpMethod.GET, requestCallback, responseExtractor, uriVariables); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
@ -304,21 +304,21 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public <T> ResponseEntity<T> getForEntity(String url, Class<T> responseType, Object... urlVariables) |
|
|
|
public <T> ResponseEntity<T> getForEntity(String url, Class<T> responseType, Object... uriVariables) |
|
|
|
throws RestClientException { |
|
|
|
throws RestClientException { |
|
|
|
|
|
|
|
|
|
|
|
RequestCallback requestCallback = acceptHeaderRequestCallback(responseType); |
|
|
|
RequestCallback requestCallback = acceptHeaderRequestCallback(responseType); |
|
|
|
ResponseExtractor<ResponseEntity<T>> responseExtractor = responseEntityExtractor(responseType); |
|
|
|
ResponseExtractor<ResponseEntity<T>> responseExtractor = responseEntityExtractor(responseType); |
|
|
|
return execute(url, HttpMethod.GET, requestCallback, responseExtractor, urlVariables); |
|
|
|
return execute(url, HttpMethod.GET, requestCallback, responseExtractor, uriVariables); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public <T> ResponseEntity<T> getForEntity(String url, Class<T> responseType, Map<String, ?> urlVariables) |
|
|
|
public <T> ResponseEntity<T> getForEntity(String url, Class<T> responseType, Map<String, ?> uriVariables) |
|
|
|
throws RestClientException { |
|
|
|
throws RestClientException { |
|
|
|
|
|
|
|
|
|
|
|
RequestCallback requestCallback = acceptHeaderRequestCallback(responseType); |
|
|
|
RequestCallback requestCallback = acceptHeaderRequestCallback(responseType); |
|
|
|
ResponseExtractor<ResponseEntity<T>> responseExtractor = responseEntityExtractor(responseType); |
|
|
|
ResponseExtractor<ResponseEntity<T>> responseExtractor = responseEntityExtractor(responseType); |
|
|
|
return execute(url, HttpMethod.GET, requestCallback, responseExtractor, urlVariables); |
|
|
|
return execute(url, HttpMethod.GET, requestCallback, responseExtractor, uriVariables); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
@ -332,13 +332,13 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat |
|
|
|
// HEAD
|
|
|
|
// HEAD
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public HttpHeaders headForHeaders(String url, Object... urlVariables) throws RestClientException { |
|
|
|
public HttpHeaders headForHeaders(String url, Object... uriVariables) throws RestClientException { |
|
|
|
return execute(url, HttpMethod.HEAD, null, headersExtractor(), urlVariables); |
|
|
|
return execute(url, HttpMethod.HEAD, null, headersExtractor(), uriVariables); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public HttpHeaders headForHeaders(String url, Map<String, ?> urlVariables) throws RestClientException { |
|
|
|
public HttpHeaders headForHeaders(String url, Map<String, ?> uriVariables) throws RestClientException { |
|
|
|
return execute(url, HttpMethod.HEAD, null, headersExtractor(), urlVariables); |
|
|
|
return execute(url, HttpMethod.HEAD, null, headersExtractor(), uriVariables); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
@ -350,16 +350,16 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat |
|
|
|
// POST
|
|
|
|
// POST
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@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); |
|
|
|
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(); |
|
|
|
return headers.getLocation(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public URI postForLocation(String url, Object request, Map<String, ?> urlVariables) throws RestClientException { |
|
|
|
public URI postForLocation(String url, Object request, Map<String, ?> uriVariables) throws RestClientException { |
|
|
|
RequestCallback requestCallback = httpEntityCallback(request); |
|
|
|
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(); |
|
|
|
return headers.getLocation(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -427,15 +427,15 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat |
|
|
|
// PUT
|
|
|
|
// PUT
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@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); |
|
|
|
RequestCallback requestCallback = httpEntityCallback(request); |
|
|
|
execute(url, HttpMethod.PUT, requestCallback, null, urlVariables); |
|
|
|
execute(url, HttpMethod.PUT, requestCallback, null, uriVariables); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public void put(String url, Object request, Map<String, ?> urlVariables) throws RestClientException { |
|
|
|
public void put(String url, Object request, Map<String, ?> uriVariables) throws RestClientException { |
|
|
|
RequestCallback requestCallback = httpEntityCallback(request); |
|
|
|
RequestCallback requestCallback = httpEntityCallback(request); |
|
|
|
execute(url, HttpMethod.PUT, requestCallback, null, urlVariables); |
|
|
|
execute(url, HttpMethod.PUT, requestCallback, null, uriVariables); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
@ -448,13 +448,13 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat |
|
|
|
// DELETE
|
|
|
|
// DELETE
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public void delete(String url, Object... urlVariables) throws RestClientException { |
|
|
|
public void delete(String url, Object... uriVariables) throws RestClientException { |
|
|
|
execute(url, HttpMethod.DELETE, null, null, urlVariables); |
|
|
|
execute(url, HttpMethod.DELETE, null, null, uriVariables); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public void delete(String url, Map<String, ?> urlVariables) throws RestClientException { |
|
|
|
public void delete(String url, Map<String, ?> uriVariables) throws RestClientException { |
|
|
|
execute(url, HttpMethod.DELETE, null, null, urlVariables); |
|
|
|
execute(url, HttpMethod.DELETE, null, null, uriVariables); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
@ -466,16 +466,16 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat |
|
|
|
// OPTIONS
|
|
|
|
// OPTIONS
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public Set<HttpMethod> optionsForAllow(String url, Object... urlVariables) throws RestClientException { |
|
|
|
public Set<HttpMethod> optionsForAllow(String url, Object... uriVariables) throws RestClientException { |
|
|
|
ResponseExtractor<HttpHeaders> headersExtractor = headersExtractor(); |
|
|
|
ResponseExtractor<HttpHeaders> headersExtractor = headersExtractor(); |
|
|
|
HttpHeaders headers = execute(url, HttpMethod.OPTIONS, null, headersExtractor, urlVariables); |
|
|
|
HttpHeaders headers = execute(url, HttpMethod.OPTIONS, null, headersExtractor, uriVariables); |
|
|
|
return headers.getAllow(); |
|
|
|
return headers.getAllow(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public Set<HttpMethod> optionsForAllow(String url, Map<String, ?> urlVariables) throws RestClientException { |
|
|
|
public Set<HttpMethod> optionsForAllow(String url, Map<String, ?> uriVariables) throws RestClientException { |
|
|
|
ResponseExtractor<HttpHeaders> headersExtractor = headersExtractor(); |
|
|
|
ResponseExtractor<HttpHeaders> headersExtractor = headersExtractor(); |
|
|
|
HttpHeaders headers = execute(url, HttpMethod.OPTIONS, null, headersExtractor, urlVariables); |
|
|
|
HttpHeaders headers = execute(url, HttpMethod.OPTIONS, null, headersExtractor, uriVariables); |
|
|
|
return headers.getAllow(); |
|
|
|
return headers.getAllow(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -574,17 +574,17 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public <T> T execute(String url, HttpMethod method, RequestCallback requestCallback, |
|
|
|
public <T> T execute(String url, HttpMethod method, RequestCallback requestCallback, |
|
|
|
ResponseExtractor<T> responseExtractor, Object... urlVariables) throws RestClientException { |
|
|
|
ResponseExtractor<T> responseExtractor, Object... uriVariables) throws RestClientException { |
|
|
|
|
|
|
|
|
|
|
|
URI expanded = getUriTemplateHandler().expand(url, urlVariables); |
|
|
|
URI expanded = getUriTemplateHandler().expand(url, uriVariables); |
|
|
|
return doExecute(expanded, method, requestCallback, responseExtractor); |
|
|
|
return doExecute(expanded, method, requestCallback, responseExtractor); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public <T> T execute(String url, HttpMethod method, RequestCallback requestCallback, |
|
|
|
public <T> T execute(String url, HttpMethod method, RequestCallback requestCallback, |
|
|
|
ResponseExtractor<T> responseExtractor, Map<String, ?> urlVariables) throws RestClientException { |
|
|
|
ResponseExtractor<T> responseExtractor, Map<String, ?> uriVariables) throws RestClientException { |
|
|
|
|
|
|
|
|
|
|
|
URI expanded = getUriTemplateHandler().expand(url, urlVariables); |
|
|
|
URI expanded = getUriTemplateHandler().expand(url, uriVariables); |
|
|
|
return doExecute(expanded, method, requestCallback, responseExtractor); |
|
|
|
return doExecute(expanded, method, requestCallback, responseExtractor); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|