diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/DefaultJdbcClient.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/DefaultJdbcClient.java index 61bad19c499..155de603531 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/DefaultJdbcClient.java +++ b/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(NamedParameterJdbcOperations) */ -class DefaultJdbcClient implements JdbcClient { +final class DefaultJdbcClient implements JdbcClient { private final JdbcOperations classicOps; diff --git a/spring-web/src/main/java/org/springframework/web/client/DefaultRestClient.java b/spring-web/src/main/java/org/springframework/web/client/DefaultRestClient.java index 64c5366fefd..00a7a1632dd 100644 --- a/spring-web/src/main/java/org/springframework/web/client/DefaultRestClient.java +++ b/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; /** - * Default implementation of {@link RestClient}. + * The default implementation of {@link RestClient}, + * as created by the static factory methods. * * @author Arjen Poutsma * @since 6.1 + * @see RestClient#create() + * @see RestClient#create(String) + * @see RestClient#create(RestTemplate) */ final class DefaultRestClient implements RestClient { @@ -94,7 +98,8 @@ final class DefaultRestClient implements RestClient { private final List> messageConverters; - DefaultRestClient(ClientHttpRequestFactory clientRequestFactory, @Nullable List interceptors, + DefaultRestClient(ClientHttpRequestFactory clientRequestFactory, + @Nullable List interceptors, @Nullable List initializers, UriBuilderFactory uriBuilderFactory, @Nullable HttpHeaders defaultHeaders, @@ -107,7 +112,7 @@ final class DefaultRestClient implements RestClient { this.interceptors = interceptors; this.uriBuilderFactory = uriBuilderFactory; 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.builder = builder; } @@ -185,7 +190,6 @@ final class DefaultRestClient implements RestClient { this.httpMethod = httpMethod; } - @Override public RequestBodySpec uri(String uriTemplate, Object... uriVariables) { attribute(URI_TEMPLATE_ATTRIBUTE, uriTemplate); @@ -457,6 +461,7 @@ final class DefaultRestClient implements RestClient { } } + private class DefaultResponseSpec implements ResponseSpec { private final HttpRequest clientRequest; @@ -467,7 +472,6 @@ final class DefaultRestClient implements RestClient { private final int defaultStatusHandlerCount; - DefaultResponseSpec(HttpRequest clientRequest, ClientHttpResponse clientResponse) { this.clientRequest = clientRequest; this.clientResponse = clientResponse; @@ -548,7 +552,6 @@ final class DefaultRestClient implements RestClient { } } - @SuppressWarnings("unchecked") private static Class bodyClass(Type type) { if (type instanceof Class clazz) { @@ -561,8 +564,7 @@ final class DefaultRestClient implements RestClient { return (Class) Object.class; } - - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({"rawtypes", "unchecked"}) private T readWithMessageConverters(Type bodyType, Class bodyClass) { MediaType contentType = getContentType(); @@ -611,7 +613,6 @@ final class DefaultRestClient implements RestClient { } } } - } }