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

Polishing.

Browse Source 
Reuse existing write and delete methods from VaultSysTemplate.
This commit is contained in:
Mark Paluch
2016-09-17 20:29:59 +02:00
parent fa9c21f6bb
commit eafcecd11e
1 changed files with 5 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
spring-vault-core/src/main/java/org/springframework/vault/core/VaultSysTemplate.java
View File

@@ -150,20 +150,7 @@ public class VaultSysTemplate implements VaultSysOperations {
Assert.hasText(path, "Path must not be empty");
Assert.notNull(vaultMount, "VaultMount must not be null");
vaultOperations.doWithVault(new SessionCallback<Void>() {
@Override
public Void doWithVault(VaultOperations.VaultSession session) {
VaultResponseEntity<Map<?, ?>> response = session.exchange("sys/mounts/{mount}", HttpMethod.PUT,
new HttpEntity<VaultMount>(vaultMount), Map.class, Collections.singletonMap("mount", path));
if (response.isSuccessful()) {
return null;
}
throw new VaultException(buildExceptionMessage(response));
}
});
vaultOperations.write(String.format("sys/mounts/%s", path), vaultMount);
}
@Override
@@ -176,21 +163,7 @@ public class VaultSysTemplate implements VaultSysOperations {
Assert.hasText(path, "Path must not be empty");
vaultOperations.doWithVault(new SessionCallback<Void>() {
@Override
public Void doWithVault(VaultOperations.VaultSession session) {
VaultResponseEntity<Map<?, ?>> response = session.exchange("sys/mounts/{mount}", HttpMethod.DELETE, null,
Map.class, Collections.singletonMap("mount", path));
if (response.isSuccessful()) {
return null;
}
throw new VaultException(buildExceptionMessage(response));
}
});
vaultOperations.delete(String.format("sys/mounts/%s", path));
}
@Override
@@ -199,20 +172,7 @@ public class VaultSysTemplate implements VaultSysOperations {
Assert.hasText(path, "Path must not be empty");
Assert.notNull(vaultMount, "VaultMount must not be null");
vaultOperations.doWithVault(new SessionCallback<Void>() {
@Override
public Void doWithVault(VaultOperations.VaultSession session) {
VaultResponseEntity<Map<?, ?>> response = session.exchange("sys/auth/{mount}", HttpMethod.PUT,
new HttpEntity<VaultMount>(vaultMount), Map.class, Collections.singletonMap("mount", path));
if (response.isSuccessful()) {
return null;
}
throw new VaultException(buildExceptionMessage(response));
}
});
vaultOperations.write(String.format("sys/auth/%s", path), vaultMount);
}
@Override
@@ -225,21 +185,7 @@ public class VaultSysTemplate implements VaultSysOperations {
Assert.hasText(path, "Path must not be empty");
vaultOperations.doWithVault(new SessionCallback<Void>() {
@Override
public Void doWithVault(VaultOperations.VaultSession session) {
VaultResponseEntity<Map<?, ?>> response = session.exchange("sys/auth/{mount}", HttpMethod.DELETE, null,
Map.class, Collections.singletonMap("mount", path));
if (response.isSuccessful()) {
return null;
}
throw new VaultException(buildExceptionMessage(response));
}
});
vaultOperations.delete(String.format("sys/auth/%s", path));
}
@Override
@@ -293,7 +239,7 @@ public class VaultSysTemplate implements VaultSysOperations {
private final String path;
public GetMounts(String path) {
GetMounts(String path) {
this.path = path;
}