Skip to content

Commit 4f4aa40

Browse files
committed
Updates to instanceof with variable
Signed-off-by: lucky8987 <[email protected]>
1 parent e78d617 commit 4f4aa40

File tree

4 files changed

+9
-14
lines changed

4 files changed

+9
-14
lines changed

spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/handler/FilteringWebHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ public FilteringWebHandler(List<GlobalFilter> globalFilters, boolean routeFilter
7979
private static List<GatewayFilter> loadFilters(List<GlobalFilter> filters) {
8080
return filters.stream().map(filter -> {
8181
GatewayFilterAdapter gatewayFilter = new GatewayFilterAdapter(filter);
82-
if (filter instanceof Ordered) {
83-
int order = ((Ordered) filter).getOrder();
82+
if (filter instanceof Ordered ordered) {
83+
int order = ordered.getOrder();
8484
return new OrderedGatewayFilter(gatewayFilter, order);
8585
}
8686
else {

spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/route/RouteDefinitionRouteLocator.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,7 @@ List<GatewayFilter> loadGatewayFilters(String id, List<FilterDefinition> filterD
161161

162162
// some filters require routeId
163163
// TODO: is there a better place to apply this?
164-
if (configuration instanceof HasRouteId) {
165-
HasRouteId hasRouteId = (HasRouteId) configuration;
164+
if (configuration instanceof HasRouteId hasRouteId) {
166165
hasRouteId.setRouteId(id);
167166
}
168167

spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/route/RouteRefreshListener.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ public RouteRefreshListener(ApplicationEventPublisher publisher) {
4444

4545
@Override
4646
public void onApplicationEvent(ApplicationEvent event) {
47-
if (event instanceof ContextRefreshedEvent) {
48-
ContextRefreshedEvent refreshedEvent = (ContextRefreshedEvent) event;
47+
if (event instanceof ContextRefreshedEvent refreshedEvent) {
4948
boolean isManagementCtxt = WebServerApplicationContext
5049
.hasServerNamespace(refreshedEvent.getApplicationContext(), "management");
5150
boolean isLoadBalancerCtxt = refreshedEvent.getApplicationContext().getDisplayName() != null
@@ -58,13 +57,11 @@ public void onApplicationEvent(ApplicationEvent event) {
5857
else if (event instanceof RefreshScopeRefreshedEvent || event instanceof InstanceRegisteredEvent) {
5958
reset();
6059
}
61-
else if (event instanceof ParentHeartbeatEvent) {
62-
ParentHeartbeatEvent e = (ParentHeartbeatEvent) event;
63-
resetIfNeeded(e.getValue());
60+
else if (event instanceof ParentHeartbeatEvent parentHeartbeatEvent) {
61+
resetIfNeeded(parentHeartbeatEvent.getValue());
6462
}
65-
else if (event instanceof HeartbeatEvent) {
66-
HeartbeatEvent e = (HeartbeatEvent) event;
67-
resetIfNeeded(e.getValue());
63+
else if (event instanceof HeartbeatEvent heartbeatEvent) {
64+
resetIfNeeded(heartbeatEvent.getValue());
6865
}
6966
}
7067

spring-cloud-gateway-webflux/src/main/java/org/springframework/cloud/gateway/webflux/config/ProxyExchangeArgumentResolver.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ public boolean supportsParameter(MethodParameter parameter) {
7474

7575
private Type type(MethodParameter parameter) {
7676
Type type = parameter.getGenericParameterType();
77-
if (type instanceof ParameterizedType) {
78-
ParameterizedType param = (ParameterizedType) type;
77+
if (type instanceof ParameterizedType param) {
7978
type = param.getActualTypeArguments()[0];
8079
}
8180
if (type instanceof TypeVariable || type instanceof WildcardType) {

0 commit comments

Comments
 (0)