From 4c3cda0ee3fa8ccf222ccbcffcdde7a2789fcb58 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 13 Feb 2019 14:47:14 +0100 Subject: [PATCH] Apply formatting settings from Spring Javaformat. --- .../cloud/vault/config/ClientAuthenticationFactory.java | 3 +-- .../config/VaultBootstrapPropertySourceConfiguration.java | 6 +++--- .../vault/config/VaultHealthIndicatorAutoConfiguration.java | 4 ++-- .../vault/config/VaultHealthIndicatorConfiguration.java | 2 +- .../springframework/cloud/vault/config/VaultProperties.java | 4 ++-- .../vault/config/VaultReactiveBootstrapConfiguration.java | 6 +++--- .../config/VaultReactiveHealthIndicatorConfiguration.java | 2 +- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/ClientAuthenticationFactory.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/ClientAuthenticationFactory.java index 15fabecd..7e8fe77f 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/ClientAuthenticationFactory.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/ClientAuthenticationFactory.java @@ -320,8 +320,7 @@ class ClientAuthenticationFactory { Assert.hasText(this.vaultProperties.getToken(), "Initial Token (spring.cloud.vault.token) for Cubbyhole authentication must not be empty"); - CubbyholeAuthenticationOptions options = CubbyholeAuthenticationOptions - .builder() // + CubbyholeAuthenticationOptions options = CubbyholeAuthenticationOptions.builder() // .wrapped() // .initialToken(VaultToken.of(this.vaultProperties.getToken())) // .build(); diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfiguration.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfiguration.java index cd592267..4823aace 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfiguration.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfiguration.java @@ -48,8 +48,8 @@ import org.springframework.vault.core.lease.SecretLeaseContainer; */ @Configuration @ConditionalOnProperty(name = "spring.cloud.vault.enabled", matchIfMissing = true) -@EnableConfigurationProperties({VaultGenericBackendProperties.class, - VaultKeyValueBackendProperties.class}) +@EnableConfigurationProperties({ VaultGenericBackendProperties.class, + VaultKeyValueBackendProperties.class }) @Order(Ordered.LOWEST_PRECEDENCE - 10) public class VaultBootstrapPropertySourceConfiguration implements InitializingBean { @@ -155,7 +155,7 @@ public class VaultBootstrapPropertySourceConfiguration implements InitializingBe if (keyValueBackend instanceof VaultKeyValueBackendProperties && ((VaultKeyValueBackendProperties) keyValueBackend) - .getBackendVersion() == 2) { + .getBackendVersion() == 2) { for (String context : contexts) { secretBackendConfigurer.add(KeyValueSecretBackendMetadata diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorAutoConfiguration.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorAutoConfiguration.java index 9e074fde..8a6a1989 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorAutoConfiguration.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorAutoConfiguration.java @@ -39,8 +39,8 @@ import org.springframework.context.annotation.Import; @ConditionalOnClass(HealthIndicator.class) @ConditionalOnProperty(name = "spring.cloud.vault.enabled", matchIfMissing = true) @AutoConfigureBefore(HealthIndicatorAutoConfiguration.class) -@Import({VaultHealthIndicatorConfiguration.class, - VaultReactiveHealthIndicatorConfiguration.class}) +@Import({ VaultHealthIndicatorConfiguration.class, + VaultReactiveHealthIndicatorConfiguration.class }) public class VaultHealthIndicatorAutoConfiguration { } diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorConfiguration.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorConfiguration.java index ae498cb4..65990b4f 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorConfiguration.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorConfiguration.java @@ -45,7 +45,7 @@ class VaultHealthIndicatorConfiguration extends } @Bean - @ConditionalOnMissingBean(name = {"vaultHealthIndicator"}) + @ConditionalOnMissingBean(name = { "vaultHealthIndicator" }) public HealthIndicator vaultHealthIndicator() { return this.createHealthIndicator(this.vaultTemplates); } diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultProperties.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultProperties.java index c846f4d5..e61c3e9c 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultProperties.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultProperties.java @@ -492,8 +492,8 @@ public class VaultProperties implements EnvironmentAware { private Duration minRenewal; /** - * The expiry threshold. {@link Lease} is renewed the given {@link Duration} before it - * expires. + * The expiry threshold. {@link Lease} is renewed the given {@link Duration} + * before it expires. * * @since 2.2 */ diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfiguration.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfiguration.java index 5563be35..3e03f134 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfiguration.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfiguration.java @@ -70,9 +70,9 @@ import org.springframework.web.reactive.function.client.WebClient; @Configuration @ConditionalOnProperty(name = "spring.cloud.vault.enabled", matchIfMissing = true) @ConditionalOnExpression("${spring.cloud.vault.reactive.enabled:true}") -@ConditionalOnClass({Flux.class, WebClient.class, ReactiveVaultOperations.class, - HttpClient.class}) -@EnableConfigurationProperties({VaultProperties.class}) +@ConditionalOnClass({ Flux.class, WebClient.class, ReactiveVaultOperations.class, + HttpClient.class }) +@EnableConfigurationProperties({ VaultProperties.class }) @Order(Ordered.LOWEST_PRECEDENCE - 10) public class VaultReactiveBootstrapConfiguration { diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicatorConfiguration.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicatorConfiguration.java index f770039e..d5753717 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicatorConfiguration.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicatorConfiguration.java @@ -49,7 +49,7 @@ class VaultReactiveHealthIndicatorConfiguration extends } @Bean - @ConditionalOnMissingBean(name = {"vaultReactiveHealthIndicator"}) + @ConditionalOnMissingBean(name = { "vaultReactiveHealthIndicator" }) ReactiveHealthIndicator vaultReactiveHealthIndicator() { return this.createHealthIndicator(this.reactiveVaultTemplates); }