From aa7ef79478aa4a5e4c2b41cab5c3348f7f65d1f5 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 26 Aug 2022 16:34:26 +0200
Subject: [PATCH] Apply "instanceof pattern matching" in spring-test

---
 .../reactive/server/DefaultControllerSpec.java |  4 ++--
 .../setup/StandaloneMockMvcBuilder.java        | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultControllerSpec.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultControllerSpec.java
index 8152924b05..a120acf622 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultControllerSpec.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultControllerSpec.java
@@ -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;
 	}
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
index 46d41c87f2..c9f1f33593 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
@@ -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);