root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Polishing in DefaultRestClientBuilder 

Align order of fields with order of methods on Builder.
This commit is contained in:
rstoyanchev 2025-01-08 15:52:32 +00:00
parent 4b9be5aaf8
commit 82941caa00
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
spring-web/src/main/java/org/springframework/web/client/DefaultRestClientBuilder.java
View File

@ -133,16 +133,16 @@ final class DefaultRestClientBuilder implements RestClient.Builder {
private @Nullable List<StatusHandler> statusHandlers; private @Nullable List<StatusHandler> statusHandlers;
private @Nullable ClientHttpRequestFactory requestFactory;
private @Nullable List<HttpMessageConverter<?>> messageConverters;
private @Nullable List<ClientHttpRequestInterceptor> interceptors; private @Nullable List<ClientHttpRequestInterceptor> interceptors;
private @Nullable BiPredicate<URI, HttpMethod> bufferingPredicate; private @Nullable BiPredicate<URI, HttpMethod> bufferingPredicate;
private @Nullable List<ClientHttpRequestInitializer> initializers; private @Nullable List<ClientHttpRequestInitializer> initializers;
private @Nullable ClientHttpRequestFactory requestFactory;
private @Nullable List<HttpMessageConverter<?>> messageConverters;
private ObservationRegistry observationRegistry = ObservationRegistry.NOOP; private ObservationRegistry observationRegistry = ObservationRegistry.NOOP;
private @Nullable ClientRequestObservationConvention observationConvention; private @Nullable ClientRequestObservationConvention observationConvention;
@ -155,10 +155,8 @@ final class DefaultRestClientBuilder implements RestClient.Builder {
Assert.notNull(other, "Other must not be null"); Assert.notNull(other, "Other must not be null");
this.baseUrl = other.baseUrl; this.baseUrl = other.baseUrl;
this.defaultUriVariables = (other.defaultUriVariables != null ? this.defaultUriVariables = (other.defaultUriVariables != null ? new LinkedHashMap<>(other.defaultUriVariables) : null);
new LinkedHashMap<>(other.defaultUriVariables) : null);
this.uriBuilderFactory = other.uriBuilderFactory; this.uriBuilderFactory = other.uriBuilderFactory;
if (other.defaultHeaders != null) { if (other.defaultHeaders != null) {
this.defaultHeaders = new HttpHeaders(); this.defaultHeaders = new HttpHeaders();
this.defaultHeaders.putAll(other.defaultHeaders); this.defaultHeaders.putAll(other.defaultHeaders);
@ -166,18 +164,14 @@ final class DefaultRestClientBuilder implements RestClient.Builder {
else { else {
this.defaultHeaders = null; this.defaultHeaders = null;
} }
this.defaultCookies = (other.defaultCookies != null ? this.defaultCookies = (other.defaultCookies != null ? new LinkedMultiValueMap<>(other.defaultCookies) : null);
new LinkedMultiValueMap<>(other.defaultCookies) : null);
this.defaultRequest = other.defaultRequest; this.defaultRequest = other.defaultRequest;
this.statusHandlers = (other.statusHandlers != null ? new ArrayList<>(other.statusHandlers) : null); this.statusHandlers = (other.statusHandlers != null ? new ArrayList<>(other.statusHandlers) : null);
this.requestFactory = other.requestFactory;
this.messageConverters = (other.messageConverters != null ?
new ArrayList<>(other.messageConverters) : null);
this.interceptors = (other.interceptors != null) ? new ArrayList<>(other.interceptors) : null; this.interceptors = (other.interceptors != null) ? new ArrayList<>(other.interceptors) : null;
this.bufferingPredicate = other.bufferingPredicate; this.bufferingPredicate = other.bufferingPredicate;
this.initializers = (other.initializers != null) ? new ArrayList<>(other.initializers) : null; this.initializers = (other.initializers != null) ? new ArrayList<>(other.initializers) : null;
this.requestFactory = other.requestFactory;
this.messageConverters = (other.messageConverters != null ? new ArrayList<>(other.messageConverters) : null);
this.observationRegistry = other.observationRegistry; this.observationRegistry = other.observationRegistry;
this.observationConvention = other.observationConvention; this.observationConvention = other.observationConvention;
} }
@ -188,16 +182,14 @@ final class DefaultRestClientBuilder implements RestClient.Builder {
this.uriBuilderFactory = getUriBuilderFactory(restTemplate); this.uriBuilderFactory = getUriBuilderFactory(restTemplate);
this.statusHandlers = new ArrayList<>(); this.statusHandlers = new ArrayList<>();
this.statusHandlers.add(StatusHandler.fromErrorHandler(restTemplate.getErrorHandler())); this.statusHandlers.add(StatusHandler.fromErrorHandler(restTemplate.getErrorHandler()));
this.requestFactory = getRequestFactory(restTemplate);
this.messageConverters = new ArrayList<>(restTemplate.getMessageConverters());
if (!CollectionUtils.isEmpty(restTemplate.getInterceptors())) { if (!CollectionUtils.isEmpty(restTemplate.getInterceptors())) {
this.interceptors = new ArrayList<>(restTemplate.getInterceptors()); this.interceptors = new ArrayList<>(restTemplate.getInterceptors());
} }
if (!CollectionUtils.isEmpty(restTemplate.getClientHttpRequestInitializers())) { if (!CollectionUtils.isEmpty(restTemplate.getClientHttpRequestInitializers())) {
this.initializers = new ArrayList<>(restTemplate.getClientHttpRequestInitializers()); this.initializers = new ArrayList<>(restTemplate.getClientHttpRequestInitializers());
} }
this.requestFactory = getRequestFactory(restTemplate);
this.messageConverters = new ArrayList<>(restTemplate.getMessageConverters());
this.observationRegistry = restTemplate.getObservationRegistry(); this.observationRegistry = restTemplate.getObservationRegistry();
this.observationConvention = restTemplate.getObservationConvention(); this.observationConvention = restTemplate.getObservationConvention();
} }