Remove references to JCacheConfigurerSupport and CachingConfigurerSupport
See gh-27863
This commit is contained in:
parent
7ba089be95
commit
f0125afb5e
|
|
@ -21,7 +21,7 @@ import org.junit.jupiter.api.Disabled;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
import org.springframework.cache.CacheManager;
|
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.annotation.EnableCaching;
|
||||||
import org.springframework.cache.interceptor.CacheErrorHandler;
|
import org.springframework.cache.interceptor.CacheErrorHandler;
|
||||||
import org.springframework.cache.interceptor.CacheResolver;
|
import org.springframework.cache.interceptor.CacheResolver;
|
||||||
|
|
@ -143,7 +143,7 @@ public class AspectJEnableCachingIsolatedTests {
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@EnableCaching(mode = AdviceMode.ASPECTJ)
|
@EnableCaching(mode = AdviceMode.ASPECTJ)
|
||||||
static class EnableCachingConfig extends CachingConfigurerSupport {
|
static class EnableCachingConfig implements CachingConfigurer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Bean
|
@Bean
|
||||||
|
|
@ -220,7 +220,7 @@ public class AspectJEnableCachingIsolatedTests {
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@EnableCaching(mode = AdviceMode.ASPECTJ)
|
@EnableCaching(mode = AdviceMode.ASPECTJ)
|
||||||
static class MultiCacheManagerConfigurer extends CachingConfigurerSupport {
|
static class MultiCacheManagerConfigurer implements CachingConfigurer {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
public CacheManager cm1() {
|
public CacheManager cm1() {
|
||||||
|
|
@ -246,7 +246,7 @@ public class AspectJEnableCachingIsolatedTests {
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@EnableCaching(mode = AdviceMode.ASPECTJ)
|
@EnableCaching(mode = AdviceMode.ASPECTJ)
|
||||||
static class EmptyConfigSupportConfig extends CachingConfigurerSupport {
|
static class EmptyConfigSupportConfig implements CachingConfigurer {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
public CacheManager cm() {
|
public CacheManager cm() {
|
||||||
|
|
@ -258,7 +258,7 @@ public class AspectJEnableCachingIsolatedTests {
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@EnableCaching(mode = AdviceMode.ASPECTJ)
|
@EnableCaching(mode = AdviceMode.ASPECTJ)
|
||||||
static class FullCachingConfig extends CachingConfigurerSupport {
|
static class FullCachingConfig implements CachingConfigurer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Bean
|
@Bean
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
package org.springframework.cache.aspectj;
|
package org.springframework.cache.aspectj;
|
||||||
|
|
||||||
import org.springframework.cache.CacheManager;
|
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.annotation.EnableCaching;
|
||||||
import org.springframework.cache.config.AnnotatedClassCacheableService;
|
import org.springframework.cache.config.AnnotatedClassCacheableService;
|
||||||
import org.springframework.cache.config.CacheableService;
|
import org.springframework.cache.config.CacheableService;
|
||||||
|
|
@ -47,7 +47,7 @@ public class AspectJEnableCachingTests extends AbstractCacheAnnotationTests {
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@EnableCaching(mode = AdviceMode.ASPECTJ)
|
@EnableCaching(mode = AdviceMode.ASPECTJ)
|
||||||
static class EnableCachingConfig extends CachingConfigurerSupport {
|
static class EnableCachingConfig implements CachingConfigurer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Bean
|
@Bean
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,7 @@ public interface JCacheConfigurer extends CachingConfigurer {
|
||||||
* <pre class="code">
|
* <pre class="code">
|
||||||
* @Configuration
|
* @Configuration
|
||||||
* @EnableCaching
|
* @EnableCaching
|
||||||
* public class AppConfig extends JCacheConfigurerSupport {
|
* public class AppConfig implements JCacheConfigurer {
|
||||||
* @Bean // important!
|
* @Bean // important!
|
||||||
* @Override
|
* @Override
|
||||||
* public CacheResolver exceptionCacheResolver() {
|
* public CacheResolver exceptionCacheResolver() {
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@ public interface CachingConfigurer {
|
||||||
* <pre class="code">
|
* <pre class="code">
|
||||||
* @Configuration
|
* @Configuration
|
||||||
* @EnableCaching
|
* @EnableCaching
|
||||||
* public class AppConfig extends CachingConfigurerSupport {
|
* public class AppConfig implements CachingConfigurer {
|
||||||
* @Bean // important!
|
* @Bean // important!
|
||||||
* @Override
|
* @Override
|
||||||
* public CacheManager cacheManager() {
|
* public CacheManager cacheManager() {
|
||||||
|
|
@ -77,7 +77,7 @@ public interface CachingConfigurer {
|
||||||
* <pre class="code">
|
* <pre class="code">
|
||||||
* @Configuration
|
* @Configuration
|
||||||
* @EnableCaching
|
* @EnableCaching
|
||||||
* public class AppConfig extends CachingConfigurerSupport {
|
* public class AppConfig implements CachingConfigurer {
|
||||||
* @Bean // important!
|
* @Bean // important!
|
||||||
* @Override
|
* @Override
|
||||||
* public CacheResolver cacheResolver() {
|
* public CacheResolver cacheResolver() {
|
||||||
|
|
@ -100,7 +100,7 @@ public interface CachingConfigurer {
|
||||||
* <pre class="code">
|
* <pre class="code">
|
||||||
* @Configuration
|
* @Configuration
|
||||||
* @EnableCaching
|
* @EnableCaching
|
||||||
* public class AppConfig extends CachingConfigurerSupport {
|
* public class AppConfig implements CachingConfigurer {
|
||||||
* @Bean // important!
|
* @Bean // important!
|
||||||
* @Override
|
* @Override
|
||||||
* public KeyGenerator keyGenerator() {
|
* public KeyGenerator keyGenerator() {
|
||||||
|
|
@ -125,7 +125,7 @@ public interface CachingConfigurer {
|
||||||
* <pre class="code">
|
* <pre class="code">
|
||||||
* @Configuration
|
* @Configuration
|
||||||
* @EnableCaching
|
* @EnableCaching
|
||||||
* public class AppConfig extends CachingConfigurerSupport {
|
* public class AppConfig implements CachingConfigurer {
|
||||||
* @Bean // important!
|
* @Bean // important!
|
||||||
* @Override
|
* @Override
|
||||||
* public CacheErrorHandler errorHandler() {
|
* public CacheErrorHandler errorHandler() {
|
||||||
|
|
|
||||||
|
|
@ -103,7 +103,7 @@ import org.springframework.core.Ordered;
|
||||||
* <pre class="code">
|
* <pre class="code">
|
||||||
* @Configuration
|
* @Configuration
|
||||||
* @EnableCaching
|
* @EnableCaching
|
||||||
* public class AppConfig extends CachingConfigurerSupport {
|
* public class AppConfig implements CachingConfigurer {
|
||||||
*
|
*
|
||||||
* @Bean
|
* @Bean
|
||||||
* public MyService myService() {
|
* public MyService myService() {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue