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

Remove code duplicates from VaultWrappingTemplate.

Browse Source 
Resolves gh-345.
This commit is contained in:
Mark Paluch
2018-12-09 16:46:39 +01:00
parent b573cbe270
commit 4a22f8c67c
1 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
spring-vault-core/src/main/java/org/springframework/vault/core/VaultWrappingTemplate.java
View File

@@ -21,6 +21,7 @@ import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAccessor;
import java.util.Collections;
import java.util.Map;
import java.util.function.BiFunction;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpEntity;
@@ -38,6 +39,7 @@ import org.springframework.vault.support.VaultResponseSupport;
import org.springframework.vault.support.VaultToken;
import org.springframework.vault.support.WrappedMetadata;
import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.client.RestOperations;
/**
* @author Mark Paluch
@@ -89,27 +91,12 @@ public class VaultWrappingTemplate implements VaultWrappingOperations {
@Override
public VaultResponse read(VaultToken token) {
return vaultOperations.doWithVault(restOperations -> {
HttpHeaders headers = VaultHttpHeaders.from(token);
try {
return restOperations.exchange("sys/wrapping/unwrap", HttpMethod.POST,
new HttpEntity<>(headers), VaultResponse.class).getBody();
}
catch (HttpStatusCodeException e) {
if (e.getStatusCode() == HttpStatus.NOT_FOUND) {
return null;
}
if (e.getStatusCode() == HttpStatus.BAD_REQUEST
&& e.getResponseBodyAsString().contains("does not exist")) {
return null;
}
throw VaultResponses.buildException(e, "sys/wrapping/unwrap");
}
});
return doUnwrap(
token,
(restOperations, entity) -> {
return restOperations.exchange("sys/wrapping/unwrap",
HttpMethod.POST, entity, VaultResponse.class).getBody();
});
}
@Nullable
@@ -119,12 +106,23 @@ public class VaultWrappingTemplate implements VaultWrappingOperations {
ParameterizedTypeReference<VaultResponseSupport<T>> ref = VaultResponses
.getTypeReference(responseType);
return doUnwrap(
token,
(restOperations, entity) -> {
return restOperations.exchange("sys/wrapping/unwrap",
HttpMethod.POST, entity, ref).getBody();
});
}
@Nullable
private <T extends VaultResponseSupport<?>> T doUnwrap(VaultToken token,
BiFunction<RestOperations, HttpEntity<?>, T> requestFunction) {
return vaultOperations.doWithVault(restOperations -> {
HttpHeaders headers = VaultHttpHeaders.from(token);
try {
return restOperations.exchange("sys/wrapping/unwrap", HttpMethod.POST,
new HttpEntity<>(headers), ref).getBody();
return requestFunction.apply(restOperations, new HttpEntity<>(
VaultHttpHeaders.from(token)));
}
catch (HttpStatusCodeException e) {