* Classes implementing this interface must implement diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultSecretBackendDescriptor.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultSecretBackendDescriptor.java index d7e68a84..bacb4741 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultSecretBackendDescriptor.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultSecretBackendDescriptor.java @@ -17,8 +17,8 @@ package org.springframework.cloud.vault.config; /** - * Interface to be implemented by objects that describe a Vault secret backend. - * Mainly for internal use within the framework. + * Interface to be implemented by objects that describe a Vault secret backend. Mainly for + * internal use within the framework. * *
* Typically used by {@link SecretBackendMetadataFactory} to provide path and diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultOperationsTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultOperationsTests.java index 1ac7310c..4735d3bb 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultOperationsTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultOperationsTests.java @@ -46,8 +46,9 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = ReactiveVaultOperationsTests.TestApplication.class, properties = { - "spring.cloud.vault.host=foo", "spring.cloud.vault.uri=https://localhost:8200" }) +@SpringBootTest(classes = ReactiveVaultOperationsTests.TestApplication.class, + properties = { "spring.cloud.vault.host=foo", + "spring.cloud.vault.uri=https://localhost:8200" }) public class ReactiveVaultOperationsTests { @Autowired diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java index 134a8fe1..1c887df2 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java @@ -48,9 +48,8 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = { - VaultConfigAppIdCustomMechanismTests.TestApplication.class }, properties = { - "spring.cloud.vault.authentication=appid", +@SpringBootTest(classes = { VaultConfigAppIdCustomMechanismTests.TestApplication.class }, + properties = { "spring.cloud.vault.authentication=appid", "VaultConfigAppIdCustomMechanismTests.custom.config=true", "spring.cloud.vault.applicationName=VaultConfigAppIdCustomMechanismTests", "spring.main.allow-bean-definition-overriding=true" }) diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdTests.java index c05e7e63..403b7138 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdTests.java @@ -47,10 +47,10 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = VaultConfigAppIdTests.TestApplication.class, properties = { - "spring.cloud.vault.authentication=appid", - "spring.cloud.vault.app-id.user-id=IP_ADDRESS", - "spring.cloud.vault.application-name=VaultConfigAppIdTests" }) +@SpringBootTest(classes = VaultConfigAppIdTests.TestApplication.class, + properties = { "spring.cloud.vault.authentication=appid", + "spring.cloud.vault.app-id.user-id=IP_ADDRESS", + "spring.cloud.vault.application-name=VaultConfigAppIdTests" }) // see // https://github.com/spring-cloud/spring-cloud-commons/issues/214 public class VaultConfigAppIdTests { diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppRoleTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppRoleTests.java index 7220e4c5..a7ce3442 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppRoleTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppRoleTests.java @@ -48,9 +48,9 @@ import static org.junit.Assume.assumeTrue; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = VaultConfigAppRoleTests.TestApplication.class, properties = { - "spring.cloud.vault.authentication=approle", - "spring.cloud.vault.application-name=VaultConfigAppRoleTests" }) +@SpringBootTest(classes = VaultConfigAppRoleTests.TestApplication.class, + properties = { "spring.cloud.vault.authentication=approle", + "spring.cloud.vault.application-name=VaultConfigAppRoleTests" }) // see // https://github.com/spring-cloud/spring-cloud-commons/issues/214 public class VaultConfigAppRoleTests { diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigCubbyholeAuthenticationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigCubbyholeAuthenticationTests.java index 66132ef7..cee0bf64 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigCubbyholeAuthenticationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigCubbyholeAuthenticationTests.java @@ -49,9 +49,9 @@ import static org.junit.Assume.assumeTrue; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = VaultConfigCubbyholeAuthenticationTests.TestApplication.class, properties = { - "spring.cloud.vault.authentication=cubbyhole", - "spring.cloud.vault.generic.applicationName=VaultConfigCubbyholeAuthenticationTests" }) +@SpringBootTest(classes = VaultConfigCubbyholeAuthenticationTests.TestApplication.class, + properties = { "spring.cloud.vault.authentication=cubbyhole", + "spring.cloud.vault.generic.applicationName=VaultConfigCubbyholeAuthenticationTests" }) public class VaultConfigCubbyholeAuthenticationTests { @Value("${vault.value}") diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDisabledTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDisabledTests.java index b1f873b9..ffa63fba 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDisabledTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDisabledTests.java @@ -45,7 +45,8 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = VaultConfigDisabledTests.TestApplication.class, properties = "spring.cloud.vault.enabled=false") +@SpringBootTest(classes = VaultConfigDisabledTests.TestApplication.class, + properties = "spring.cloud.vault.enabled=false") public class VaultConfigDisabledTests { @Autowired diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigGenericBackendDisabledTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigGenericBackendDisabledTests.java index 8b8f6152..fca34783 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigGenericBackendDisabledTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigGenericBackendDisabledTests.java @@ -43,7 +43,8 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = VaultConfigGenericBackendDisabledTests.TestApplication.class, properties = "spring.cloud.vault.generic.enabled=false") +@SpringBootTest(classes = VaultConfigGenericBackendDisabledTests.TestApplication.class, + properties = "spring.cloud.vault.generic.enabled=false") public class VaultConfigGenericBackendDisabledTests { @Autowired diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTests.java index b6251633..68b6e793 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTests.java @@ -50,10 +50,10 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = VaultConfigTests.TestApplication.class, properties = { - "spring.cloud.vault.host=foo", "spring.cloud.vault.port=80", - "spring.cloud.vault.uri=https://localhost:8200", - "spring.cloud.vault.application-name=testVaultApp" }) +@SpringBootTest(classes = VaultConfigTests.TestApplication.class, + properties = { "spring.cloud.vault.host=foo", "spring.cloud.vault.port=80", + "spring.cloud.vault.uri=https://localhost:8200", + "spring.cloud.vault.application-name=testVaultApp" }) // see // https://github.com/spring-cloud/spring-cloud-commons/issues/214 public class VaultConfigTests { diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java index 0bf01be3..7e1766c7 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java @@ -48,12 +48,12 @@ import static org.springframework.cloud.vault.util.Settings.findWorkDir; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = VaultConfigTlsCertAuthenticationTests.TestApplication.class, properties = { - "spring.cloud.vault.authentication=cert", - "spring.cloud.vault.ssl.key-store=file:../work/client-cert.jks", - "spring.cloud.vault.ssl.key-store-password=changeit", - "spring.cloud.vault.application-name=VaultConfigTlsCertAuthenticationTests", - "spring.cloud.vault.reactive.enabled=false" }) +@SpringBootTest(classes = VaultConfigTlsCertAuthenticationTests.TestApplication.class, + properties = { "spring.cloud.vault.authentication=cert", + "spring.cloud.vault.ssl.key-store=file:../work/client-cert.jks", + "spring.cloud.vault.ssl.key-store-password=changeit", + "spring.cloud.vault.application-name=VaultConfigTlsCertAuthenticationTests", + "spring.cloud.vault.reactive.enabled=false" }) public class VaultConfigTlsCertAuthenticationTests { @Value("${vault.value}") diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithContextTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithContextTests.java index e530a3b7..34aab745 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithContextTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithContextTests.java @@ -44,7 +44,8 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = VaultConfigWithContextTests.TestApplication.class, properties = "spring.cloud.vault.application-name=testVaultApp") +@SpringBootTest(classes = VaultConfigWithContextTests.TestApplication.class, + properties = "spring.cloud.vault.application-name=testVaultApp") // see // https://github.com/spring-cloud/spring-cloud-commons/issues/214 @ActiveProfiles("my-profile") diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithVaultConfigurerTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithVaultConfigurerTests.java index 1847ce8c..1b2af04f 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithVaultConfigurerTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithVaultConfigurerTests.java @@ -45,7 +45,8 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = VaultConfigWithVaultConfigurerTests.TestApplication.class, properties = "VaultConfigWithVaultConfigurerTests.custom.config=true") +@SpringBootTest(classes = VaultConfigWithVaultConfigurerTests.TestApplication.class, + properties = "VaultConfigWithVaultConfigurerTests.custom.config=true") public class VaultConfigWithVaultConfigurerTests { @Value("${vault.value}") diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorIntegrationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorIntegrationTests.java index fedeec97..1f42842b 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorIntegrationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorIntegrationTests.java @@ -40,10 +40,11 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = VaultPropertySourceLocatorIntegrationTests.TestApplication.class, properties = { - "spring.application.name=wintermute", - "spring.cloud.vault.application-name=neuromancer", - "spring.cloud.vault.generic.application-name=neuromancer,icebreaker" }) +@SpringBootTest( + classes = VaultPropertySourceLocatorIntegrationTests.TestApplication.class, + properties = { "spring.application.name=wintermute", + "spring.cloud.vault.application-name=neuromancer", + "spring.cloud.vault.generic.application-name=neuromancer,icebreaker" }) @ActiveProfiles({ "integrationtest" }) public class VaultPropertySourceLocatorIntegrationTests extends IntegrationTestSupport { diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultVersionedKvBackendConfigTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultVersionedKvBackendConfigTests.java index 605fda1f..67e195c0 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultVersionedKvBackendConfigTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultVersionedKvBackendConfigTests.java @@ -52,12 +52,13 @@ import static org.junit.Assume.assumeTrue; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = VaultVersionedKvBackendConfigTests.TestApplication.class, properties = { - "spring.cloud.vault.host=foo", "spring.cloud.vault.port=80", - "spring.cloud.vault.uri=https://localhost:8200", - "spring.cloud.vault.generic.enabled=false", "spring.cloud.vault.kv.enabled=true", - "spring.cloud.vault.kv.backend=versioned", - "spring.cloud.vault.application-name=testVaultApp" }) +@SpringBootTest(classes = VaultVersionedKvBackendConfigTests.TestApplication.class, + properties = { "spring.cloud.vault.host=foo", "spring.cloud.vault.port=80", + "spring.cloud.vault.uri=https://localhost:8200", + "spring.cloud.vault.generic.enabled=false", + "spring.cloud.vault.kv.enabled=true", + "spring.cloud.vault.kv.backend=versioned", + "spring.cloud.vault.application-name=testVaultApp" }) public class VaultVersionedKvBackendConfigTests { @Value("${vault.value}")