diff --git a/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java b/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java index 711c3f193b..395338c91c 100644 --- a/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java +++ b/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -88,7 +88,6 @@ public class DefaultResponseErrorHandler implements ResponseErrorHandler { * @since 5.0 */ protected void handleError(ClientHttpResponse response, HttpStatus statusCode) throws IOException { - String statusText = response.getStatusText(); HttpHeaders headers = response.getHeaders(); byte[] body = getResponseBody(response); @@ -106,8 +105,8 @@ public class DefaultResponseErrorHandler implements ResponseErrorHandler { } } - private void handleClientError(HttpStatus statusCode, - String statusText, HttpHeaders headers, byte[] body, @Nullable Charset charset) { + private void handleClientError( + HttpStatus statusCode, String statusText, HttpHeaders headers, byte[] body, @Nullable Charset charset) { switch (statusCode) { case BAD_REQUEST: @@ -137,8 +136,8 @@ public class DefaultResponseErrorHandler implements ResponseErrorHandler { } } - private void handleServerError(HttpStatus statusCode, - String statusText, HttpHeaders headers, byte[] body, @Nullable Charset charset) { + private void handleServerError( + HttpStatus statusCode, String statusText, HttpHeaders headers, byte[] body, @Nullable Charset charset) { switch (statusCode) { case INTERNAL_SERVER_ERROR: diff --git a/spring-web/src/main/java/org/springframework/web/client/HttpClientErrorException.java b/spring-web/src/main/java/org/springframework/web/client/HttpClientErrorException.java index c7cb53707a..488e6fe49d 100644 --- a/spring-web/src/main/java/org/springframework/web/client/HttpClientErrorException.java +++ b/spring-web/src/main/java/org/springframework/web/client/HttpClientErrorException.java @@ -67,8 +67,7 @@ public class HttpClientErrorException extends HttpStatusCodeException { } - // Sub-classes for specific HTTP status codes.. - + // Subclasses for specific HTTP status codes /** * {@link HttpClientErrorException} for status HTTP 400 Bad Request. diff --git a/spring-web/src/main/java/org/springframework/web/client/HttpServerErrorException.java b/spring-web/src/main/java/org/springframework/web/client/HttpServerErrorException.java index 8d0ed9d1e1..f803ddfa55 100644 --- a/spring-web/src/main/java/org/springframework/web/client/HttpServerErrorException.java +++ b/spring-web/src/main/java/org/springframework/web/client/HttpServerErrorException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -67,8 +67,7 @@ public class HttpServerErrorException extends HttpStatusCodeException { } - // Sub-classes for specific HTTP status codes.. - + // Subclasses for specific HTTP status codes /** * {@link HttpServerErrorException} for status HTTP 500 Internal Server Error. diff --git a/spring-web/src/main/java/org/springframework/web/server/adapter/ForwardedHeaderTransformer.java b/spring-web/src/main/java/org/springframework/web/server/adapter/ForwardedHeaderTransformer.java index 77227e5cb2..24aa3d2df7 100644 --- a/spring-web/src/main/java/org/springframework/web/server/adapter/ForwardedHeaderTransformer.java +++ b/spring-web/src/main/java/org/springframework/web/server/adapter/ForwardedHeaderTransformer.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.web.server.adapter; import java.net.URI; import java.util.Collections; -import java.util.LinkedHashSet; import java.util.Locale; import java.util.Set; import java.util.function.Function; @@ -29,12 +29,12 @@ import org.springframework.util.LinkedCaseInsensitiveMap; import org.springframework.web.util.UriComponentsBuilder; /** - * Extract values from "Forwarded" and "X-Forwarded-*" headers to override the - * request URI (i.e. {@link ServerHttpRequest#getURI()}) so it reflects the - * client-originated protocol and address. + * Extract values from "Forwarded" and "X-Forwarded-*" headers to override + * the request URI (i.e. {@link ServerHttpRequest#getURI()}) so it reflects + * the client-originated protocol and address. * - *

Alternatively if {@link #setRemoveOnly removeOnly} is set to "true", then - * "Forwarded" and "X-Forwarded-*" headers are only removed, and not used. + *

Alternatively if {@link #setRemoveOnly removeOnly} is set to "true", + * then "Forwarded" and "X-Forwarded-*" headers are only removed, and not used. * * @author Rossen Stoyanchev * @since 5.1 @@ -43,7 +43,7 @@ import org.springframework.web.util.UriComponentsBuilder; public class ForwardedHeaderTransformer implements Function { static final Set FORWARDED_HEADER_NAMES = - Collections.newSetFromMap(new LinkedCaseInsensitiveMap<>(6, Locale.ENGLISH)); + Collections.newSetFromMap(new LinkedCaseInsensitiveMap<>(8, Locale.ENGLISH)); static { FORWARDED_HEADER_NAMES.add("Forwarded"); @@ -59,7 +59,7 @@ public class ForwardedHeaderTransformer implements Function FORWARDED_HEADER_NAMES.forEach(map::remove)); } + @Nullable private static String getForwardedPrefix(ServerHttpRequest request) { HttpHeaders headers = request.getHeaders(); diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctions.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctions.java index 117eea044a..f94ecb3b9a 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctions.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctions.java @@ -54,10 +54,12 @@ public abstract class ExchangeFilterFunctions { public static final String BASIC_AUTHENTICATION_CREDENTIALS_ATTRIBUTE = ExchangeFilterFunctions.class.getName() + ".basicAuthenticationCredentials"; + /** * Consume up to the specified number of bytes from the response body and - * cancel if any more data arrives. Internally delegates to - * {@link DataBufferUtils#takeUntilByteCount}. + * cancel if any more data arrives. + *

Internally delegates to {@link DataBufferUtils#takeUntilByteCount}. + * @param maxByteCount the limit as number of bytes * @return the filter to limit the response size with * @since 5.1 */ @@ -107,6 +109,7 @@ public abstract class ExchangeFilterFunctions { .map(credentials -> (Credentials) credentials)); } + @Deprecated private static ExchangeFilterFunction basicAuthenticationInternal( Function> credentialsFunction) {