diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactory.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactory.java index a2cb80cd2..7cfab3634 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactory.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactory.java @@ -32,6 +32,7 @@ import org.springframework.jdbc.support.incrementer.OracleSequenceMaxValueIncrem import org.springframework.jdbc.support.incrementer.PostgresSequenceMaxValueIncrementer; import org.springframework.jdbc.support.incrementer.SqlServerMaxValueIncrementer; import org.springframework.jdbc.support.incrementer.SybaseMaxValueIncrementer; +import org.springframework.jdbc.support.incrementer.MariaDBSequenceMaxValueIncrementer; import static org.springframework.batch.support.DatabaseType.DB2; import static org.springframework.batch.support.DatabaseType.DB2AS400; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/MariaDBSequenceMaxValueIncrementer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/MariaDBSequenceMaxValueIncrementer.java deleted file mode 100644 index 249c18e79..000000000 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/MariaDBSequenceMaxValueIncrementer.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2022 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 - * - * http://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.batch.item.database.support; - -import javax.sql.DataSource; - -import org.springframework.jdbc.support.incrementer.AbstractSequenceMaxValueIncrementer; -import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer; - -/** - * {@link DataFieldMaxValueIncrementer} for MariaDB. - * - * @author Mahmoud Ben Hassine - * @since 5.0 - */ -// TODO replace this with the one from Spring Framework when available -public class MariaDBSequenceMaxValueIncrementer extends AbstractSequenceMaxValueIncrementer { - - public MariaDBSequenceMaxValueIncrementer() { - } - - public MariaDBSequenceMaxValueIncrementer(DataSource dataSource, String incrementerName) { - super(dataSource, incrementerName); - } - - @Override - protected String getSequenceQuery() { - return "select next value for " + this.getIncrementerName(); - } - -} diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactoryTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactoryTests.java index aed4171eb..6893c85ef 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactoryTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactoryTests.java @@ -33,6 +33,7 @@ import org.springframework.jdbc.support.incrementer.MySQLMaxValueIncrementer; import org.springframework.jdbc.support.incrementer.OracleSequenceMaxValueIncrementer; import org.springframework.jdbc.support.incrementer.PostgresSequenceMaxValueIncrementer; import org.springframework.jdbc.support.incrementer.SybaseMaxValueIncrementer; +import org.springframework.jdbc.support.incrementer.MariaDBSequenceMaxValueIncrementer; /** * @author Lucas Ward diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/MariaDBSequenceMaxValueIncrementerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/MariaDBSequenceMaxValueIncrementerTests.java deleted file mode 100644 index b27d74272..000000000 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/MariaDBSequenceMaxValueIncrementerTests.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2022 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.batch.item.database.support; - -import javax.sql.DataSource; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -/** - * @author Mahmoud Ben Hassine - */ -@ExtendWith(MockitoExtension.class) -class MariaDBSequenceMaxValueIncrementerTests { - - @Mock - private DataSource dataSource; - - @Test - void testGetSequenceQuery() { - // given - var incrementer = new MariaDBSequenceMaxValueIncrementer(this.dataSource, "BATCH_JOB_SEQ"); - - // when - String sequenceQuery = incrementer.getSequenceQuery(); - - // then - assertEquals("select next value for BATCH_JOB_SEQ", sequenceQuery); - } - -} \ No newline at end of file