mirror of
https://github.com/spring-projects/spring-framework.git
synced 2026-09-17 16:39:29 +00:00
Sam Brannen
f8a2bdad87
A user reported confusion between two distinct uses of "wraps" in the AOP proxy documentation for Bean Overrides: the sense in which a Mockito spy wraps the original bean instance it was created from, and the sense in which a Spring AOP proxy wraps the spy in the actual object graph. To address that, this commit adds two small diagrams to the general "Bean Overrides and Spring AOP Proxies" section, illustrating, from a caller's perspective, the shape of the bean for the REPLACE/REPLACE_OR_CREATE strategy (no proxy at all) versus the WRAP strategy (an AOP proxy still created, now wrapping the override instance instead of the original bean). Both diagrams use the same generic "override instance" label, since the section is not specific to Mockito; a Mockito spy created by @MockitoSpyBean is mentioned only as an example. The accompanying text is revised to reserve "wraps" for the AOP proxy relationship and to explicitly call out that a Mockito spy's relationship to its original bean instance is a separate concern from AOP proxy nesting. The @MockitoSpyBean-specific strategy paragraph in the @MockitoBean/@MockitoSpyBean documentation has also been revised similarly, and now points to the new diagram. See gh-37121