diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/SqlServerSequenceMaxValueIncrementer.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/SqlServerSequenceMaxValueIncrementer.java deleted file mode 100644 index d8bc186d..00000000 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/SqlServerSequenceMaxValueIncrementer.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2021-2021 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.task.repository.support; - -import javax.sql.DataSource; - -import org.springframework.jdbc.support.incrementer.AbstractSequenceMaxValueIncrementer; - -/** - * Incrementer using SQL Server's sequence. - * - * @author Glenn Renfro - * @since 2.3.2 - */ -public class SqlServerSequenceMaxValueIncrementer extends AbstractSequenceMaxValueIncrementer { - - SqlServerSequenceMaxValueIncrementer(DataSource dataSource, String incrementerName) { - super(dataSource, incrementerName); - } - - @Override - protected String getSequenceQuery() { - return "select next value for " + getIncrementerName(); - } - -} diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/TaskExecutionDaoFactoryBean.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/TaskExecutionDaoFactoryBean.java index e05fbfce..047196e0 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/TaskExecutionDaoFactoryBean.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/TaskExecutionDaoFactoryBean.java @@ -32,6 +32,7 @@ import org.springframework.cloud.task.repository.dao.MapTaskExecutionDao; import org.springframework.cloud.task.repository.dao.TaskExecutionDao; import org.springframework.jdbc.support.MetaDataAccessException; import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer; +import org.springframework.jdbc.support.incrementer.SqlServerSequenceMaxValueIncrementer; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/SqlServerSequenceMaxValueIncrementerTests.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/SqlServerSequenceMaxValueIncrementerTests.java deleted file mode 100644 index 1b47dac3..00000000 --- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/SqlServerSequenceMaxValueIncrementerTests.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright 2020-2020 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.task.repository.support; - -import javax.sql.DataSource; - -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Test; - -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; - -import static org.assertj.core.api.Assertions.assertThat; - -public class SqlServerSequenceMaxValueIncrementerTests { - - private ConfigurableApplicationContext context; - - @AfterEach - public void tearDown() { - if (this.context != null) { - this.context.close(); - } - } - - @Test - public void testDefaultDataSourceConfiguration() throws Exception { - this.context = new AnnotationConfigApplicationContext( - TaskExecutionDaoFactoryBeanTests.DefaultDataSourceConfiguration.class); - - DataSource dataSource = this.context.getBean(DataSource.class); - - SqlServerSequenceMaxValueIncrementer incrementer = new SqlServerSequenceMaxValueIncrementer(dataSource, "foo"); - assertThat(incrementer.getSequenceQuery()).isEqualTo("select next value for foo"); - assertThat(incrementer.getIncrementerName()).isEqualTo("foo"); - } - -}