diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/headers/HttpHeadersFilter.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/headers/HttpHeadersFilter.java
index d2301572..0e5644a9 100644
--- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/headers/HttpHeadersFilter.java
+++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/headers/HttpHeadersFilter.java
@@ -62,10 +62,6 @@ public interface HttpHeadersFilter {
 	}
 
 	default boolean supports(Type type) {
-		if (type.equals(Type.REQUEST)) {
-			return true;
-		}
-		
-		return false;
+		return type.equals(Type.REQUEST);
 	}
 }
diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/ipresolver/XForwardedRemoteAddressResolver.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/ipresolver/XForwardedRemoteAddressResolver.java
index 6589d903..83472604 100644
--- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/ipresolver/XForwardedRemoteAddressResolver.java
+++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/ipresolver/XForwardedRemoteAddressResolver.java
@@ -91,7 +91,7 @@ public class XForwardedRemoteAddressResolver implements RemoteAddressResolver {
 	public InetSocketAddress resolve(ServerWebExchange exchange) {
 		List<String> xForwardedValues = extractXForwardedValues(exchange);
 		Collections.reverse(xForwardedValues);
-		if (xForwardedValues.size() != 0) {
+		if (!xForwardedValues.isEmpty()) {
 			int index = Math.min(xForwardedValues.size(), maxTrustedIndex) - 1;
 			return InetSocketAddress.createUnresolved(xForwardedValues.get(index), 0);
 		}
@@ -101,7 +101,7 @@ public class XForwardedRemoteAddressResolver implements RemoteAddressResolver {
 	private List<String> extractXForwardedValues(ServerWebExchange exchange) {
 		List<String> xForwardedValues = exchange.getRequest().getHeaders()
 				.get(X_FORWARDED_FOR);
-		if (xForwardedValues == null || xForwardedValues.size() == 0) {
+		if (xForwardedValues == null || xForwardedValues.isEmpty()) {
 			return Collections.emptyList();
 		}
 		if (xForwardedValues.size() > 1) {