From 72d00730f17024463705b87846310e968b4fa928 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 4 May 2022 18:31:21 -0400 Subject: [PATCH 1/4] Uses update sql properties --- .../environment/JdbcEnvironmentRepositoryTests.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepositoryTests.java index 8c45ab86..3ef1b136 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepositoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepositoryTests.java @@ -22,6 +22,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.ImportAutoConfiguration; +import org.springframework.boot.autoconfigure.sql.init.SqlInitializationAutoConfiguration; import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.config.environment.Environment; @@ -38,8 +40,9 @@ import static org.assertj.core.api.Assertions.assertThat; * */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = ApplicationConfiguration.class, properties = { - "spring.datasource.schema=classpath:schema-jdbc.sql", "spring.datasource.data=classpath:data-jdbc.sql" }) +@SpringBootTest(classes = ApplicationConfiguration.class, + properties = { "debug=true", "spring.sql.init.schema-locations=classpath:schema-jdbc.sql", + "spring.sql.init.data-locations=classpath:data-jdbc.sql" }) @AutoConfigureTestDatabase @DirtiesContext public class JdbcEnvironmentRepositoryTests { @@ -51,7 +54,7 @@ public class JdbcEnvironmentRepositoryTests { public void basicProperties() { Environment env = new JdbcEnvironmentRepository(new JdbcTemplate(this.dataSource), new JdbcEnvironmentProperties(), new JdbcEnvironmentRepository.PropertiesResultSetExtractor()) - .findOne("foo", "bar", ""); + .findOne("foo", "bar", ""); assertThat(env.getName()).isEqualTo("foo"); assertThat(env.getProfiles()).isEqualTo(new String[] { "default", "bar" }); assertThat(env.getLabel()).isEqualTo("master"); @@ -73,6 +76,7 @@ public class JdbcEnvironmentRepositoryTests { assertThat(env.getPropertySources().get(0).getSource().get("a.b")).isEqualTo("y"); } + @ImportAutoConfiguration(SqlInitializationAutoConfiguration.class) @Configuration(proxyBeanMethods = false) protected static class ApplicationConfiguration { From 3046620ec182c338a3536aa0bd469b3ca40ac265 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 4 May 2022 18:40:23 -0400 Subject: [PATCH 2/4] Uses TestConfigServerApplication --- .../sample/ConfigDataOrderingVaultIntegrationTests.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-cloud-config-sample/src/test/java/sample/ConfigDataOrderingVaultIntegrationTests.java b/spring-cloud-config-sample/src/test/java/sample/ConfigDataOrderingVaultIntegrationTests.java index 481fe8e2..7475333c 100644 --- a/spring-cloud-config-sample/src/test/java/sample/ConfigDataOrderingVaultIntegrationTests.java +++ b/spring-cloud-config-sample/src/test/java/sample/ConfigDataOrderingVaultIntegrationTests.java @@ -29,7 +29,7 @@ import org.testcontainers.utility.DockerImageName; import org.testcontainers.vault.VaultContainer; import org.springframework.boot.SpringApplication; -import org.springframework.cloud.config.server.ConfigServerApplication; +import org.springframework.cloud.config.server.test.TestConfigServerApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.util.SocketUtils; @@ -59,7 +59,7 @@ public class ConfigDataOrderingVaultIntegrationTests { @BeforeAll public static void startConfigServer() throws IOException, InterruptedException, JSONException { - server = SpringApplication.run(org.springframework.cloud.config.server.ConfigServerApplication.class, + server = SpringApplication.run(TestConfigServerApplication.class, "--spring.config.location=classpath:/vaultordering/", "--spring.config.name=server", "--server.port=" + configServerPort, "--spring.cloud.config.server.vault.port=" + vaultContainer.getFirstMappedPort()); @@ -81,7 +81,7 @@ public class ConfigDataOrderingVaultIntegrationTests { @Test void propertyFromVaultIsUsed() { - client = SpringApplication.run(ConfigServerApplication.class, "--server.port=" + configClientPort, + client = SpringApplication.run(TestConfigServerApplication.class, "--server.port=" + configClientPort, "--spring.config.location=classpath:/vaultordering/", "--spring.config.name=client", "--spring.profiles.active=dev", "--spring.application.name=client-app", "--spring.cloud.config.enabled=true", "--spring.cloud.config.server.enabled=false", From c1f01297bbb666f99b6dcb08ee1b12a7f424caf2 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 5 May 2022 00:29:50 +0000 Subject: [PATCH 3/4] Bumping versions --- .../server/environment/JdbcEnvironmentRepositoryTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepositoryTests.java index 3ef1b136..151e24ae 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepositoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepositoryTests.java @@ -54,7 +54,7 @@ public class JdbcEnvironmentRepositoryTests { public void basicProperties() { Environment env = new JdbcEnvironmentRepository(new JdbcTemplate(this.dataSource), new JdbcEnvironmentProperties(), new JdbcEnvironmentRepository.PropertiesResultSetExtractor()) - .findOne("foo", "bar", ""); + .findOne("foo", "bar", ""); assertThat(env.getName()).isEqualTo("foo"); assertThat(env.getProfiles()).isEqualTo(new String[] { "default", "bar" }); assertThat(env.getLabel()).isEqualTo("master"); From 70e558df7de8c53a897689c3d249521bdd39ac36 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 9 May 2022 12:22:41 -0400 Subject: [PATCH 4/4] Removes unused constructor --- .../cloud/config/client/ConfigServerConfigDataLoader.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoader.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoader.java index 7cd162f0..8343a4e0 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoader.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoader.java @@ -73,10 +73,6 @@ public class ConfigServerConfigDataLoader implements ConfigDataLoader