Merge branch '6.4.x'

rwinch · rwinch · commit bb38fd348338 · 2025-01-13T17:33:32.000-06:00
Closes gh-16409
diff --git a/core/src/main/java/org/springframework/security/authentication/ott/JdbcOneTimeTokenService.java b/core/src/main/java/org/springframework/security/authentication/ott/JdbcOneTimeTokenService.java
@@ -190,7 +190,8 @@ private ThreadPoolTaskScheduler createTaskScheduler(String cleanupCron) {
 	}
 
 	public void cleanupExpiredTokens() {
-		List<SqlParameterValue> parameters = List.of(new SqlParameterValue(Types.TIMESTAMP, Instant.now()));
+		List<SqlParameterValue> parameters = List
+			.of(new SqlParameterValue(Types.TIMESTAMP, Timestamp.from(Instant.now())));
 		PreparedStatementSetter pss = new ArgumentPreparedStatementSetter(parameters.toArray());
 		int deletedCount = this.jdbcOperations.update(DELETE_ONE_TIME_TOKENS_BY_EXPIRY_TIME_QUERY, pss);
 		if (this.logger.isDebugEnabled()) {

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,8 @@ private ThreadPoolTaskScheduler createTaskScheduler(String cleanupCron) {`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`public void cleanupExpiredTokens() {`
`193`		`- List<SqlParameterValue> parameters = List.of(new SqlParameterValue(Types.TIMESTAMP, Instant.now()));`
	`193`	`+ List<SqlParameterValue> parameters = List`
	`194`	`+ .of(new SqlParameterValue(Types.TIMESTAMP, Timestamp.from(Instant.now())));`
`194`	`195`	`PreparedStatementSetter pss = new ArgumentPreparedStatementSetter(parameters.toArray());`
`195`	`196`	`int deletedCount = this.jdbcOperations.update(DELETE_ONE_TIME_TOKENS_BY_EXPIRY_TIME_QUERY, pss);`
`196`	`197`	`if (this.logger.isDebugEnabled()) {`