Merge branch '6.3.x'

Use explicit types instead of var

Closes gh-155537
This commit is contained in:
Rob Winch
2024-08-08 15:30:16 -05:00
4 changed files with 8 additions and 20 deletions

View File

@@ -20,6 +20,7 @@ import java.lang.reflect.Modifier;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.MockedStatic;
import org.mockito.Mockito;
import org.springframework.aop.framework.ProxyFactory;
@@ -141,7 +142,7 @@ public class AutowireBeanFactoryObjectPostProcessorTests {
@Test
void postProcessWhenObjectIsCgLibProxyAndInNativeImageThenUseExistingBean() {
try (var detector = Mockito.mockStatic(NativeDetector.class)) {
try (MockedStatic<NativeDetector> detector = Mockito.mockStatic(NativeDetector.class)) {
given(NativeDetector.inNativeImage()).willReturn(true);
ProxyFactory proxyFactory = new ProxyFactory(new MyClass());
@@ -158,7 +159,7 @@ public class AutowireBeanFactoryObjectPostProcessorTests {
@Test
void postProcessWhenObjectIsCgLibProxyAndInNativeImageAndBeanDoesNotExistsThenIllegalStateException() {
try (var detector = Mockito.mockStatic(NativeDetector.class)) {
try (MockedStatic<NativeDetector> detector = Mockito.mockStatic(NativeDetector.class)) {
given(NativeDetector.inNativeImage()).willReturn(true);
ProxyFactory proxyFactory = new ProxyFactory(new MyClass());