diff --git a/spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/integration/test/tasks/TaskExecutionQueryContainer.java b/spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/integration/test/tasks/TaskExecutionQueryContainer.java index e359b56442..490390b769 100644 --- a/spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/integration/test/tasks/TaskExecutionQueryContainer.java +++ b/spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/integration/test/tasks/TaskExecutionQueryContainer.java @@ -41,7 +41,6 @@ import org.springframework.cloud.dataflow.server.db.MySQL_8_ContainerSupport; import org.springframework.cloud.dataflow.server.db.Oracle_XE_18_ContainerSupport; import org.springframework.cloud.dataflow.server.db.PostgreSQL_14_ContainerSupport; -import org.springframework.cloud.dataflow.server.db.SqlServer_2017_ContainerSupport; import org.springframework.cloud.dataflow.server.db.SqlServer_2019_ContainerSupport; import org.springframework.cloud.dataflow.server.db.SqlServer_2022_ContainerSupport; import org.springframework.cloud.dataflow.server.single.DataFlowServerApplication; @@ -213,10 +212,6 @@ static class DB2_TaskExecutionQueryIT extends AbstractLargeTaskExecutionDatabase implements DB2_11_5_ContainerSupport { } - static class SqlServer_2017_TaskExecutionQueryIT extends AbstractLargeTaskExecutionDatabaseIT - implements SqlServer_2017_ContainerSupport { - } - static class SqlServer_2019_TaskExecutionQueryIT extends AbstractLargeTaskExecutionDatabaseIT implements SqlServer_2019_ContainerSupport { } diff --git a/spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/server/db/migration/SqlServer_2017_SmokeTest.java b/spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/server/db/migration/SqlServer_2017_SmokeTest.java deleted file mode 100644 index 9149c71045..0000000000 --- a/spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/server/db/migration/SqlServer_2017_SmokeTest.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2023 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.cloud.dataflow.server.db.migration; - -import org.springframework.cloud.dataflow.server.db.SqlServer_2017_ContainerSupport; - -/** - * Basic database schema and JPA tests for MS SQL Server. - * - * @author Corneil du Plessis - * @author Chris Bono - */ -public class SqlServer_2017_SmokeTest extends AbstractSmokeTest implements SqlServer_2017_ContainerSupport { -} diff --git a/spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/server/db/support/DatabaseTypeTests.java b/spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/server/db/support/DatabaseTypeTests.java index e22bb9a8c9..d5244aebdb 100644 --- a/spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/server/db/support/DatabaseTypeTests.java +++ b/spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/server/db/support/DatabaseTypeTests.java @@ -35,7 +35,6 @@ import org.springframework.cloud.dataflow.server.db.MySQL_5_7_ContainerSupport; import org.springframework.cloud.dataflow.server.db.MySQL_8_ContainerSupport; import org.springframework.cloud.dataflow.server.db.Oracle_XE_18_ContainerSupport; -import org.springframework.cloud.dataflow.server.db.SqlServer_2017_ContainerSupport; import org.springframework.cloud.dataflow.server.db.SqlServer_2019_ContainerSupport; import org.springframework.cloud.dataflow.server.db.SqlServer_2022_ContainerSupport; import org.springframework.jdbc.support.MetaDataAccessException; @@ -97,10 +96,6 @@ class DB2DatabaseTypeSingleDbDatabaseTypeTests extends AbstractSingleDbDatabaseT class OracleDatabaseTypeSingleDbDatabaseTypeTests extends AbstractSingleDbDatabaseTypeTests implements Oracle_XE_18_ContainerSupport { } - @Nested - class SqlServer_2017_DatabaseTypeSingleDbDatabaseTypeTests extends AbstractSingleDbDatabaseTypeTests implements SqlServer_2017_ContainerSupport { - } - @Nested class SqlServer_2019_DatabaseTypeSingleDbDatabaseTypeTests extends AbstractSingleDbDatabaseTypeTests implements SqlServer_2019_ContainerSupport { } diff --git a/spring-cloud-dataflow-test/src/main/java/org/springframework/cloud/dataflow/server/db/SqlServer_2017_ContainerSupport.java b/spring-cloud-dataflow-test/src/main/java/org/springframework/cloud/dataflow/server/db/SqlServer_2017_ContainerSupport.java deleted file mode 100644 index 9731845230..0000000000 --- a/spring-cloud-dataflow-test/src/main/java/org/springframework/cloud/dataflow/server/db/SqlServer_2017_ContainerSupport.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2023-2024 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.cloud.dataflow.server.db; - -import java.util.concurrent.atomic.AtomicReference; - -import org.junit.jupiter.api.BeforeAll; -import org.testcontainers.containers.MSSQLServerContainer; -import org.testcontainers.utility.DockerImageName; - -import org.springframework.cloud.dataflow.server.db.arm64.SqlServerArm64ContainerSupport; -import org.springframework.test.context.DynamicPropertyRegistry; -import org.springframework.test.context.DynamicPropertySource; - -/** - * Provides support for running a {@link MSSQLServerContainer MSSQL 2017 Testcontainer}. - * - * @author Chris Bono - */ -public interface SqlServer_2017_ContainerSupport extends SqlServerArm64ContainerSupport { - - AtomicReference containerReference = new AtomicReference<>(null); - - @BeforeAll - static void startContainer() { - MSSQLServerContainer container = SqlServerArm64ContainerSupport.startContainer(() -> - new MSSQLServerContainer(DockerImageName.parse(MSSQLServerContainer.IMAGE).withTag("2017-latest")).acceptLicense()); - containerReference.set(container); - } - - @DynamicPropertySource - static void databaseProperties(DynamicPropertyRegistry registry) { - MSSQLServerContainer container = containerReference.get(); - registry.add("spring.datasource.url", container::getJdbcUrl); - registry.add("spring.datasource.username", container::getUsername); - registry.add("spring.datasource.password", container::getPassword); - registry.add("spring.datasource.driver-class-name", container::getDriverClassName); - } -}