Workaround for spring-projects/spring-framework#29699 not needed anymore

lukas-krecan · Jan 12, 2023 · e0d1462 · e0d1462
1 parent 0d43bb9
commit e0d1462
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.../main/java/net/javacrumbs/shedlock/provider/jdbctemplate/JdbcTemplateStorageAccessor.java b/.../main/java/net/javacrumbs/shedlock/provider/jdbctemplate/JdbcTemplateStorageAccessor.java
@@ -21,6 +21,7 @@
 import net.javacrumbs.shedlock.support.annotation.NonNull;
 import org.springframework.dao.ConcurrencyFailureException;
 import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.dao.DuplicateKeyException;
 import org.springframework.jdbc.BadSqlGrammarException;
 import org.springframework.jdbc.UncategorizedSQLException;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
@@ -65,10 +66,10 @@ public boolean insertRecord(@NonNull LockConfiguration lockConfiguration) {
         try {
             String sql = sqlStatementsSource().getInsertStatement();
             return execute(sql, lockConfiguration);
-        } catch (DataIntegrityViolationException | ConcurrencyFailureException | TransactionSystemException e) {
+        } catch (DuplicateKeyException | ConcurrencyFailureException | TransactionSystemException e) {
             logger.debug("Duplicate key", e);
             return false;
-        } catch (BadSqlGrammarException | UncategorizedSQLException e) {
+        } catch (DataIntegrityViolationException | BadSqlGrammarException | UncategorizedSQLException e) {
             logger.error("Unexpected exception", e);
             return false;
         }

diff --git a/providers/jdbc/shedlock-provider-jooq/src/test/resources/logback-test.xml b/providers/jdbc/shedlock-provider-jooq/src/test/resources/logback-test.xml
@@ -7,7 +7,7 @@
     </appender>
 
     <logger name="com.zaxxer.hikari.HikariDataSource" level="WARN" />
-  
+
     <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>