DATAJDBC-354 - Fix test fixture after Mockito upgrade.

Author: mp911de

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQueryUnitTests.java

@@ -47,6 +47,7 @@
  * @author Oliver Gierke
  * @author Maciej Walkowiak
  * @author Evgeni Dimitrov
+ * @author Mark Paluch
  */
 public class JdbcRepositoryQueryUnitTests {
 
@@ -153,31 +154,31 @@ public void customResultSetExtractorAndRowMapperGetCombined() {
 				.matches(crse -> crse.rowMapper != null, "RowMapper is not expected to be null");
 	}
 
-	@Test // DATAJDBC-263
+	@Test // DATAJDBC-263, DATAJDBC-354
 	public void publishesSingleEventWhenQueryReturnsSingleAggregate() {
 
 		doReturn("some sql statement").when(queryMethod).getAnnotatedQuery();
 		doReturn(false).when(queryMethod).isCollectionQuery();
 		doReturn(new DummyEntity(1L)).when(operations).queryForObject(anyString(), any(SqlParameterSource.class),
 				any(RowMapper.class));
 		doReturn(true).when(context).hasPersistentEntityFor(DummyEntity.class);
-		when(context.getRequiredPersistentEntity(DummyEntity.class).getIdentifierAccessor(any()).getRequiredIdentifier())
+		when(context.getRequiredPersistentEntity(DummyEntity.class).getIdentifierAccessor(any()).getIdentifier())
 				.thenReturn("some identifier");
 
 		new JdbcRepositoryQuery(publisher, context, queryMethod, operations, defaultRowMapper).execute(new Object[] {});
 
 		verify(publisher).publishEvent(any(AfterLoadEvent.class));
 	}
 
-	@Test // DATAJDBC-263
+	@Test // DATAJDBC-263, DATAJDBC-354
 	public void publishesAsManyEventsAsReturnedAggregates() {
 
 		doReturn("some sql statement").when(queryMethod).getAnnotatedQuery();
 		doReturn(true).when(queryMethod).isCollectionQuery();
 		doReturn(Arrays.asList(new DummyEntity(1L), new DummyEntity(1L))).when(operations).query(anyString(),
 				any(SqlParameterSource.class), any(RowMapper.class));
 		doReturn(true).when(context).hasPersistentEntityFor(DummyEntity.class);
-		when(context.getRequiredPersistentEntity(DummyEntity.class).getIdentifierAccessor(any()).getRequiredIdentifier())
+		when(context.getRequiredPersistentEntity(DummyEntity.class).getIdentifierAccessor(any()).getIdentifier())
 				.thenReturn("some identifier");
 
 		new JdbcRepositoryQuery(publisher, context, queryMethod, operations, defaultRowMapper).execute(new Object[] {});