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

Merge pull request #27863 from izeye 

* pr/27863:
  Update copyright year of changed file
  Remove references to JCacheConfigurerSupport and CachingConfigurerSupport

Closes gh-27863
This commit is contained in:
Stephane Nicoll 2021-12-29 10:55:54 +01:00
parent 7ba089be95 c204cc7ba0
commit c09a674dcb
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingIsolatedTests.java vendored
View File

@ -21,7 +21,7 @@ import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
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.interceptor.CacheErrorHandler;
import org.springframework.cache.interceptor.CacheResolver;
@ -143,7 +143,7 @@ public class AspectJEnableCachingIsolatedTests {
@Configuration
@EnableCaching(mode = AdviceMode.ASPECTJ)
static class EnableCachingConfig extends CachingConfigurerSupport {
static class EnableCachingConfig implements CachingConfigurer {
@Override
@Bean
@ -220,7 +220,7 @@ public class AspectJEnableCachingIsolatedTests {
@Configuration
@EnableCaching(mode = AdviceMode.ASPECTJ)
static class MultiCacheManagerConfigurer extends CachingConfigurerSupport {
static class MultiCacheManagerConfigurer implements CachingConfigurer {
@Bean
public CacheManager cm1() {
@ -246,7 +246,7 @@ public class AspectJEnableCachingIsolatedTests {
@Configuration
@EnableCaching(mode = AdviceMode.ASPECTJ)
static class EmptyConfigSupportConfig extends CachingConfigurerSupport {
static class EmptyConfigSupportConfig implements CachingConfigurer {
@Bean
public CacheManager cm() {
@ -258,7 +258,7 @@ public class AspectJEnableCachingIsolatedTests {
@Configuration
@EnableCaching(mode = AdviceMode.ASPECTJ)
static class FullCachingConfig extends CachingConfigurerSupport {
static class FullCachingConfig implements CachingConfigurer {
@Override
@Bean

4
spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingTests.java vendored
View File

@ -17,7 +17,7 @@
package org.springframework.cache.aspectj;
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.config.AnnotatedClassCacheableService;
import org.springframework.cache.config.CacheableService;
@ -47,7 +47,7 @@ public class AspectJEnableCachingTests extends AbstractCacheAnnotationTests {
@Configuration
@EnableCaching(mode = AdviceMode.ASPECTJ)
static class EnableCachingConfig extends CachingConfigurerSupport {
static class EnableCachingConfig implements CachingConfigurer {
@Override
@Bean

2
spring-context-support/src/main/java/org/springframework/cache/jcache/config/JCacheConfigurer.java vendored
View File

@ -46,7 +46,7 @@ public interface JCacheConfigurer extends CachingConfigurer {
* <pre class="code">
* &#064;Configuration
* &#064;EnableCaching
* public class AppConfig extends JCacheConfigurerSupport {
* public class AppConfig implements JCacheConfigurer {
* &#064;Bean // important!
* &#064;Override
* public CacheResolver exceptionCacheResolver() {

8
spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurer.java vendored
View File

@ -50,7 +50,7 @@ public interface CachingConfigurer {
* <pre class="code">
* &#064;Configuration
* &#064;EnableCaching
* public class AppConfig extends CachingConfigurerSupport {
* public class AppConfig implements CachingConfigurer {
* &#064;Bean // important!
* &#064;Override
* public CacheManager cacheManager() {
@ -77,7 +77,7 @@ public interface CachingConfigurer {
* <pre class="code">
* &#064;Configuration
* &#064;EnableCaching
* public class AppConfig extends CachingConfigurerSupport {
* public class AppConfig implements CachingConfigurer {
* &#064;Bean // important!
* &#064;Override
* public CacheResolver cacheResolver() {
@ -100,7 +100,7 @@ public interface CachingConfigurer {
* <pre class="code">
* &#064;Configuration
* &#064;EnableCaching
* public class AppConfig extends CachingConfigurerSupport {
* public class AppConfig implements CachingConfigurer {
* &#064;Bean // important!
* &#064;Override
* public KeyGenerator keyGenerator() {
@ -125,7 +125,7 @@ public interface CachingConfigurer {
* <pre class="code">
* &#064;Configuration
* &#064;EnableCaching
* public class AppConfig extends CachingConfigurerSupport {
* public class AppConfig implements CachingConfigurer {
* &#064;Bean // important!
* &#064;Override
* public CacheErrorHandler errorHandler() {

4
spring-context/src/main/java/org/springframework/cache/annotation/EnableCaching.java vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2021 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.
@ -103,7 +103,7 @@ import org.springframework.core.Ordered;
* <pre class="code">
* &#064;Configuration
* &#064;EnableCaching
* public class AppConfig extends CachingConfigurerSupport {
* public class AppConfig implements CachingConfigurer {
*
* &#064;Bean
* public MyService myService() {