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

Reformat code according Javaformat.

Browse Source
This commit is contained in:
Mark Paluch
2019-05-20 11:48:59 +02:00
parent 31aaa063c8
commit cf3192f960
15 changed files with 49 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/SecretBackendMetadataFactory.java
View File

@@ -18,7 +18,8 @@ package org.springframework.cloud.vault.config;
/**
* Strategy interface to create {@link SecretBackendMetadata} from
* {@link VaultSecretBackendDescriptor} properties. Mainly for internal use within the framework.
* {@link VaultSecretBackendDescriptor} properties. Mainly for internal use within the
* framework.
*
* <p>
* Classes implementing this interface must implement

4
spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultSecretBackendDescriptor.java
View File

@@ -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.
*
* <p>
* Typically used by {@link SecretBackendMetadataFactory} to provide path and

5
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultOperationsTests.java
View File

@@ -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

5
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java
View File

@@ -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" })

8
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdTests.java
View File

@@ -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 {

6
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppRoleTests.java
View File

@@ -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 {

6
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigCubbyholeAuthenticationTests.java
View File

@@ -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}")

3
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDisabledTests.java
View File

@@ -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

3
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigGenericBackendDisabledTests.java
View File

@@ -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

8
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTests.java
View File

@@ -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 {

12
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java
View File

@@ -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}")

3
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithContextTests.java
View File

@@ -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")

3
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithVaultConfigurerTests.java
View File

@@ -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}")

9
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorIntegrationTests.java
View File

@@ -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 {

13
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultVersionedKvBackendConfigTests.java
View File

@@ -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}")