Skip to content

Commit 048f7f2

Browse files
committed
Fixed Sequence id generation test.
1 parent 871f88d commit 048f7f2

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/mapping/IdGeneratingBeforeSaveCallback.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
import org.springframework.lang.Nullable;
2222
import org.springframework.util.Assert;
2323

24+
import static org.springframework.util.Assert.*;
25+
2426
/**
2527
* Callback for generating ID via the database sequence. By default, it is registered as a bean in
2628
* {@link AbstractJdbcConfiguration}
@@ -123,7 +125,7 @@ private Long querySequence(SqlIdentifier s) {
123125

124126
String sql = dialect.getIdGeneration().createSequenceQuery(s);
125127
Long sequenceValue = operations.queryForObject(sql, Map.of(), Long.class);
126-
Assert.state(sequenceValue != null, () -> "No sequence value found for " + s);
128+
state(sequenceValue != null, () -> "No sequence value found for " + s);
127129
return sequenceValue;
128130
}
129131
}
+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*
2626
* @author Mikhail Polivakha
2727
*/
28-
class IdGeneratingBeforeSaveCallbackTest {
28+
class IdGeneratingBeforeSaveCallbackUnitTests {
2929

3030
@Test // GH-1923
3131
void mySqlDialectSequenceGenerationIsNotSupported() {
@@ -76,7 +76,7 @@ void entityIdIsPopulatedFromSequence() {
7676
NamedParameterJdbcOperations operations = mock(NamedParameterJdbcOperations.class);
7777

7878
long generatedId = 112L;
79-
when(operations.queryForObject(anyString(), anyMap(), any(RowMapper.class))).thenReturn(generatedId);
79+
when(operations.queryForObject(anyString(), anyMap(), any(Class.class))).thenReturn(generatedId);
8080

8181
IdGeneratingBeforeSaveCallback subject = new IdGeneratingBeforeSaveCallback(mySqlDialect,
8282
operations, converter);
@@ -101,7 +101,7 @@ void entityWithSequenceEmbeddedIdIsPopulatedFromSequence() {
101101
NamedParameterJdbcOperations operations = mock(NamedParameterJdbcOperations.class);
102102

103103
long generatedId = 112L;
104-
when(operations.queryForObject(anyString(), anyMap(), any(RowMapper.class))).thenReturn(generatedId);
104+
when(operations.queryForObject(anyString(), anyMap(), any(Class.class))).thenReturn(generatedId);
105105

106106
IdGeneratingBeforeSaveCallback subject = new IdGeneratingBeforeSaveCallback(mySqlDialect,
107107
operations, converter);

0 commit comments

Comments
 (0)