Renamed DeadlockRetryLockProvider to DeadlockLockProvider as there is no retry

Author: oharsta

…vite/cron/DeadlockRetryLockProvider.java …va/invite/cron/DeadlockLockProvider.javaserver/src/main/java/invite/cron/DeadlockRetryLockProvider.java renamed to server/src/main/java/invite/cron/DeadlockLockProvider.java server/src/main/java/invite/cron/DeadlockRetryLockProvider.java renamed to server/src/main/java/invite/cron/DeadlockLockProvider.java

@@ -10,13 +10,13 @@
 import java.sql.SQLTransactionRollbackException;
 import java.util.Optional;
 
-public class DeadlockRetryLockProvider implements LockProvider {
+public class DeadlockLockProvider implements LockProvider {
 
-    private static final Log LOG = LogFactory.getLog(DeadlockRetryLockProvider.class);
+    private static final Log LOG = LogFactory.getLog(DeadlockLockProvider.class);
 
     private final LockProvider delegate;
 
-    public DeadlockRetryLockProvider(LockProvider delegate) {
+    public DeadlockLockProvider(LockProvider delegate) {
         this.delegate = delegate;
     }
 
@@ -29,8 +29,11 @@ public Optional<SimpleLock> lock(LockConfiguration lockConfiguration) {
                 LOG.warn(String.format("Deadlock acquiring ShedLock '%s', skipping cycle",
                         lockConfiguration.getName()));
                 return Optional.empty();  // treat as "already locked", skip this cycle
+            } else {
+                LOG.error(String.format("Unexpected error acquiring ShedLock '%s', skipping cycle",
+                        lockConfiguration.getName()), e);
+                return Optional.empty();  // treat as "already locked", skip this cycle, but make noise
             }
-            throw e;  // rethrow non-deadlock exceptions as-is
         }
     }
 

server/src/main/java/invite/cron/ShedLockConfig.java

@@ -1,6 +1,7 @@
 package invite.cron;
 
 import net.javacrumbs.shedlock.core.LockProvider;
+import net.javacrumbs.shedlock.core.SimpleLock;
 import net.javacrumbs.shedlock.provider.jdbctemplate.JdbcTemplateLockProvider;
 import net.javacrumbs.shedlock.spring.annotation.EnableSchedulerLock;
 import org.springframework.context.annotation.Bean;
@@ -24,12 +25,17 @@ public LockProvider lockProvider(DataSource dataSource) {
                         .usingDbTime() // Use DB time, not app-node time — avoids clock skew
                         .build()
         );
-        return new DeadlockRetryLockProvider(delegate);
+        return new DeadlockLockProvider(delegate);
     }
 
     @Bean
     @Profile("test")
     public LockProvider noOpLockProvider() {
-        return lockConfiguration -> Optional.of(() -> {});
+        return lockConfiguration -> Optional.of(() -> new SimpleLock() {
+            @Override
+            public void unlock() {
+                //noop
+            }
+        });
     }
 }