Browse Source

Polish

pull/1535/head
Rossen Stoyanchev 8 years ago
parent
commit
13c959296a
  1. 9
      spring-web/src/main/java/org/springframework/web/server/adapter/HttpWebHandlerAdapter.java
  2. 3
      spring-web/src/main/java/org/springframework/web/server/i18n/AcceptHeaderLocaleContextResolver.java
  3. 3
      spring-web/src/main/java/org/springframework/web/server/i18n/FixedLocaleContextResolver.java

9
spring-web/src/main/java/org/springframework/web/server/adapter/HttpWebHandlerAdapter.java

@ -129,7 +129,8 @@ public class HttpWebHandlerAdapter extends WebHandlerDecorator implements HttpHa @@ -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}.
* <p>By default this is set to {@link org.springframework.web.server.i18n.AcceptHeaderLocaleContextResolver}.
* <p>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 @@ -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 @@ -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) {

3
spring-web/src/main/java/org/springframework/web/server/i18n/AcceptHeaderLocaleContextResolver.java

@ -97,7 +97,8 @@ public class AcceptHeaderLocaleContextResolver implements LocaleContextResolver @@ -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) {

3
spring-web/src/main/java/org/springframework/web/server/i18n/FixedLocaleContextResolver.java

@ -88,7 +88,8 @@ public class FixedLocaleContextResolver implements LocaleContextResolver { @@ -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");
}
}

Loading…
Cancel
Save