diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/handler/FilteringWebHandler.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/handler/FilteringWebHandler.java
index 9f3beb37c2..acc2619e36 100644
--- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/handler/FilteringWebHandler.java
+++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/handler/FilteringWebHandler.java
@@ -79,8 +79,8 @@ public FilteringWebHandler(List<GlobalFilter> globalFilters, boolean routeFilter
 	private static List<GatewayFilter> loadFilters(List<GlobalFilter> filters) {
 		return filters.stream().map(filter -> {
 			GatewayFilterAdapter gatewayFilter = new GatewayFilterAdapter(filter);
-			if (filter instanceof Ordered) {
-				int order = ((Ordered) filter).getOrder();
+			if (filter instanceof Ordered ordered) {
+				int order = ordered.getOrder();
 				return new OrderedGatewayFilter(gatewayFilter, order);
 			}
 			else {
diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/route/RouteDefinitionRouteLocator.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/route/RouteDefinitionRouteLocator.java
index a4da3e6d12..fce1faeefc 100644
--- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/route/RouteDefinitionRouteLocator.java
+++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/route/RouteDefinitionRouteLocator.java
@@ -161,8 +161,7 @@ List<GatewayFilter> loadGatewayFilters(String id, List<FilterDefinition> filterD
 
 			// some filters require routeId
 			// TODO: is there a better place to apply this?
-			if (configuration instanceof HasRouteId) {
-				HasRouteId hasRouteId = (HasRouteId) configuration;
+			if (configuration instanceof HasRouteId hasRouteId) {
 				hasRouteId.setRouteId(id);
 			}
 
diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/route/RouteRefreshListener.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/route/RouteRefreshListener.java
index c67d61b922..5943528151 100644
--- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/route/RouteRefreshListener.java
+++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/route/RouteRefreshListener.java
@@ -44,8 +44,7 @@ public RouteRefreshListener(ApplicationEventPublisher publisher) {
 
 	@Override
 	public void onApplicationEvent(ApplicationEvent event) {
-		if (event instanceof ContextRefreshedEvent) {
-			ContextRefreshedEvent refreshedEvent = (ContextRefreshedEvent) event;
+		if (event instanceof ContextRefreshedEvent refreshedEvent) {
 			boolean isManagementCtxt = WebServerApplicationContext
 				.hasServerNamespace(refreshedEvent.getApplicationContext(), "management");
 			boolean isLoadBalancerCtxt = refreshedEvent.getApplicationContext().getDisplayName() != null
@@ -58,13 +57,11 @@ public void onApplicationEvent(ApplicationEvent event) {
 		else if (event instanceof RefreshScopeRefreshedEvent || event instanceof InstanceRegisteredEvent) {
 			reset();
 		}
-		else if (event instanceof ParentHeartbeatEvent) {
-			ParentHeartbeatEvent e = (ParentHeartbeatEvent) event;
-			resetIfNeeded(e.getValue());
+		else if (event instanceof ParentHeartbeatEvent parentHeartbeatEvent) {
+			resetIfNeeded(parentHeartbeatEvent.getValue());
 		}
-		else if (event instanceof HeartbeatEvent) {
-			HeartbeatEvent e = (HeartbeatEvent) event;
-			resetIfNeeded(e.getValue());
+		else if (event instanceof HeartbeatEvent heartbeatEvent) {
+			resetIfNeeded(heartbeatEvent.getValue());
 		}
 	}
 
diff --git a/spring-cloud-gateway-webflux/src/main/java/org/springframework/cloud/gateway/webflux/config/ProxyExchangeArgumentResolver.java b/spring-cloud-gateway-webflux/src/main/java/org/springframework/cloud/gateway/webflux/config/ProxyExchangeArgumentResolver.java
index 7aa521631b..7a7ef29c4a 100644
--- a/spring-cloud-gateway-webflux/src/main/java/org/springframework/cloud/gateway/webflux/config/ProxyExchangeArgumentResolver.java
+++ b/spring-cloud-gateway-webflux/src/main/java/org/springframework/cloud/gateway/webflux/config/ProxyExchangeArgumentResolver.java
@@ -74,8 +74,7 @@ public boolean supportsParameter(MethodParameter parameter) {
 
 	private Type type(MethodParameter parameter) {
 		Type type = parameter.getGenericParameterType();
-		if (type instanceof ParameterizedType) {
-			ParameterizedType param = (ParameterizedType) type;
+		if (type instanceof ParameterizedType param) {
 			type = param.getActualTypeArguments()[0];
 		}
 		if (type instanceof TypeVariable || type instanceof WildcardType) {