root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.7.x'

This commit is contained in:
Stephane Nicoll 2021-12-15 16:41:27 +01:00
parent 081f55a87a 38aeeee381
commit 035adf4f05
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java vendored
View File

@ -44,7 +44,7 @@ import org.springframework.boot.test.context.assertj.AssertableApplicationContex
import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
import org.springframework.cache.Cache;
import org.springframework.cache.CacheManager;
import org.springframework.cache.annotation.CachingConfigurerSupport;
import org.springframework.cache.annotation.CachingConfigurer;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.cache.caffeine.CaffeineCache;
import org.springframework.cache.caffeine.CaffeineCacheManager;
@ -707,7 +707,7 @@ class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationTests {
@Configuration(proxyBeanMethods = false)
@EnableCaching
static class CustomCacheManagerFromSupportConfiguration extends CachingConfigurerSupport {
static class CustomCacheManagerFromSupportConfiguration implements CachingConfigurer {
@Override
@Bean
@ -720,7 +720,7 @@ class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationTests {
@Configuration(proxyBeanMethods = false)
@EnableCaching
static class CustomCacheResolverFromSupportConfiguration extends CachingConfigurerSupport {
static class CustomCacheResolverFromSupportConfiguration implements CachingConfigurer {
@Override
@Bean