From 1e0e477833c90d13d60b4f8ed0649ab7bb3e1541 Mon Sep 17 00:00:00 2001 From: lijun695 Date: Sat, 5 Feb 2022 20:51:18 +0800 Subject: [PATCH] Apply "instanceof pattern matching" in AbstractRoutingDataSource Closes gh-28011 --- .../jdbc/datasource/lookup/AbstractRoutingDataSource.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java index ec33aba101..50b6d61667 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java @@ -153,11 +153,11 @@ public abstract class AbstractRoutingDataSource extends AbstractDataSource imple * @throws IllegalArgumentException in case of an unsupported value type */ protected DataSource resolveSpecifiedDataSource(Object dataSource) throws IllegalArgumentException { - if (dataSource instanceof DataSource) { - return (DataSource) dataSource; + if (dataSource instanceof DataSource result) { + return result; } - else if (dataSource instanceof String) { - return this.dataSourceLookup.getDataSource((String) dataSource); + else if (dataSource instanceof String name) { + return this.dataSourceLookup.getDataSource(name); } else { throw new IllegalArgumentException(