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

Apply "advanced" instanceof pattern matching

This commit is contained in:
Sam Brannen 2022-05-17 11:24:32 +02:00
parent 578d3f4466
commit 874077d16e
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2021 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -189,7 +189,7 @@ class ConfigurationClassEnhancer {
public int accept(Method method) { public int accept(Method method) {
for (int i = 0; i < this.callbacks.length; i++) { for (int i = 0; i < this.callbacks.length; i++) {
Callback callback = this.callbacks[i]; Callback callback = this.callbacks[i];
if (!(callback instanceof ConditionalCallback) || ((ConditionalCallback) callback).isMatch(method)) { if (!(callback instanceof ConditionalCallback conditional) || conditional.isMatch(method)) {
return i; return i;
} }
} }

4
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2021 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -402,7 +402,7 @@ public abstract class DataSourceUtils {
* @see SmartDataSource#shouldClose(Connection) * @see SmartDataSource#shouldClose(Connection)
*/ */
public static void doCloseConnection(Connection con, @Nullable DataSource dataSource) throws SQLException { public static void doCloseConnection(Connection con, @Nullable DataSource dataSource) throws SQLException {
if (!(dataSource instanceof SmartDataSource) || ((SmartDataSource) dataSource).shouldClose(con)) { if (!(dataSource instanceof SmartDataSource smartDataSource) || smartDataSource.shouldClose(con)) {
con.close(); con.close();
} }
} }

8
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilter.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -54,14 +54,14 @@ public class ResourceUrlEncodingFilter extends GenericFilterBean {
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain)
throws ServletException, IOException { throws ServletException, IOException {
if (!(request instanceof HttpServletRequest) || !(response instanceof HttpServletResponse)) { if (!(request instanceof HttpServletRequest httpRequest) || !(response instanceof HttpServletResponse httpResponse)) {
throw new ServletException("ResourceUrlEncodingFilter only supports HTTP requests"); throw new ServletException("ResourceUrlEncodingFilter only supports HTTP requests");
} }
ResourceUrlEncodingRequestWrapper wrappedRequest = ResourceUrlEncodingRequestWrapper wrappedRequest =
new ResourceUrlEncodingRequestWrapper((HttpServletRequest) request); new ResourceUrlEncodingRequestWrapper(httpRequest);
ResourceUrlEncodingResponseWrapper wrappedResponse = ResourceUrlEncodingResponseWrapper wrappedResponse =
new ResourceUrlEncodingResponseWrapper(wrappedRequest, (HttpServletResponse) response); new ResourceUrlEncodingResponseWrapper(wrappedRequest, httpResponse);
filterChain.doFilter(wrappedRequest, wrappedResponse); filterChain.doFilter(wrappedRequest, wrappedResponse);
} }