Spring/spring-vault
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Spring Framework 5.2 GA.

Browse Source 
Closes gh-482.
This commit is contained in:
Mark Paluch
2019-09-30 13:48:50 +02:00
parent a2ebbf03cc
commit 9a63401d68
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -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>

4
spring-vault-core/src/main/java/org/springframework/vault/authentication/AuthenticationStepsOperator.java
View File

@@ -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());
}

2
spring-vault-core/src/main/java/org/springframework/vault/core/ReactiveVaultTemplate.java
View File

@@ -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();