From 6efc3dadf151410655be165168fc628e7969c912 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Mon, 14 Nov 2022 17:12:20 +0100 Subject: [PATCH] Apply "instance pattern matching" --- .../web/servlet/view/ViewResolverComposite.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ViewResolverComposite.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ViewResolverComposite.java index 5421c4b900..95f66107cc 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ViewResolverComposite.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ViewResolverComposite.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 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. @@ -78,8 +78,8 @@ public class ViewResolverComposite implements ViewResolver, Ordered, Initializin @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { for (ViewResolver viewResolver : this.viewResolvers) { - if (viewResolver instanceof ApplicationContextAware) { - ((ApplicationContextAware)viewResolver).setApplicationContext(applicationContext); + if (viewResolver instanceof ApplicationContextAware applicationContextAware) { + applicationContextAware.setApplicationContext(applicationContext); } } } @@ -87,8 +87,8 @@ public class ViewResolverComposite implements ViewResolver, Ordered, Initializin @Override public void setServletContext(ServletContext servletContext) { for (ViewResolver viewResolver : this.viewResolvers) { - if (viewResolver instanceof ServletContextAware) { - ((ServletContextAware)viewResolver).setServletContext(servletContext); + if (viewResolver instanceof ServletContextAware servletContextAware) { + servletContextAware.setServletContext(servletContext); } } } @@ -96,8 +96,8 @@ public class ViewResolverComposite implements ViewResolver, Ordered, Initializin @Override public void afterPropertiesSet() throws Exception { for (ViewResolver viewResolver : this.viewResolvers) { - if (viewResolver instanceof InitializingBean) { - ((InitializingBean) viewResolver).afterPropertiesSet(); + if (viewResolver instanceof InitializingBean initializingBean) { + initializingBean.afterPropertiesSet(); } } }