From 9a63401d680eaf43cf58896bd8b54e28cf5c7b5b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Mon, 30 Sep 2019 13:48:50 +0200
Subject: [PATCH] Upgrade to Spring Framework 5.2 GA.

Closes gh-482.
---
 pom.xml                                                       | 2 +-
 .../vault/authentication/AuthenticationStepsOperator.java     | 4 ++--
 .../org/springframework/vault/core/ReactiveVaultTemplate.java | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index e73bade0..129bfa3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 		<kotlin-coroutines.version>1.3.2</kotlin-coroutines.version>
 		<mockk.version>1.9.3</mockk.version>
 		<mockito-core.version>3.0.0</mockito-core.version>
-		<spring.version>5.2.0.RC2</spring.version>
+		<spring.version>5.2.0.RELEASE</spring.version>
 		<spring-data-releasetrain.version>Moore-RC3</spring-data-releasetrain.version>
 		<spring-security-bom.version>5.1.5.RELEASE</spring-security-bom.version>
 		<reactor.version>Dysprosium-RC1</reactor.version>
diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AuthenticationStepsOperator.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AuthenticationStepsOperator.java
index 9a1cb33f..f2734d62 100644
--- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AuthenticationStepsOperator.java
+++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AuthenticationStepsOperator.java
@@ -172,7 +172,7 @@ public class AuthenticationStepsOperator implements VaultTokenSupplier {
 		if (definition.getUri() == null) {
 
 			spec = webClient.method(definition.getMethod()).uri(
-					definition.getUriTemplate(), (Object[]) definition.getUrlVariables());
+					definition.getUriTemplate(), definition.getUrlVariables());
 		}
 		else {
 			spec = webClient.method(definition.getMethod()).uri(definition.getUri());
@@ -183,7 +183,7 @@ public class AuthenticationStepsOperator implements VaultTokenSupplier {
 		}
 
 		if (entity.getBody() != null && !entity.getBody().equals(Undefinded.INSTANCE)) {
-			return spec.syncBody(entity.getBody()).retrieve()
+			return spec.bodyValue(entity.getBody()).retrieve()
 					.bodyToMono(definition.getResponseType());
 		}
 
diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/ReactiveVaultTemplate.java b/spring-vault-core/src/main/java/org/springframework/vault/core/ReactiveVaultTemplate.java
index 415461a5..21ba0f65 100644
--- a/spring-vault-core/src/main/java/org/springframework/vault/core/ReactiveVaultTemplate.java
+++ b/spring-vault-core/src/main/java/org/springframework/vault/core/ReactiveVaultTemplate.java
@@ -225,7 +225,7 @@ public class ReactiveVaultTemplate implements ReactiveVaultOperations {
 			RequestBodySpec uri = webClient.post().uri(path);
 			Mono<ClientResponse> exchange;
 			if (body != null) {
-				exchange = uri.syncBody(body).exchange();
+				exchange = uri.bodyValue(body).exchange();
 			}
 			else {
 				exchange = uri.exchange();