From 962dbc8a55533bb1e3b0960478fb24e99170b22a Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 5 Apr 2018 10:15:51 +0200 Subject: [PATCH] Review deprecated code usage. Suppress warnings for own deprecated code usage in tests as we provide types that are deprecated yet we want to cover these with tests. Move off external deprecated API. Closes gh-208. --- .../databases/MySqlDatabaseSecretIntegrationTests.java | 1 + .../config/databases/MySqlSecretIntegrationTests.java | 1 + .../config/databases/PostgreSqlSecretIntegrationTests.java | 1 + .../VaultConfigDatabaseBootstrapConfigurationTests.java | 3 ++- .../cloud/vault/config/VaultHealthIndicatorUnitTests.java | 7 +++---- .../vault/config/VaultPropertySourceLocatorUnitTests.java | 6 +++--- .../org/springframework/cloud/vault/util/Settings.java | 4 ++-- 7 files changed, 13 insertions(+), 10 deletions(-) diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlDatabaseSecretIntegrationTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlDatabaseSecretIntegrationTests.java index 6b115815..f876774c 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlDatabaseSecretIntegrationTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlDatabaseSecretIntegrationTests.java @@ -53,6 +53,7 @@ public class MySqlDatabaseSecretIntegrationTests extends IntegrationTestSupport private VaultProperties vaultProperties = Settings.createVaultProperties(); private VaultConfigOperations configOperations; + @SuppressWarnings("deprecation") private VaultMySqlProperties mySql = new VaultMySqlProperties(); /** diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlSecretIntegrationTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlSecretIntegrationTests.java index f0ef5bbd..a68efa20 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlSecretIntegrationTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlSecretIntegrationTests.java @@ -51,6 +51,7 @@ public class MySqlSecretIntegrationTests extends IntegrationTestSupport { private VaultProperties vaultProperties = Settings.createVaultProperties(); private VaultConfigOperations configOperations; + @SuppressWarnings("deprecation") private VaultMySqlProperties mySql = new VaultMySqlProperties(); /** diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/PostgreSqlSecretIntegrationTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/PostgreSqlSecretIntegrationTests.java index e55f2812..3fa6f493 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/PostgreSqlSecretIntegrationTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/PostgreSqlSecretIntegrationTests.java @@ -57,6 +57,7 @@ public class PostgreSqlSecretIntegrationTests extends IntegrationTestSupport { private VaultProperties vaultProperties = Settings.createVaultProperties(); private VaultConfigOperations configOperations; + @SuppressWarnings("deprecation") private VaultPostgreSqlProperties postgreSql = new VaultPostgreSqlProperties(); /** diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfigurationTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfigurationTests.java index 1f88fa70..dec309bb 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfigurationTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfigurationTests.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; /** * Tests for {@link VaultConfigDatabaseBootstrapConfiguration}. @@ -47,6 +47,7 @@ public class VaultConfigDatabaseBootstrapConfigurationTests @Autowired DatabaseSecretBackendMetadataFactory factory; + @SuppressWarnings("deprecation") @Autowired VaultMySqlProperties properties; diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultHealthIndicatorUnitTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultHealthIndicatorUnitTests.java index 1b59e47f..1381c3ed 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultHealthIndicatorUnitTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultHealthIndicatorUnitTests.java @@ -19,7 +19,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.springframework.boot.actuate.health.Health; import org.springframework.boot.actuate.health.Status; @@ -27,9 +27,8 @@ import org.springframework.vault.core.VaultOperations; import org.springframework.vault.core.VaultSysOperations; import org.springframework.vault.support.VaultHealth; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.reset; -import static org.mockito.Mockito.when; +import static org.assertj.core.api.Assertions.*; +import static org.mockito.Mockito.*; /** * Unit tests for {@link VaultHealthIndicator}. diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorUnitTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorUnitTests.java index 20942811..ce6ec972 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorUnitTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorUnitTests.java @@ -19,15 +19,15 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.springframework.core.annotation.Order; import org.springframework.core.env.CompositePropertySource; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.PropertySource; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.when; +import static org.assertj.core.api.Assertions.*; +import static org.mockito.Mockito.*; /** * Unit tests for {@link VaultPropertySourceLocator}. diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/Settings.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/Settings.java index 033ff0a0..e5b161c6 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/Settings.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/Settings.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.cloud.vault.util; import java.io.File; @@ -54,7 +53,8 @@ public class Settings { File workDir = findWorkDir(); return SslConfiguration.forTrustStore( - new FileSystemResource(new File(workDir, "keystore.jks")), "changeit"); +new FileSystemResource(new File(workDir, + "keystore.jks")), "changeit".toCharArray()); } /**