SpringCloud/spring-cloud-gateway
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: Simplify type extraction and improve null checks (#3559)

Browse Source
This commit is contained in:
Hyeon Sung
2024-10-15 00:28:46 +09:00
committed by GitHub
parent 766e3e0b5b
commit 181fca6476
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2019 the original author or authors.
* Copyright 2016-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@ import org.springframework.web.client.RestTemplate;
import org.springframework.web.context.request.NativeWebRequest;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.method.support.ModelAndViewContainer;
import org.springframework.util.ObjectUtils;
import static java.util.stream.Collectors.toSet;
@@ -88,9 +89,8 @@ public class ProxyExchangeArgumentResolver implements HandlerMethodArgumentResol
private Type type(MethodParameter parameter) {
Type type = parameter.getGenericParameterType();
if (type instanceof ParameterizedType) {
ParameterizedType param = (ParameterizedType) type;
type = param.getActualTypeArguments()[0];
if (type instanceof ParameterizedType parameterizedType) {
type = parameterizedType.getActualTypeArguments()[0];
}
return type;
}
@@ -115,7 +115,7 @@ public class ProxyExchangeArgumentResolver implements HandlerMethodArgumentResol
}
private void configureAutoForwardedHeaders(final ProxyExchange<?> proxy, final NativeWebRequest webRequest) {
if ((autoForwardedHeaders != null) && (autoForwardedHeaders.size() > 0)) {
if (!ObjectUtils.isEmpty(autoForwardedHeaders)) {
proxy.headers(extractAutoForwardedHeaders(webRequest));
}
}