Skip to content

Commit 782ab28

Browse files
committed
Polish documentation regarding target class proxying
Closes gh-12196
1 parent 9b61df6 commit 782ab28

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/aop/AopAutoConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2017 the original author or authors.
2+
* Copyright 2012-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -32,8 +32,8 @@
3232
* configuration.
3333
* <p>
3434
* The configuration will not be activated if {@literal spring.aop.auto=false}. The
35-
* {@literal proxyTargetClass} attribute will be {@literal false}, by default, but can be
36-
* overridden by specifying {@literal spring.aop.proxyTargetClass=true}.
35+
* {@literal proxyTargetClass} attribute will be {@literal true}, by default, but can be
36+
* overridden by specifying {@literal spring.aop.proxy-target-class=false}.
3737
*
3838
* @author Dave Syer
3939
* @author Josh Long

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void aopWithDisabledProxyTargetClass() {
7575
}
7676

7777
@Test
78-
public void aopWithCustomConfiguration() {
78+
public void customConfigurationWithProxyTargetClassDefaultDoesNotDisableProxying() {
7979
this.contextRunner.withUserConfiguration(CustomTestConfiguration.class)
8080
.run(proxyTargetClassEnabled());
8181
}
@@ -101,7 +101,7 @@ private ContextConsumer<AssertableApplicationContext> proxyTargetClassDisabled()
101101
};
102102
}
103103

104-
@EnableAspectJAutoProxy(proxyTargetClass = true)
104+
@EnableAspectJAutoProxy
105105
@Configuration
106106
@Import(TestConfiguration.class)
107107
protected static class CustomTestConfiguration {

spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4575,9 +4575,6 @@ TIP: It is also possible to transparently
45754575
{spring-reference}integration.html#cache-annotations-evict[evict] data from the cache.
45764576

45774577

4578-
NOTE: If you use the cache infrastructure with beans that are not interface-based, make
4579-
sure to enable the `proxyTargetClass` attribute of `@EnableCaching`.
4580-
45814578

45824579
=== Supported Cache Providers
45834580
The cache abstraction does not provide an actual store and relies on abstraction

0 commit comments

Comments
 (0)