Skip to content

Commit 870c03c

Browse files
authored
refactor: Simplify type extraction and improve null checks
1 parent 766e3e0 commit 870c03c

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2019 the original author or authors.
2+
* Copyright 2016-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@
3232
import org.springframework.web.context.request.NativeWebRequest;
3333
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
3434
import org.springframework.web.method.support.ModelAndViewContainer;
35+
import org.springframework.util.ObjectUtils;
3536

3637
import static java.util.stream.Collectors.toSet;
3738

@@ -88,9 +89,8 @@ public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer m
8889

8990
private Type type(MethodParameter parameter) {
9091
Type type = parameter.getGenericParameterType();
91-
if (type instanceof ParameterizedType) {
92-
ParameterizedType param = (ParameterizedType) type;
93-
type = param.getActualTypeArguments()[0];
92+
if (type instanceof ParameterizedType parameterizedType) {
93+
type = parameterizedType.getActualTypeArguments()[0];
9494
}
9595
return type;
9696
}
@@ -115,7 +115,7 @@ private void configureHeaders(final ProxyExchange<?> proxy) {
115115
}
116116

117117
private void configureAutoForwardedHeaders(final ProxyExchange<?> proxy, final NativeWebRequest webRequest) {
118-
if ((autoForwardedHeaders != null) && (autoForwardedHeaders.size() > 0)) {
118+
if (!ObjectUtils.isEmpty(autoForwardedHeaders)) {
119119
proxy.headers(extractAutoForwardedHeaders(webRequest));
120120
}
121121
}

0 commit comments

Comments
 (0)