From 2f38bf3ceb4d5ce0cff417cc788f1c160a3eab6c Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 6 Oct 2016 10:09:39 +0200 Subject: [PATCH] Add Vault version to health response. See gh-14. --- .../org/springframework/vault/core/VaultSysTemplate.java | 7 +++++-- .../org/springframework/vault/support/VaultHealth.java | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultSysTemplate.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultSysTemplate.java index 1672235d..c324a9fb 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultSysTemplate.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultSysTemplate.java @@ -22,7 +22,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpMethod; import org.springframework.http.ResponseEntity; @@ -46,6 +45,7 @@ import org.springframework.web.client.RestTemplate; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.ObjectMapper; @@ -358,14 +358,17 @@ public class VaultSysTemplate implements VaultSysOperations { private final boolean sealed; private final boolean standby; private final int serverTimeUtc; + private final String version; private VaultHealthImpl(@JsonProperty("initialized") boolean initialized, @JsonProperty("sealed") boolean sealed, - @JsonProperty("standby") boolean standby, @JsonProperty("server_time_utc") int serverTimeUtc) { + @JsonProperty("standby") boolean standby, @JsonProperty("server_time_utc") int serverTimeUtc, + @JsonProperty("version") String version) { this.initialized = initialized; this.sealed = sealed; this.standby = standby; this.serverTimeUtc = serverTimeUtc; + this.version = version; } } } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultHealth.java b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultHealth.java index 41ba1e42..e088f63f 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultHealth.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultHealth.java @@ -45,4 +45,9 @@ public interface VaultHealth { * @return the server time in seconds, UTC. */ int getServerTimeUtc(); + + /** + * @return the Vault version. + */ + String getVersion(); }