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

Apply "instanceof pattern matching" in spring-test

This commit is contained in:
Sam Brannen 2022-08-26 16:34:26 +02:00
parent b50415062b
commit aa7ef79478
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultControllerSpec.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2022 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.
@ -62,7 +62,7 @@ class DefaultControllerSpec extends AbstractMockServerSpec<WebTestClient.Control
private static List<Object> instantiateIfNecessary(Object[] specified) {
List<Object> instances = new ArrayList<>(specified.length);
for (Object obj : specified) {
instances.add(obj instanceof Class ? BeanUtils.instantiateClass((Class<?>) obj) : obj);
instances.add(obj instanceof Class<?> clazz ? BeanUtils.instantiateClass(clazz) : obj);
}
return instances;
}

18
spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
View File

@ -155,7 +155,7 @@ public class StandaloneMockMvcBuilder extends AbstractMockMvcBuilder<StandaloneM
private static List<Object> instantiateIfNecessary(Object[] specified) {
List<Object> instances = new ArrayList<>(specified.length);
for (Object obj : specified) {
instances.add(obj instanceof Class ? BeanUtils.instantiateClass((Class<?>) obj) : obj);
instances.add(obj instanceof Class<?> clazz ? BeanUtils.instantiateClass(clazz) : obj);
}
return instances;
}
@ -445,8 +445,8 @@ public class StandaloneMockMvcBuilder extends AbstractMockMvcBuilder<StandaloneM
this.viewResolvers = (this.viewResolvers != null ? this.viewResolvers :
Collections.singletonList(new InternalResourceViewResolver()));
for (Object viewResolver : this.viewResolvers) {
if (viewResolver instanceof WebApplicationObjectSupport) {
((WebApplicationObjectSupport) viewResolver).setApplicationContext(wac);
if (viewResolver instanceof WebApplicationObjectSupport support) {
support.setApplicationContext(wac);
}
}
return this.viewResolvers;
@ -538,9 +538,9 @@ public class StandaloneMockMvcBuilder extends AbstractMockMvcBuilder<StandaloneM
@Override
public Validator mvcValidator() {
Validator mvcValidator = (validator != null) ? validator : super.mvcValidator();
if (mvcValidator instanceof InitializingBean) {
if (mvcValidator instanceof InitializingBean initializingBean) {
try {
((InitializingBean) mvcValidator).afterPropertiesSet();
initializingBean.afterPropertiesSet();
}
catch (Exception ex) {
throw new BeanInitializationException("Failed to initialize Validator", ex);
@ -555,15 +555,15 @@ public class StandaloneMockMvcBuilder extends AbstractMockMvcBuilder<StandaloneM
return;
}
for (HandlerExceptionResolver resolver : handlerExceptionResolvers) {
if (resolver instanceof ApplicationContextAware) {
if (resolver instanceof ApplicationContextAware applicationContextAware) {
ApplicationContext applicationContext = getApplicationContext();
if (applicationContext != null) {
((ApplicationContextAware) resolver).setApplicationContext(applicationContext);
applicationContextAware.setApplicationContext(applicationContext);
}
}
if (resolver instanceof InitializingBean) {
if (resolver instanceof InitializingBean initializingBean) {
try {
((InitializingBean) resolver).afterPropertiesSet();
initializingBean.afterPropertiesSet();
}
catch (Exception ex) {
throw new IllegalStateException("Failure from afterPropertiesSet", ex);