diff --git a/etc/ide/eclipse-code-formatter.xml b/etc/ide/eclipse-code-formatter.xml new file mode 100644 index 00000000..6f7bc030 --- /dev/null +++ b/etc/ide/eclipse-code-formatter.xml @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsTests.java b/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsTests.java index 8f936d92..b5e5db97 100644 --- a/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsTests.java +++ b/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsTests.java @@ -87,8 +87,7 @@ public class VaultConfigAwsTests { vaultOperations.write("aws/config/root", connection); - vaultOperations.write("aws/roles/readonly", - Collections.singletonMap("arn", ARN)); + vaultOperations.write("aws/roles/readonly", Collections.singletonMap("arn", ARN)); } @Value("${cloud.aws.credentials.accessKey}") diff --git a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulTests.java b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulTests.java index 6ed308bc..5661e49a 100644 --- a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulTests.java +++ b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulTests.java @@ -31,10 +31,8 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.test.IntegrationTest; import org.springframework.boot.test.SpringApplicationConfiguration; -import org.springframework.boot.test.TestRestTemplate; import org.springframework.cloud.vault.util.CanConnect; import org.springframework.cloud.vault.util.VaultRule; import org.springframework.core.ParameterizedTypeReference; @@ -107,8 +105,8 @@ public class VaultConfigConsulTests { vaultOperations.write("consul/config/access", consulAccess); - vaultOperations.write("consul/roles/readonly", Collections - .singletonMap("policy", Base64.encode(POLICY.getBytes()))); + vaultOperations.write("consul/roles/readonly", + Collections.singletonMap("policy", Base64.encode(POLICY.getBytes()))); } @Value("${spring.cloud.consul.token}") diff --git a/spring-cloud-vault-config-databases/src/main/java/org/springframework/cloud/vault/config/databases/VaultMySqlProperties.java b/spring-cloud-vault-config-databases/src/main/java/org/springframework/cloud/vault/config/databases/VaultMySqlProperties.java index a579dc0c..f216f117 100644 --- a/spring-cloud-vault-config-databases/src/main/java/org/springframework/cloud/vault/config/databases/VaultMySqlProperties.java +++ b/spring-cloud-vault-config-databases/src/main/java/org/springframework/cloud/vault/config/databases/VaultMySqlProperties.java @@ -2,9 +2,9 @@ package org.springframework.cloud.vault.config.databases; import org.hibernate.validator.constraints.NotEmpty; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.vault.config.VaultSecretBackend; import lombok.Data; -import org.springframework.cloud.vault.config.VaultSecretBackend; /** * Configuration properties for Vault using the MySQL integration. @@ -13,7 +13,8 @@ import org.springframework.cloud.vault.config.VaultSecretBackend; */ @ConfigurationProperties("spring.cloud.vault.mysql") @Data -public class VaultMySqlProperties implements DatabaseSecretProperties, VaultSecretBackend { +public class VaultMySqlProperties + implements DatabaseSecretProperties, VaultSecretBackend { /** * Enable mysql backend usage. diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java index b08674af..fc8642cd 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java @@ -36,16 +36,17 @@ import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.cloud.vault.util.CanConnect; import org.springframework.cloud.vault.util.VaultRule; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.vault.core.VaultOperations; import com.datastax.driver.core.Cluster; import com.datastax.driver.core.PlainTextAuthProvider; import com.datastax.driver.core.Session; -import org.springframework.vault.core.VaultOperations; /** - * Integration tests using the cassandra secret backend. In case this test should fail because of SSL make sure you run - * the test within the spring-cloud-vault-config/spring-cloud-vault-config directory as the keystore is referenced with - * {@code ../work/keystore.jks}. + * Integration tests using the cassandra secret backend. In case this test should fail + * because of SSL make sure you run the test within the + * spring-cloud-vault-config/spring-cloud-vault-config directory as the keystore is + * referenced with {@code ../work/keystore.jks}. * * @author Mark Paluch */ @@ -111,7 +112,8 @@ public class VaultConfigCassandraTests { @Test public void shouldUseAuthenticationSet() throws SQLException { - assertThat(cluster.getConfiguration().getProtocolOptions().getAuthProvider()).isInstanceOf(PlainTextAuthProvider.class); + assertThat(cluster.getConfiguration().getProtocolOptions().getAuthProvider()) + .isInstanceOf(PlainTextAuthProvider.class); } @Test diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java index 4778adb4..3b93e249 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java @@ -39,9 +39,10 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.vault.core.VaultOperations; /** - * Integration tests using the mysql secret backend. In case this test should fail because of SSL make sure you run the - * test within the spring-cloud-vault-config/spring-cloud-vault-config directory as the keystore is referenced with - * {@code ../work/keystore.jks}. + * Integration tests using the mysql secret backend. In case this test should fail because + * of SSL make sure you run the test within the + * spring-cloud-vault-config/spring-cloud-vault-config directory as the keystore is + * referenced with {@code ../work/keystore.jks}. * * @author Mark Paluch */ diff --git a/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqTests.java b/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqTests.java index aae78d9a..59b808f0 100644 --- a/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqTests.java +++ b/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqTests.java @@ -35,11 +35,11 @@ import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.cloud.vault.util.CanConnect; import org.springframework.cloud.vault.util.VaultRule; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.vault.core.VaultOperations; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; import com.rabbitmq.client.ConnectionFactory; -import org.springframework.vault.core.VaultOperations; /** * Integration tests using the rabbitmq secret backend. In case this test should fail @@ -93,8 +93,7 @@ public class VaultConfigRabbitMqTests { connection.put("username", RABBITMQ_USERNAME); connection.put("password", RABBITMQ_PASSWORD); - vaultOperations.write(String.format("rabbitmq/config/connection"), - connection); + vaultOperations.write(String.format("rabbitmq/config/connection"), connection); vaultOperations.write(String.format("rabbitmq/roles/readonly"), Collections.singletonMap("vhosts", VHOSTS_ROLE)); 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 e8657e0d..fcef9999 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 @@ -24,11 +24,11 @@ import java.util.Collections; import java.util.List; import org.springframework.cloud.bootstrap.config.PropertySourceLocator; +import org.springframework.core.PriorityOrdered; import org.springframework.core.env.CompositePropertySource; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.Environment; import org.springframework.core.env.PropertySource; -import org.springframework.core.PriorityOrdered; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ApplicationFailFastTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ApplicationFailFastTests.java index f2bc280f..5bb0cebc 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ApplicationFailFastTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ApplicationFailFastTests.java @@ -16,13 +16,12 @@ package org.springframework.cloud.vault.config; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.builder.SpringApplicationBuilder; - import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; import org.junit.Test; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.builder.SpringApplicationBuilder; /** * Tests for fail fast option. diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/IntegrationTestSupport.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/IntegrationTestSupport.java index 9e004fe3..20791120 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/IntegrationTestSupport.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/IntegrationTestSupport.java @@ -17,8 +17,6 @@ package org.springframework.cloud.vault.util; import org.junit.Rule; -import org.springframework.cloud.vault.util.PrepareVault; -import org.springframework.cloud.vault.util.VaultRule; /** * Base class for integration tests using Vault.