From b5adf8ddc3415abd5d819ccbc0489cd9527a7947 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Wed, 31 Jul 2019 23:48:14 +0200
Subject: [PATCH] Consistent ordering of WebClient.Builder methods

---
 .../client/DefaultWebClientBuilder.java       | 22 +++++++++----------
 .../reactive/function/client/WebClient.java   | 11 +++++-----
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java
index 92d3f1d04fe..c255154a555 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java
@@ -194,6 +194,17 @@ final class DefaultWebClientBuilder implements WebClient.Builder {
 		return this;
 	}
 
+	@Override
+	public WebClient.Builder apply(Consumer<WebClient.Builder> builderConsumer) {
+		builderConsumer.accept(this);
+		return this;
+	}
+
+	@Override
+	public WebClient.Builder clone() {
+		return new DefaultWebClientBuilder(this);
+	}
+
 	@Override
 	public WebClient build() {
 		ExchangeFunction exchange = initExchangeFunction();
@@ -246,15 +257,4 @@ final class DefaultWebClientBuilder implements WebClient.Builder {
 		}
 	}
 
-	@Override
-	public WebClient.Builder clone() {
-		return new DefaultWebClientBuilder(this);
-	}
-
-	@Override
-	public WebClient.Builder apply(Consumer<WebClient.Builder> builderConsumer) {
-		builderConsumer.accept(this);
-		return this;
-	}
-
 }
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
index fd60e6764bd..7aee562b5b5 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
@@ -302,11 +302,6 @@ public interface WebClient {
 		 */
 		Builder exchangeFunction(ExchangeFunction exchangeFunction);
 
-		/**
-		 * Clone this {@code WebClient.Builder}.
-		 */
-		Builder clone();
-
 		/**
 		 * Apply the given {@code Consumer} to this builder instance.
 		 * <p>This can be useful for applying pre-packaged customizations.
@@ -314,11 +309,15 @@ public interface WebClient {
 		 */
 		Builder apply(Consumer<Builder> builderConsumer);
 
+		/**
+		 * Clone this {@code WebClient.Builder}.
+		 */
+		Builder clone();
+
 		/**
 		 * Builder the {@link WebClient} instance.
 		 */
 		WebClient build();
-
 	}