From 82941caa006a3982c217b029736e6975a60e3d80 Mon Sep 17 00:00:00 2001 From: rstoyanchev Date: Wed, 8 Jan 2025 15:52:32 +0000 Subject: [PATCH] Polishing in DefaultRestClientBuilder Align order of fields with order of methods on Builder. --- .../web/client/DefaultRestClientBuilder.java | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/client/DefaultRestClientBuilder.java b/spring-web/src/main/java/org/springframework/web/client/DefaultRestClientBuilder.java index 34dd663589..1ae72aa429 100644 --- a/spring-web/src/main/java/org/springframework/web/client/DefaultRestClientBuilder.java +++ b/spring-web/src/main/java/org/springframework/web/client/DefaultRestClientBuilder.java @@ -133,16 +133,16 @@ final class DefaultRestClientBuilder implements RestClient.Builder { private @Nullable List statusHandlers; - private @Nullable ClientHttpRequestFactory requestFactory; - - private @Nullable List> messageConverters; - private @Nullable List interceptors; private @Nullable BiPredicate bufferingPredicate; private @Nullable List initializers; + private @Nullable ClientHttpRequestFactory requestFactory; + + private @Nullable List> messageConverters; + private ObservationRegistry observationRegistry = ObservationRegistry.NOOP; private @Nullable ClientRequestObservationConvention observationConvention; @@ -155,10 +155,8 @@ final class DefaultRestClientBuilder implements RestClient.Builder { Assert.notNull(other, "Other must not be null"); this.baseUrl = other.baseUrl; - this.defaultUriVariables = (other.defaultUriVariables != null ? - new LinkedHashMap<>(other.defaultUriVariables) : null); + this.defaultUriVariables = (other.defaultUriVariables != null ? new LinkedHashMap<>(other.defaultUriVariables) : null); this.uriBuilderFactory = other.uriBuilderFactory; - if (other.defaultHeaders != null) { this.defaultHeaders = new HttpHeaders(); this.defaultHeaders.putAll(other.defaultHeaders); @@ -166,18 +164,14 @@ final class DefaultRestClientBuilder implements RestClient.Builder { else { this.defaultHeaders = null; } - this.defaultCookies = (other.defaultCookies != null ? - new LinkedMultiValueMap<>(other.defaultCookies) : null); + this.defaultCookies = (other.defaultCookies != null ? new LinkedMultiValueMap<>(other.defaultCookies) : null); this.defaultRequest = other.defaultRequest; 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.bufferingPredicate = other.bufferingPredicate; 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.observationConvention = other.observationConvention; } @@ -188,16 +182,14 @@ final class DefaultRestClientBuilder implements RestClient.Builder { this.uriBuilderFactory = getUriBuilderFactory(restTemplate); this.statusHandlers = new ArrayList<>(); this.statusHandlers.add(StatusHandler.fromErrorHandler(restTemplate.getErrorHandler())); - - this.requestFactory = getRequestFactory(restTemplate); - this.messageConverters = new ArrayList<>(restTemplate.getMessageConverters()); - if (!CollectionUtils.isEmpty(restTemplate.getInterceptors())) { this.interceptors = new ArrayList<>(restTemplate.getInterceptors()); } if (!CollectionUtils.isEmpty(restTemplate.getClientHttpRequestInitializers())) { this.initializers = new ArrayList<>(restTemplate.getClientHttpRequestInitializers()); } + this.requestFactory = getRequestFactory(restTemplate); + this.messageConverters = new ArrayList<>(restTemplate.getMessageConverters()); this.observationRegistry = restTemplate.getObservationRegistry(); this.observationConvention = restTemplate.getObservationConvention(); }