Stop wrapping low-level exceptions in CacheAspectSupport initialization

This commit replaces the IllegalStateException thrown in
CacheAspectSupport when a CacheManager cannot be determined. These were
added to provide a dedicated error message, but it is possible to do
so without hiding the more adequate exception type.

Closes gh-22442

Author: snicoll

spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingIsolatedTests.java

@@ -20,6 +20,8 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.CachingConfigurer;
 import org.springframework.cache.annotation.EnableCaching;
@@ -91,8 +93,9 @@ void multipleCacheManagerBeans() {
 		try {
 			load(MultiCacheManagerConfig.class);
 		}
-		catch (IllegalStateException ex) {
-			assertThat(ex.getMessage()).contains("bean of type CacheManager");
+		catch (NoUniqueBeanDefinitionException ex) {
+			assertThat(ex.getMessage()).contains(
+					"no CacheResolver specified and expected a single CacheManager bean, but found 2: [cm1,cm2]");
 		}
 	}
 
@@ -116,8 +119,8 @@ void noCacheManagerBeans() {
 		try {
 			load(EmptyConfig.class);
 		}
-		catch (IllegalStateException ex) {
-			assertThat(ex.getMessage()).contains("no bean of type CacheManager");
+		catch (NoSuchBeanDefinitionException ex) {
+			assertThat(ex.getMessage()).contains("no CacheResolver specified");
 		}
 	}
 

spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java

@@ -270,12 +270,17 @@ public void afterSingletonsInstantiated() {
 				setCacheManager(this.beanFactory.getBean(CacheManager.class));
 			}
 			catch (NoUniqueBeanDefinitionException ex) {
-				throw new IllegalStateException("No CacheResolver specified, and no unique bean of type " +
-						"CacheManager found. Mark one as primary or declare a specific CacheManager to use.", ex);
+				StringBuilder message = new StringBuilder("no CacheResolver specified and expected a single CacheManager bean, but found ");
+				message.append(ex.getNumberOfBeansFound());
+				if (ex.getBeanNamesFound() != null) {
+					message.append(": [").append(StringUtils.collectionToCommaDelimitedString(ex.getBeanNamesFound())).append("]");
+				}
+				message.append(" - mark one as primary or declare a specific CacheManager to use.");
+				throw new NoUniqueBeanDefinitionException(CacheManager.class, ex.getNumberOfBeansFound(), message.toString());
 			}
 			catch (NoSuchBeanDefinitionException ex) {
-				throw new IllegalStateException("No CacheResolver specified, and no bean of type CacheManager found. " +
-						"Register a CacheManager bean or remove the @EnableCaching annotation from your configuration.", ex);
+				throw new NoSuchBeanDefinitionException(CacheManager.class, "no CacheResolver specified - "
+						+ "register a CacheManager bean or remove the @EnableCaching annotation from your configuration.");
 			}
 		}
 		this.initialized = true;

spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -89,13 +89,12 @@ void singleCacheManagerBean() {
 
 	@Test
 	void multipleCacheManagerBeans() {
-		@SuppressWarnings("resource")
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(MultiCacheManagerConfig.class);
 		assertThatThrownBy(ctx::refresh)
-				.isInstanceOf(IllegalStateException.class)
-				.hasMessageContaining("no unique bean of type CacheManager")
-				.hasCauseInstanceOf(NoUniqueBeanDefinitionException.class);
+				.isInstanceOf(NoUniqueBeanDefinitionException.class)
+				.hasMessageContaining("no CacheResolver specified and expected a single CacheManager bean, but found 2: [cm1,cm2]")
+				.hasNoCause();
 	}
 
 	@Test
@@ -117,13 +116,14 @@ void multipleCachingConfigurers() {
 
 	@Test
 	void noCacheManagerBeans() {
-		@SuppressWarnings("resource")
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(EmptyConfig.class);
 		assertThatThrownBy(ctx::refresh)
-				.isInstanceOf(IllegalStateException.class)
-				.hasMessageContaining("no bean of type CacheManager")
-				.hasCauseInstanceOf(NoSuchBeanDefinitionException.class);
+				.isInstanceOf(NoSuchBeanDefinitionException.class)
+				.hasMessageContaining("no CacheResolver specified")
+				.hasMessageContaining(
+						"register a CacheManager bean or remove the @EnableCaching annotation from your configuration.")
+				.hasNoCause();
 	}
 
 	@Test