#2272 Do not fail in startup time if LockProvider is not found

lukas-krecan · Nov 25, 2024 · 606c127 · 606c127
1 parent 8be6ffd
commit 606c127
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/...hedlock-spring/src/main/java/net/javacrumbs/shedlock/spring/aop/LockProviderSupplier.java b/...hedlock-spring/src/main/java/net/javacrumbs/shedlock/spring/aop/LockProviderSupplier.java
@@ -3,7 +3,6 @@
 import java.lang.reflect.Method;
 import net.javacrumbs.shedlock.core.LockProvider;
 import org.springframework.beans.factory.ListableBeanFactory;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 
 /**
  * Not public now. If you think you need your LockProviderSupplier please create an issue and explain your use-case.
@@ -15,10 +14,10 @@ interface LockProviderSupplier {
     static LockProviderSupplier create(ListableBeanFactory beanFactory) {
         // Only fetching beanNames as the beans might not have been initialized yet.
         String[] beanNamesForType = beanFactory.getBeanNamesForType(LockProvider.class);
-        if (beanNamesForType.length == 0) {
-            throw new NoSuchBeanDefinitionException(LockProvider.class, "No LockProvider bean found.");
-        }
-        if (beanNamesForType.length == 1) {
+        // If there are no beans of LockProvider type, we can't fail here as in older version we
+        // did not fail, and it's quire common in tests. To maintain backward compatibility
+        // the failure will happen in runtime.
+        if (beanNamesForType.length <= 1) {
             return (target, method, arguments) -> beanFactory.getBean(LockProvider.class);
         }
         return new BeanNameSelectingLockProviderSupplier(beanFactory);

diff --git a/...shedlock-springboot-test/src/main/java/net/javacrumbs/shedlock/test/boot/Application.java b/...shedlock-springboot-test/src/main/java/net/javacrumbs/shedlock/test/boot/Application.java
@@ -26,5 +26,4 @@ public class Application {
     public static void main(String[] args) {
         SpringApplication.run(Application.class);
     }
-
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,5 +26,4 @@ public class Application { @@
         public static void main(String[] args) {
             SpringApplication.run(Application.class);
         }
     }