Merge pull request #40085 from FelixDes

scottfrederick · scottfrederick · commit e2ec066fcf0c · 2024-04-03T16:30:28.000-05:00
* pr/40085: Apply instanceof pattern matching Closes gh-40085
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/version/AbstractDependencyVersion.java b/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/version/AbstractDependencyVersion.java
@@ -40,9 +40,8 @@ public int compareTo(DependencyVersion other) {
 
 	@Override
 	public boolean isUpgrade(DependencyVersion candidate, boolean movingToSnapshots) {
-		ComparableVersion comparableCandidate = (candidate instanceof AbstractDependencyVersion)
-				? ((AbstractDependencyVersion) candidate).comparableVersion
-				: new ComparableVersion(candidate.toString());
+		ComparableVersion comparableCandidate = (candidate instanceof AbstractDependencyVersion abstractDependencyVersion)
+				? abstractDependencyVersion.comparableVersion : new ComparableVersion(candidate.toString());
 		return comparableCandidate.compareTo(this.comparableVersion) > 0;
 	}
 
diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/graphql/tester/HttpGraphQlTesterContextCustomizer.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/graphql/tester/HttpGraphQlTesterContextCustomizer.java
@@ -66,8 +66,8 @@ public void customizeContext(ConfigurableApplicationContext context, MergedConte
 
 	private void registerHttpGraphQlTester(ConfigurableApplicationContext context) {
 		ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
-		if (beanFactory instanceof BeanDefinitionRegistry) {
-			registerHttpGraphQlTester((BeanDefinitionRegistry) beanFactory);
+		if (beanFactory instanceof BeanDefinitionRegistry beanDefinitionRegistry) {
+			registerHttpGraphQlTester(beanDefinitionRegistry);
 		}
 	}
 
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathClassLoader.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathClassLoader.java
@@ -106,8 +106,8 @@ static ModifiedClassPathClassLoader get(Class<?> testClass, Method testMethod, L
 	private static Collection<AnnotatedElement> getAnnotatedElements(Object[] array) {
 		Set<AnnotatedElement> result = new LinkedHashSet<>();
 		for (Object item : array) {
-			if (item instanceof AnnotatedElement) {
-				result.add((AnnotatedElement) item);
+			if (item instanceof AnnotatedElement annotatedElement) {
+				result.add(annotatedElement);
 			}
 			else if (ObjectUtils.isArray(item)) {
 				result.addAll(getAnnotatedElements(ObjectUtils.toObjectArray(item)));
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java
@@ -305,8 +305,8 @@ private static class ClassExcludeFilter extends AbstractTypeHierarchyTraversingF
 		ClassExcludeFilter(Object... sources) {
 			super(false, false);
 			for (Object source : sources) {
-				if (source instanceof Class<?>) {
-					this.classNames.add(((Class<?>) source).getName());
+				if (source instanceof Class<?> classSource) {
+					this.classNames.add(classSource.getName());
 				}
 			}
 		}
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ResourceBanner.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ResourceBanner.java
@@ -86,8 +86,8 @@ public void printBanner(Environment environment, Class<?> sourceClass, PrintStre
 	 */
 	protected List<PropertyResolver> getPropertyResolvers(Environment environment, Class<?> sourceClass) {
 		MutablePropertySources sources = new MutablePropertySources();
-		if (environment instanceof ConfigurableEnvironment) {
-			((ConfigurableEnvironment) environment).getPropertySources().forEach(sources::addLast);
+		if (environment instanceof ConfigurableEnvironment configurableEnvironment) {
+			configurableEnvironment.getPropertySources().forEach(sources::addLast);
 		}
 		sources.addLast(getTitleSource(sourceClass));
 		sources.addLast(getAnsiSource());
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/availability/ApplicationAvailabilityBean.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/availability/ApplicationAvailabilityBean.java
@@ -98,7 +98,7 @@ private String getSourceDescription(Object source) {
 
 	@SuppressWarnings("unchecked")
 	private Class<? extends AvailabilityState> getStateType(AvailabilityState state) {
-		Class<?> type = (state instanceof Enum) ? ((Enum<?>) state).getDeclaringClass() : state.getClass();
+		Class<?> type = (state instanceof Enum<?> enumState) ? enumState.getDeclaringClass() : state.getClass();
 		return (Class<? extends AvailabilityState>) type;
 	}
 
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/availability/AvailabilityChangeEvent.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/availability/AvailabilityChangeEvent.java
@@ -60,8 +60,8 @@ public ResolvableType getResolvableType() {
 
 	private Class<?> getStateType() {
 		S state = getState();
-		if (state instanceof Enum) {
-			return ((Enum<?>) state).getDeclaringClass();
+		if (state instanceof Enum<?> enumState) {
+			return enumState.getDeclaringClass();
 		}
 		return state.getClass();
 	}
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudPlatform.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudPlatform.java
@@ -127,8 +127,8 @@ private boolean isAutoDetected(ConfigurableEnvironment environment) {
 						&& environmentPropertySource.containsProperty(KUBERNETES_SERVICE_PORT)) {
 					return true;
 				}
-				if (environmentPropertySource instanceof EnumerablePropertySource) {
-					return isAutoDetected((EnumerablePropertySource<?>) environmentPropertySource);
+				if (environmentPropertySource instanceof EnumerablePropertySource<?> enumerablePropertySource) {
+					return isAutoDetected(enumerablePropertySource);
 				}
 			}
 			return false;
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/logging/LoggingApplicationListener.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/logging/LoggingApplicationListener.java
@@ -225,8 +225,8 @@ else if (event instanceof ApplicationEnvironmentPreparedEvent environmentPrepare
 		else if (event instanceof ApplicationPreparedEvent preparedEvent) {
 			onApplicationPreparedEvent(preparedEvent);
 		}
-		else if (event instanceof ContextClosedEvent) {
-			onContextClosedEvent((ContextClosedEvent) event);
+		else if (event instanceof ContextClosedEvent contextClosedEvent) {
+			onContextClosedEvent(contextClosedEvent);
 		}
 		else if (event instanceof ApplicationFailedEvent) {
 			onApplicationFailedEvent();
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringConfigurationPropertySource.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringConfigurationPropertySource.java
@@ -167,10 +167,10 @@ private static boolean hasSystemEnvironmentName(PropertySource<?> source) {
 
 	private static boolean isFullEnumerable(PropertySource<?> source) {
 		PropertySource<?> rootSource = getRootSource(source);
-		if (rootSource.getSource() instanceof Map) {
+		if (rootSource.getSource() instanceof Map<?, ?> map) {
 			// Check we're not security restricted
 			try {
-				((Map<?, ?>) rootSource.getSource()).size();
+				map.size();
 			}
 			catch (UnsupportedOperationException ex) {
 				return false;
@@ -180,8 +180,8 @@ private static boolean isFullEnumerable(PropertySource<?> source) {
 	}
 
 	private static PropertySource<?> getRootSource(PropertySource<?> source) {
-		while (source.getSource() != null && source.getSource() instanceof PropertySource) {
-			source = (PropertySource<?>) source.getSource();
+		while (source.getSource() != null && source.getSource() instanceof PropertySource<?> propertySource) {
+			source = propertySource;
 		}
 		return source;
 	}
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringConfigurationPropertySources.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringConfigurationPropertySources.java
@@ -67,8 +67,8 @@ private ConfigurationPropertySource adapt(PropertySource<?> source) {
 			return result;
 		}
 		result = SpringConfigurationPropertySource.from(source);
-		if (source instanceof OriginLookup) {
-			result = result.withPrefix(((OriginLookup<?>) source).getPrefix());
+		if (source instanceof OriginLookup<?> originLookup) {
+			result = result.withPrefix(originLookup.getPrefix());
 		}
 		this.cache.put(source, result);
 		return result;
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringIterableConfigurationPropertySource.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringIterableConfigurationPropertySource.java
@@ -169,8 +169,8 @@ private Mappings updateMappings(Mappings mappings) {
 
 	private boolean isImmutablePropertySource() {
 		EnumerablePropertySource<?> source = getPropertySource();
-		if (source instanceof OriginLookup) {
-			return ((OriginLookup<?>) source).isImmutable();
+		if (source instanceof OriginLookup<?> originLookup) {
+			return originLookup.isImmutable();
 		}
 		if (StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME.equals(source.getName())) {
 			return source.getSource() == System.getenv();
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/UnboundElementsSourceFilter.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/UnboundElementsSourceFilter.java
@@ -43,8 +43,8 @@ public class UnboundElementsSourceFilter implements Function<ConfigurationProper
 	@Override
 	public Boolean apply(ConfigurationPropertySource configurationPropertySource) {
 		Object underlyingSource = configurationPropertySource.getUnderlyingSource();
-		if (underlyingSource instanceof PropertySource) {
-			String name = ((PropertySource<?>) underlyingSource).getName();
+		if (underlyingSource instanceof PropertySource<?> propertySource) {
+			String name = propertySource.getName();
 			return !BENIGN_PROPERTY_SOURCE_NAMES.contains(name);
 		}
 		return true;
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/ApplicationConversionService.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/ApplicationConversionService.java
@@ -278,20 +278,20 @@ public static void addBeans(FormatterRegistry registry, ListableBeanFactory bean
 		beans.addAll(beanFactory.getBeansOfType(Printer.class).values());
 		beans.addAll(beanFactory.getBeansOfType(Parser.class).values());
 		for (Object bean : beans) {
-			if (bean instanceof GenericConverter) {
-				registry.addConverter((GenericConverter) bean);
+			if (bean instanceof GenericConverter genericConverter) {
+				registry.addConverter(genericConverter);
 			}
-			else if (bean instanceof Converter) {
-				registry.addConverter((Converter<?, ?>) bean);
+			else if (bean instanceof Converter<?, ?> converter) {
+				registry.addConverter(converter);
 			}
-			else if (bean instanceof Formatter) {
-				registry.addFormatter((Formatter<?>) bean);
+			else if (bean instanceof Formatter<?> formatter) {
+				registry.addFormatter(formatter);
 			}
-			else if (bean instanceof Printer) {
-				registry.addPrinter((Printer<?>) bean);
+			else if (bean instanceof Printer<?> printer) {
+				registry.addPrinter(printer);
 			}
-			else if (bean instanceof Parser) {
-				registry.addParser((Parser<?>) bean);
+			else if (bean instanceof Parser<?> parser) {
+				registry.addParser(parser);
 			}
 		}
 	}
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/SpringApplicationJsonEnvironmentPostProcessor.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/SpringApplicationJsonEnvironmentPostProcessor.java
@@ -126,20 +126,20 @@ private void flatten(String prefix, Map<String, Object> result, Map<String, Obje
 
 	@SuppressWarnings("unchecked")
 	private void extract(String name, Map<String, Object> result, Object value) {
-		if (value instanceof Map) {
-			if (CollectionUtils.isEmpty((Map<?, ?>) value)) {
+		if (value instanceof Map<?, ?> map) {
+			if (CollectionUtils.isEmpty(map)) {
 				result.put(name, value);
 				return;
 			}
 			flatten(name, result, (Map<String, Object>) value);
 		}
-		else if (value instanceof Collection) {
-			if (CollectionUtils.isEmpty((Collection<?>) value)) {
+		else if (value instanceof Collection<?> collection) {
+			if (CollectionUtils.isEmpty(collection)) {
 				result.put(name, value);
 				return;
 			}
 			int index = 0;
-			for (Object object : (Collection<Object>) value) {
+			for (Object object : collection) {
 				extract(name + "[" + index + "]", result, object);
 				index++;
 			}
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jackson/JsonComponentModule.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jackson/JsonComponentModule.java
@@ -102,14 +102,14 @@ private void addJsonBean(Object bean) {
 	}
 
 	private void addJsonBean(Object bean, Class<?>[] types, Scope scope) {
-		if (bean instanceof JsonSerializer) {
-			addJsonSerializerBean((JsonSerializer<?>) bean, scope, types);
+		if (bean instanceof JsonSerializer<?> jsonSerializer) {
+			addJsonSerializerBean(jsonSerializer, scope, types);
 		}
-		else if (bean instanceof JsonDeserializer) {
-			addJsonDeserializerBean((JsonDeserializer<?>) bean, types);
+		else if (bean instanceof JsonDeserializer<?> jsonDeserializer) {
+			addJsonDeserializerBean(jsonDeserializer, types);
 		}
-		else if (bean instanceof KeyDeserializer) {
-			addKeyDeserializerBean((KeyDeserializer) bean, types);
+		else if (bean instanceof KeyDeserializer keyDeserializer) {
+			addKeyDeserializerBean(keyDeserializer, types);
 		}
 		for (Class<?> innerClass : bean.getClass().getDeclaredClasses()) {
 			if (isSuitableInnerClass(innerClass)) {
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/OptionsCapableConnectionFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/OptionsCapableConnectionFactory.java
@@ -78,13 +78,13 @@ public ConnectionFactory unwrap() {
 	 * @since 2.5.1
 	 */
 	public static OptionsCapableConnectionFactory unwrapFrom(ConnectionFactory connectionFactory) {
-		if (connectionFactory instanceof OptionsCapableConnectionFactory) {
-			return (OptionsCapableConnectionFactory) connectionFactory;
+		if (connectionFactory instanceof OptionsCapableConnectionFactory optionsCapableConnectionFactory) {
+			return optionsCapableConnectionFactory;
 		}
-		if (connectionFactory instanceof Wrapped) {
-			Object unwrapped = ((Wrapped<?>) connectionFactory).unwrap();
-			if (unwrapped instanceof ConnectionFactory) {
-				return unwrapFrom((ConnectionFactory) unwrapped);
+		if (connectionFactory instanceof Wrapped<?> wrappedConnectionFactory) {
+			Object unwrapped = wrappedConnectionFactory.unwrap();
+			if (unwrapped instanceof ConnectionFactory unwrappedConnectionFactory) {
+				return unwrapFrom(unwrappedConnectionFactory);
 			}
 		}
 		return null;
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/ForwardHeadersCustomizer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/ForwardHeadersCustomizer.java
@@ -34,9 +34,8 @@ public void customize(Server server) {
 		ForwardedRequestCustomizer customizer = new ForwardedRequestCustomizer();
 		for (Connector connector : server.getConnectors()) {
 			for (ConnectionFactory connectionFactory : connector.getConnectionFactories()) {
-				if (connectionFactory instanceof HttpConfiguration.ConnectionFactory) {
-					((HttpConfiguration.ConnectionFactory) connectionFactory).getHttpConfiguration()
-						.addCustomizer(customizer);
+				if (connectionFactory instanceof HttpConfiguration.ConnectionFactory jettyConnectionFactory) {
+					jettyConnectionFactory.getHttpConfiguration().addCustomizer(customizer);
 				}
 			}
 		}
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/CompressionConnectorCustomizer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/CompressionConnectorCustomizer.java
@@ -41,8 +41,8 @@ class CompressionConnectorCustomizer implements TomcatConnectorCustomizer {
 	public void customize(Connector connector) {
 		if (this.compression != null && this.compression.getEnabled()) {
 			ProtocolHandler handler = connector.getProtocolHandler();
-			if (handler instanceof AbstractHttp11Protocol) {
-				customize((AbstractHttp11Protocol<?>) handler);
+			if (handler instanceof AbstractHttp11Protocol<?> abstractHttp11Protocol) {
+				customize(abstractHttp11Protocol);
 			}
 		}
 	}
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactory.java
@@ -188,8 +188,8 @@ protected void customizeConnector(Connector connector) {
 		if (StringUtils.hasText(getServerHeader())) {
 			connector.setProperty("server", getServerHeader());
 		}
-		if (connector.getProtocolHandler() instanceof AbstractProtocol) {
-			customizeProtocol((AbstractProtocol<?>) connector.getProtocolHandler());
+		if (connector.getProtocolHandler() instanceof AbstractProtocol<?> abstractProtocol) {
+			customizeProtocol(abstractProtocol);
 		}
 		invokeProtocolHandlerCustomizers(connector.getProtocolHandler());
 		if (getUriEncoding() != null) {
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java
@@ -328,8 +328,8 @@ protected void customizeConnector(Connector connector) {
 		if (StringUtils.hasText(getServerHeader())) {
 			connector.setProperty("server", getServerHeader());
 		}
-		if (connector.getProtocolHandler() instanceof AbstractProtocol) {
-			customizeProtocol((AbstractProtocol<?>) connector.getProtocolHandler());
+		if (connector.getProtocolHandler() instanceof AbstractProtocol<?> abstractProtocol) {
+			customizeProtocol(abstractProtocol);
 		}
 		invokeProtocolHandlerCustomizers(connector.getProtocolHandler());
 		if (getUriEncoding() != null) {
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java
@@ -102,21 +102,21 @@ private void addServletContextInitializerBeans(ListableBeanFactory beanFactory)
 
 	private void addServletContextInitializerBean(String beanName, ServletContextInitializer initializer,
 			ListableBeanFactory beanFactory) {
-		if (initializer instanceof ServletRegistrationBean) {
-			Servlet source = ((ServletRegistrationBean<?>) initializer).getServlet();
-			addServletContextInitializerBean(Servlet.class, beanName, initializer, beanFactory, source);
+		if (initializer instanceof ServletRegistrationBean<?> servletRegistrationBean) {
+			Servlet source = servletRegistrationBean.getServlet();
+			addServletContextInitializerBean(Servlet.class, beanName, servletRegistrationBean, beanFactory, source);
 		}
-		else if (initializer instanceof FilterRegistrationBean) {
-			Filter source = ((FilterRegistrationBean<?>) initializer).getFilter();
-			addServletContextInitializerBean(Filter.class, beanName, initializer, beanFactory, source);
+		else if (initializer instanceof FilterRegistrationBean<?> filterRegistrationBean) {
+			Filter source = filterRegistrationBean.getFilter();
+			addServletContextInitializerBean(Filter.class, beanName, filterRegistrationBean, beanFactory, source);
 		}
-		else if (initializer instanceof DelegatingFilterProxyRegistrationBean) {
-			String source = ((DelegatingFilterProxyRegistrationBean) initializer).getTargetBeanName();
-			addServletContextInitializerBean(Filter.class, beanName, initializer, beanFactory, source);
+		else if (initializer instanceof DelegatingFilterProxyRegistrationBean registrationBean) {
+			String source = registrationBean.getTargetBeanName();
+			addServletContextInitializerBean(Filter.class, beanName, registrationBean, beanFactory, source);
 		}
-		else if (initializer instanceof ServletListenerRegistrationBean) {
-			EventListener source = ((ServletListenerRegistrationBean<?>) initializer).getListener();
-			addServletContextInitializerBean(EventListener.class, beanName, initializer, beanFactory, source);
+		else if (initializer instanceof ServletListenerRegistrationBean<?> registrationBean) {
+			EventListener source = registrationBean.getListener();
+			addServletContextInitializerBean(EventListener.class, beanName, registrationBean, beanFactory, source);
 		}
 		else {
 			addServletContextInitializerBean(ServletContextInitializer.class, beanName, initializer, beanFactory,
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
@@ -1417,8 +1417,8 @@ void fromWithMultipleApplicationsOnlyAppliesAdditionalSourcesOnce() {
 
 	private <S extends AvailabilityState> ArgumentMatcher<ApplicationEvent> isAvailabilityChangeEventWithState(
 			S state) {
-		return (argument) -> (argument instanceof AvailabilityChangeEvent<?>)
-				&& ((AvailabilityChangeEvent<?>) argument).getState().equals(state);
+		return (argument) -> (argument instanceof AvailabilityChangeEvent<?> availabilityChangeEvent)
+				&& availabilityChangeEvent.getState().equals(state);
 	}
 
 	private <E extends ApplicationEvent> AtomicReference<E> addListener(SpringApplication application,

Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,8 @@ public void customizeContext(ConfigurableApplicationContext context, MergedConte`
`66`	`66`
`67`	`67`	`private void registerHttpGraphQlTester(ConfigurableApplicationContext context) {`
`68`	`68`	`ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();`
`69`		`- if (beanFactory instanceof BeanDefinitionRegistry) {`
`70`		`- registerHttpGraphQlTester((BeanDefinitionRegistry) beanFactory);`
	`69`	`+ if (beanFactory instanceof BeanDefinitionRegistry beanDefinitionRegistry) {`
	`70`	`+ registerHttpGraphQlTester(beanDefinitionRegistry);`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -305,8 +305,8 @@ private static class ClassExcludeFilter extends AbstractTypeHierarchyTraversingF`
`305`	`305`	`ClassExcludeFilter(Object... sources) {`
`306`	`306`	`super(false, false);`
`307`	`307`	`for (Object source : sources) {`
`308`		`- if (source instanceof Class<?>) {`
`309`		`- this.classNames.add(((Class<?>) source).getName());`
	`308`	`+ if (source instanceof Class<?> classSource) {`
	`309`	`+ this.classNames.add(classSource.getName());`
`310`	`310`	`}`
`311`	`311`	`}`
`312`	`312`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ private String getSourceDescription(Object source) {`
`98`	`98`
`99`	`99`	`@SuppressWarnings("unchecked")`
`100`	`100`	`private Class<? extends AvailabilityState> getStateType(AvailabilityState state) {`
`101`		`- Class<?> type = (state instanceof Enum) ? ((Enum<?>) state).getDeclaringClass() : state.getClass();`
	`101`	`+ Class<?> type = (state instanceof Enum<?> enumState) ? enumState.getDeclaringClass() : state.getClass();`
`102`	`102`	`return (Class<? extends AvailabilityState>) type;`
`103`	`103`	`}`
`104`	`104`
Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,8 @@ public ResolvableType getResolvableType() {`
`60`	`60`
`61`	`61`	`private Class<?> getStateType() {`
`62`	`62`	`S state = getState();`
`63`		`- if (state instanceof Enum) {`
`64`		`- return ((Enum<?>) state).getDeclaringClass();`
	`63`	`+ if (state instanceof Enum<?> enumState) {`
	`64`	`+ return enumState.getDeclaringClass();`
`65`	`65`	`}`
`66`	`66`	`return state.getClass();`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,8 +127,8 @@ private boolean isAutoDetected(ConfigurableEnvironment environment) {`
`127`	`127`	`&& environmentPropertySource.containsProperty(KUBERNETES_SERVICE_PORT)) {`
`128`	`128`	`return true;`
`129`	`129`	`}`
`130`		`- if (environmentPropertySource instanceof EnumerablePropertySource) {`
`131`		`- return isAutoDetected((EnumerablePropertySource<?>) environmentPropertySource);`
	`130`	`+ if (environmentPropertySource instanceof EnumerablePropertySource<?> enumerablePropertySource) {`
	`131`	`+ return isAutoDetected(enumerablePropertySource);`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -225,8 +225,8 @@ else if (event instanceof ApplicationEnvironmentPreparedEvent environmentPrepare`
`225`	`225`	`else if (event instanceof ApplicationPreparedEvent preparedEvent) {`
`226`	`226`	`onApplicationPreparedEvent(preparedEvent);`
`227`	`227`	`}`
`228`		`- else if (event instanceof ContextClosedEvent) {`
`229`		`- onContextClosedEvent((ContextClosedEvent) event);`
	`228`	`+ else if (event instanceof ContextClosedEvent contextClosedEvent) {`
	`229`	`+ onContextClosedEvent(contextClosedEvent);`
`230`	`230`	`}`
`231`	`231`	`else if (event instanceof ApplicationFailedEvent) {`
`232`	`232`	`onApplicationFailedEvent();`
Original file line number	Diff line number	Diff line change
`@@ -167,10 +167,10 @@ private static boolean hasSystemEnvironmentName(PropertySource<?> source) {`
`167`	`167`
`168`	`168`	`private static boolean isFullEnumerable(PropertySource<?> source) {`
`169`	`169`	`PropertySource<?> rootSource = getRootSource(source);`
`170`		`- if (rootSource.getSource() instanceof Map) {`
	`170`	`+ if (rootSource.getSource() instanceof Map<?, ?> map) {`
`171`	`171`	`// Check we're not security restricted`
`172`	`172`	`try {`
`173`		`- ((Map<?, ?>) rootSource.getSource()).size();`
	`173`	`+ map.size();`
`174`	`174`	`}`
`175`	`175`	`catch (UnsupportedOperationException ex) {`
`176`	`176`	`return false;`
`@@ -180,8 +180,8 @@ private static boolean isFullEnumerable(PropertySource<?> source) {`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`private static PropertySource<?> getRootSource(PropertySource<?> source) {`
`183`		`- while (source.getSource() != null && source.getSource() instanceof PropertySource) {`
`184`		`- source = (PropertySource<?>) source.getSource();`
	`183`	`+ while (source.getSource() != null && source.getSource() instanceof PropertySource<?> propertySource) {`
	`184`	`+ source = propertySource;`
`185`	`185`	`}`
`186`	`186`	`return source;`
`187`	`187`	`}`