From 13c959296a464f30d01d59593fbbea857718f3af Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Wed, 27 Sep 2017 21:48:35 -0400 Subject: [PATCH] Polish --- .../web/server/adapter/HttpWebHandlerAdapter.java | 9 ++++++--- .../server/i18n/AcceptHeaderLocaleContextResolver.java | 3 ++- .../web/server/i18n/FixedLocaleContextResolver.java | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/server/adapter/HttpWebHandlerAdapter.java b/spring-web/src/main/java/org/springframework/web/server/adapter/HttpWebHandlerAdapter.java index 6992537c928..8335302a7cc 100644 --- a/spring-web/src/main/java/org/springframework/web/server/adapter/HttpWebHandlerAdapter.java +++ b/spring-web/src/main/java/org/springframework/web/server/adapter/HttpWebHandlerAdapter.java @@ -129,7 +129,8 @@ public class HttpWebHandlerAdapter extends WebHandlerDecorator implements HttpHa /** * Configure a custom {@link LocaleContextResolver}. The provided instance is set on * each created {@link DefaultServerWebExchange}. - *

By default this is set to {@link org.springframework.web.server.i18n.AcceptHeaderLocaleContextResolver}. + *

By default this is set to + * {@link org.springframework.web.server.i18n.AcceptHeaderLocaleContextResolver}. * @param localeContextResolver the locale context resolver to use */ public void setLocaleContextResolver(LocaleContextResolver localeContextResolver) { @@ -147,7 +148,8 @@ public class HttpWebHandlerAdapter extends WebHandlerDecorator implements HttpHa * Return the configured {@link LocaleContextResolver}. */ public LocaleContextResolver getLocaleContextResolver() { - return (this.localeContextResolver != null ? this.localeContextResolver : new AcceptHeaderLocaleContextResolver()); + return (this.localeContextResolver != null ? + this.localeContextResolver : new AcceptHeaderLocaleContextResolver()); } @@ -164,7 +166,8 @@ public class HttpWebHandlerAdapter extends WebHandlerDecorator implements HttpHa } protected ServerWebExchange createExchange(ServerHttpRequest request, ServerHttpResponse response) { - return new DefaultServerWebExchange(request, response, this.sessionManager, getCodecConfigurer(), getLocaleContextResolver()); + return new DefaultServerWebExchange(request, response, this.sessionManager, + getCodecConfigurer(), getLocaleContextResolver()); } private void logHandleFailure(Throwable ex) { diff --git a/spring-web/src/main/java/org/springframework/web/server/i18n/AcceptHeaderLocaleContextResolver.java b/spring-web/src/main/java/org/springframework/web/server/i18n/AcceptHeaderLocaleContextResolver.java index 91743b8d402..13084aa3fc1 100644 --- a/spring-web/src/main/java/org/springframework/web/server/i18n/AcceptHeaderLocaleContextResolver.java +++ b/spring-web/src/main/java/org/springframework/web/server/i18n/AcceptHeaderLocaleContextResolver.java @@ -97,7 +97,8 @@ public class AcceptHeaderLocaleContextResolver implements LocaleContextResolver if (supportedLocale != null) { return new SimpleLocaleContext(supportedLocale); } - return (defaultLocale != null ? new SimpleLocaleContext(defaultLocale) : new SimpleLocaleContext(requestLocale)); + return (this.defaultLocale != null ? new SimpleLocaleContext(this.defaultLocale) : + new SimpleLocaleContext(requestLocale)); } private boolean isSupportedLocale(@Nullable Locale locale) { diff --git a/spring-web/src/main/java/org/springframework/web/server/i18n/FixedLocaleContextResolver.java b/spring-web/src/main/java/org/springframework/web/server/i18n/FixedLocaleContextResolver.java index 0ddd3dc558e..a3a1e77a8b3 100644 --- a/spring-web/src/main/java/org/springframework/web/server/i18n/FixedLocaleContextResolver.java +++ b/spring-web/src/main/java/org/springframework/web/server/i18n/FixedLocaleContextResolver.java @@ -88,7 +88,8 @@ public class FixedLocaleContextResolver implements LocaleContextResolver { @Override public void setLocaleContext(ServerWebExchange exchange, @Nullable LocaleContext localeContext) { - throw new UnsupportedOperationException("Cannot change fixed locale - use a different locale context resolution strategy"); + throw new UnsupportedOperationException( + "Cannot change fixed locale - use a different locale context resolution strategy"); } }