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 branch '6.0.x'

This commit is contained in:
Juergen Hoeller 2023-08-21 15:45:22 +02:00
parent 26da0e49e4 8be77cc650
commit c2bdc23b5e
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2021 the original author or authors. * Copyright 2002-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -24,8 +24,8 @@ import org.springframework.lang.Nullable;
/** /**
* Interface to be implemented by @{@link org.springframework.context.annotation.Configuration * Interface to be implemented by @{@link org.springframework.context.annotation.Configuration
* Configuration} classes annotated with @{@link EnableCaching} that wish or need to * Configuration} classes annotated with @{@link EnableCaching} that wish or need to specify
* specify explicitly how caches are resolved and how keys are generated for annotation-driven * explicitly how caches are resolved and how keys are generated for annotation-driven
* cache management. * cache management.
* *
* <p>See @{@link EnableCaching} for general examples and context; see * <p>See @{@link EnableCaching} for general examples and context; see

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2022 the original author or authors. * Copyright 2002-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -141,11 +141,8 @@ import org.springframework.core.Ordered;
* must be provided explicitly. Return {@code null} or {@code new SimpleKeyGenerator()} * must be provided explicitly. Return {@code null} or {@code new SimpleKeyGenerator()}
* from this method if no customization is necessary. * from this method if no customization is necessary.
* *
* <p>{@link CachingConfigurer} offers additional customization options: it is recommended * <p>{@link CachingConfigurer} offers additional customization options:
* to extend from {@link org.springframework.cache.annotation.CachingConfigurerSupport * see the {@link CachingConfigurer} javadoc for further details.
* CachingConfigurerSupport} that provides a default implementation for all methods which
* can be useful if you do not need to customize everything. See {@link CachingConfigurer}
* Javadoc for further details.
* *
* <p>The {@link #mode} attribute controls how advice is applied: If the mode is * <p>The {@link #mode} attribute controls how advice is applied: If the mode is
* {@link AdviceMode#PROXY} (the default), then the other attributes control the behavior * {@link AdviceMode#PROXY} (the default), then the other attributes control the behavior