Refactor webhook discovery and scanning mechanism

- Introduce `getWebhooksClasses()` method to retrieve webhook-related classes
- Modify `getWebhooks()` to accept an array of classes
- Improve webhook class discovery process
- Add package filtering in `calculateWebhooks()`

Fixes #3056

Author: zdary

springdoc-openapi-starter-common/src/main/java/org/springdoc/api/AbstractOpenApiResource.java

@@ -140,6 +140,7 @@
  * @author kevinraddatz
  * @author hyeonisism
  * @author doljae
+ * @author zdary
  */
 public abstract class AbstractOpenApiResource extends SpecFilter {
 
@@ -523,8 +524,12 @@ private void trimIndentOperation(Operation operation) {
 	 * @param locale            the locale
 	 */
 	protected void calculateWebhooks(OpenAPI calculatedOpenAPI, Locale locale) {
-		Webhooks[] webhooksAttr = openAPIService.getWebhooks();
-		if (ArrayUtils.isEmpty(webhooksAttr))
+        Class<?>[] classes = openAPIService.getWebhooksClasses();
+        Class<?>[] refinedClasses = Arrays.stream(classes)
+                .filter(clazz -> isPackageToScan(clazz.getPackage()))
+                .toArray(Class<?>[]::new);
+        Webhooks[] webhooksAttr = openAPIService.getWebhooks(refinedClasses);
+        if (ArrayUtils.isEmpty(webhooksAttr))
 			return;
 		var webhooks = Arrays.stream(webhooksAttr).map(Webhooks::value).flatMap(Arrays::stream).toArray(Webhook[]::new);
 		Arrays.stream(webhooks).forEach(webhook -> {

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/OpenAPIService.java

@@ -104,6 +104,7 @@
  * The type Open api builder.
  *
  * @author bnasslahsen
+ * @author zdary
  */
 public class OpenAPIService implements ApplicationContextAware {
 
@@ -538,63 +539,72 @@ private Optional<OpenAPIDefinition> getOpenAPIDefinition() {
 	}
 
 
-	/**
-	 * Get webhooks webhooks [ ].
-	 *
-	 * @return the webhooks [ ]
-	 */
-	public Webhooks[] getWebhooks() {
-		List<Webhooks> allWebhooks = new ArrayList<>();
-
-		// First: scan Spring-managed beans
-		Map<String, Object> beans = context.getBeansWithAnnotation(Webhooks.class);
-
-		for (Object bean : beans.values()) {
-			Class<?> beanClass = bean.getClass();
-
-			// Collect @Webhooks or @Webhook on class level
-			collectWebhooksFromElement(beanClass, allWebhooks);
+    /**
+     * Gets webhooks from given classes.
+     *
+     * @param classes Array of classes to scan for webhooks.
+     * @return An array of {@link Webhooks} annotations found in the given classes.
+     */
+    public Webhooks[] getWebhooks(Class<?>[] classes) {
+        List<Webhooks> allWebhooks = new ArrayList<>();
+
+        for (Class<?> clazz : classes) {
+            // Class-level annotations
+            collectWebhooksFromElement(clazz, allWebhooks);
+
+            // Method-level annotations
+            for (Method method : clazz.getDeclaredMethods()) {
+                collectWebhooksFromElement(method, allWebhooks);
+            }
+        }
+
+        return allWebhooks.toArray(new Webhooks[0]);
+    }
+
+
+    /**
+     * Retrieves all classes related to webhooks.
+     * This method scans for classes annotated with {@link Webhooks} or {@link Webhook},
+     * first checking Spring-managed beans and then falling back to classpath scanning
+     * if no annotated beans are found.
+     *
+     * @return An array of classes related to webhooks.
+     */
+    public Class<?>[] getWebhooksClasses() {
+        Set<Class<?>> allWebhookClassesToScan = new HashSet<>();
+
+        // First: scan Spring-managed beans
+        Map<String, Object> beans = context.getBeansWithAnnotation(Webhooks.class);
+
+        for (Object bean : beans.values()) {
+            Class<?> beanClass = bean.getClass();
+            allWebhookClassesToScan.add(beanClass);
+        }
+
+        // Fallback: classpath scanning
+        ClassPathScanningCandidateComponentProvider scanner =
+                new ClassPathScanningCandidateComponentProvider(false);
+        scanner.addIncludeFilter(new AnnotationTypeFilter(Webhooks.class));
+        scanner.addIncludeFilter(new AnnotationTypeFilter(Webhook.class));
+
+        if (AutoConfigurationPackages.has(context)) {
+            for (String basePackage : AutoConfigurationPackages.get(context)) {
+                Set<BeanDefinition> candidates = scanner.findCandidateComponents(basePackage);
+                for (BeanDefinition bd : candidates) {
+                    try {
+                        Class<?> clazz = Class.forName(bd.getBeanClassName());
+                        allWebhookClassesToScan.add(clazz);
+                    }
+                    catch (ClassNotFoundException e) {
+                        LOGGER.error("Class not found in classpath: {}", e.getMessage());
+                    }
+                }
+            }
+        }
+
+        return allWebhookClassesToScan.toArray(new Class<?>[0]);
+    }
 
-			// Collect from methods
-			for (Method method : beanClass.getDeclaredMethods()) {
-				collectWebhooksFromElement(method, allWebhooks);
-			}
-		}
-
-		// Fallback: classpath scanning if nothing found
-		if (allWebhooks.isEmpty()) {
-			ClassPathScanningCandidateComponentProvider scanner =
-					new ClassPathScanningCandidateComponentProvider(false);
-			scanner.addIncludeFilter(new AnnotationTypeFilter(Webhooks.class));
-			scanner.addIncludeFilter(new AnnotationTypeFilter(Webhook.class));
-
-			if (AutoConfigurationPackages.has(context)) {
-				for (String basePackage : AutoConfigurationPackages.get(context)) {
-					Set<BeanDefinition> candidates = scanner.findCandidateComponents(basePackage);
-
-					for (BeanDefinition bd : candidates) {
-						try {
-							Class<?> clazz = Class.forName(bd.getBeanClassName());
-
-							// Class-level annotations
-							collectWebhooksFromElement(clazz, allWebhooks);
-
-							// Method-level annotations
-							for (Method method : clazz.getDeclaredMethods()) {
-								collectWebhooksFromElement(method, allWebhooks);
-							}
-
-						}
-						catch (ClassNotFoundException e) {
-							LOGGER.error("Class not found in classpath: {}", e.getMessage());
-						}
-					}
-				}
-			}
-		}
-
-		return allWebhooks.toArray(new Webhooks[0]);
-	}
 
 	/**
 	 * Collect webhooks from element.

springdoc-openapi-starter-common/src/test/java/org/springdoc/api/AbstractOpenApiResourceTest.java

@@ -125,7 +125,8 @@ public void setUp() {
 
 		when(openAPIService.build(any())).thenReturn(openAPI);
 		when(openAPIService.getContext()).thenReturn(context);
-		doAnswer(new CallsRealMethods()).when(openAPIService).setServersPresent(false);
+        when(openAPIService.getWebhooksClasses()).thenReturn(new Class<?>[0]);
+        doAnswer(new CallsRealMethods()).when(openAPIService).setServersPresent(false);
 
 		when(openAPIBuilderObjectFactory.getObject()).thenReturn(openAPIService);
 		when(springDocProviders.jsonMapper()).thenReturn(Json.mapper());
@@ -295,4 +296,4 @@ private static class EmptyPathsOpenApiResource extends AbstractOpenApiResource {
 		public void getPaths(Map<String, Object> findRestControllers, Locale locale, OpenAPI openAPI) {
 		}
 	}
-}
+}