From bfb0854e91485653ff39f052d6f9fbb6de164e63 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 21 Sep 2016 19:07:19 +0200 Subject: [PATCH] Polishing Add author tag. Improve documentation. Regenerate readme. Original pull request: gh-36 --- README.adoc | 1 + docs/src/main/asciidoc/quickstart.adoc | 3 +++ .../cloud/vault/config/VaultPropertySourceLocator.java | 1 + .../org/springframework/cloud/vault/VaultProperties.java | 7 +++++-- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index b951a5eb..455fa927 100644 --- a/README.adoc +++ b/README.adoc @@ -191,6 +191,7 @@ for SSL certificate validation Supported schemes are `http` and `https`. * `connection-timeout` sets the connection timeout in milliseconds * `read-timeout` sets the read timeout in milliseconds +* `config.order` sets the order for the property source Enabling further integrations requires additional dependencies and configuration. Depending on how you have set up Vault you might need diff --git a/docs/src/main/asciidoc/quickstart.adoc b/docs/src/main/asciidoc/quickstart.adoc index b59c3a6f..97ad4620 100644 --- a/docs/src/main/asciidoc/quickstart.adoc +++ b/docs/src/main/asciidoc/quickstart.adoc @@ -161,6 +161,8 @@ spring.cloud.vault: scheme: https connection-timeout: 5000 read-timeout: 15000 + config: + order: -10 ---- * `host` sets the hostname of the Vault host. The host name will be used @@ -170,6 +172,7 @@ for SSL certificate validation Supported schemes are `http` and `https`. * `connection-timeout` sets the connection timeout in milliseconds * `read-timeout` sets the read timeout in milliseconds +* `config.order` sets the order for the property source Enabling further integrations requires additional dependencies and configuration. Depending on how you have set up Vault you might need diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultPropertySourceLocator.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultPropertySourceLocator.java index 4c390334..7c689983 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultPropertySourceLocator.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultPropertySourceLocator.java @@ -40,6 +40,7 @@ import static org.springframework.cloud.vault.config.SecureBackendAccessors.*; * * @author Spencer Gibb * @author Mark Paluch + * @author Jean-Philippe Bélanger */ class VaultPropertySourceLocator implements PropertySourceLocator, PriorityOrdered { diff --git a/spring-cloud-vault-core/src/main/java/org/springframework/cloud/vault/VaultProperties.java b/spring-cloud-vault-core/src/main/java/org/springframework/cloud/vault/VaultProperties.java index 88462a1c..3e9e87ae 100644 --- a/spring-cloud-vault-core/src/main/java/org/springframework/cloud/vault/VaultProperties.java +++ b/spring-cloud-vault-core/src/main/java/org/springframework/cloud/vault/VaultProperties.java @@ -181,9 +181,12 @@ public class VaultProperties { @Data public static class Config { + /** - * Used to force a PropertySourceLocator ordering. - * This is useful to use Vault as an override on consul properties; + * Used to set a {@link org.springframework.core.env.PropertySource} priority. + * This is useful to use Vault as an override on other property sources. + * + * @see org.springframework.core.PriorityOrdered */ private int order = 0; }