Browse Source

Polishing

pull/30957/head
Juergen Hoeller 2 years ago
parent
commit
ccaccda6ca
  1. 2
      spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/DefaultJdbcClient.java
  2. 19
      spring-web/src/main/java/org/springframework/web/client/DefaultRestClient.java

2
spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/DefaultJdbcClient.java

@ -48,7 +48,7 @@ import org.springframework.util.Assert;
* @see JdbcClient#create(JdbcOperations) * @see JdbcClient#create(JdbcOperations)
* @see JdbcClient#create(NamedParameterJdbcOperations) * @see JdbcClient#create(NamedParameterJdbcOperations)
*/ */
class DefaultJdbcClient implements JdbcClient { final class DefaultJdbcClient implements JdbcClient {
private final JdbcOperations classicOps; private final JdbcOperations classicOps;

19
spring-web/src/main/java/org/springframework/web/client/DefaultRestClient.java

@ -59,10 +59,14 @@ import org.springframework.web.util.UriBuilder;
import org.springframework.web.util.UriBuilderFactory; import org.springframework.web.util.UriBuilderFactory;
/** /**
* Default implementation of {@link RestClient}. * The default implementation of {@link RestClient},
* as created by the static factory methods.
* *
* @author Arjen Poutsma * @author Arjen Poutsma
* @since 6.1 * @since 6.1
* @see RestClient#create()
* @see RestClient#create(String)
* @see RestClient#create(RestTemplate)
*/ */
final class DefaultRestClient implements RestClient { final class DefaultRestClient implements RestClient {
@ -94,7 +98,8 @@ final class DefaultRestClient implements RestClient {
private final List<HttpMessageConverter<?>> messageConverters; private final List<HttpMessageConverter<?>> messageConverters;
DefaultRestClient(ClientHttpRequestFactory clientRequestFactory, @Nullable List<ClientHttpRequestInterceptor> interceptors, DefaultRestClient(ClientHttpRequestFactory clientRequestFactory,
@Nullable List<ClientHttpRequestInterceptor> interceptors,
@Nullable List<ClientHttpRequestInitializer> initializers, @Nullable List<ClientHttpRequestInitializer> initializers,
UriBuilderFactory uriBuilderFactory, UriBuilderFactory uriBuilderFactory,
@Nullable HttpHeaders defaultHeaders, @Nullable HttpHeaders defaultHeaders,
@ -107,7 +112,7 @@ final class DefaultRestClient implements RestClient {
this.interceptors = interceptors; this.interceptors = interceptors;
this.uriBuilderFactory = uriBuilderFactory; this.uriBuilderFactory = uriBuilderFactory;
this.defaultHeaders = defaultHeaders; this.defaultHeaders = defaultHeaders;
this.defaultStatusHandlers = (statusHandlers != null) ? new ArrayList<>(statusHandlers) : new ArrayList<>(); this.defaultStatusHandlers = (statusHandlers != null ? new ArrayList<>(statusHandlers) : new ArrayList<>());
this.messageConverters = messageConverters; this.messageConverters = messageConverters;
this.builder = builder; this.builder = builder;
} }
@ -185,7 +190,6 @@ final class DefaultRestClient implements RestClient {
this.httpMethod = httpMethod; this.httpMethod = httpMethod;
} }
@Override @Override
public RequestBodySpec uri(String uriTemplate, Object... uriVariables) { public RequestBodySpec uri(String uriTemplate, Object... uriVariables) {
attribute(URI_TEMPLATE_ATTRIBUTE, uriTemplate); attribute(URI_TEMPLATE_ATTRIBUTE, uriTemplate);
@ -457,6 +461,7 @@ final class DefaultRestClient implements RestClient {
} }
} }
private class DefaultResponseSpec implements ResponseSpec { private class DefaultResponseSpec implements ResponseSpec {
private final HttpRequest clientRequest; private final HttpRequest clientRequest;
@ -467,7 +472,6 @@ final class DefaultRestClient implements RestClient {
private final int defaultStatusHandlerCount; private final int defaultStatusHandlerCount;
DefaultResponseSpec(HttpRequest clientRequest, ClientHttpResponse clientResponse) { DefaultResponseSpec(HttpRequest clientRequest, ClientHttpResponse clientResponse) {
this.clientRequest = clientRequest; this.clientRequest = clientRequest;
this.clientResponse = clientResponse; this.clientResponse = clientResponse;
@ -548,7 +552,6 @@ final class DefaultRestClient implements RestClient {
} }
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private static <T> Class<T> bodyClass(Type type) { private static <T> Class<T> bodyClass(Type type) {
if (type instanceof Class<?> clazz) { if (type instanceof Class<?> clazz) {
@ -561,8 +564,7 @@ final class DefaultRestClient implements RestClient {
return (Class<T>) Object.class; return (Class<T>) Object.class;
} }
@SuppressWarnings({"rawtypes", "unchecked"})
@SuppressWarnings({"unchecked", "rawtypes"})
private <T> T readWithMessageConverters(Type bodyType, Class<T> bodyClass) { private <T> T readWithMessageConverters(Type bodyType, Class<T> bodyClass) {
MediaType contentType = getContentType(); MediaType contentType = getContentType();
@ -611,7 +613,6 @@ final class DefaultRestClient implements RestClient {
} }
} }
} }
} }
} }

Loading…
Cancel
Save