From 83df467b3b4323dd9c28798ba6a055041fe3ba97 Mon Sep 17 00:00:00 2001 From: Tadaya Tsuyukubo Date: Thu, 6 Aug 2020 17:05:20 -0700 Subject: [PATCH] Remove @Nullable from CookieLocaleResolver#determineDefaultLocale() By definition, this method should not return `null`. --- .../springframework/web/servlet/i18n/CookieLocaleResolver.java | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java index eb72478a24..07a24dbdc8 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java @@ -335,7 +335,6 @@ public class CookieLocaleResolver extends CookieGenerator implements LocaleConte * @see #setDefaultLocale * @see javax.servlet.http.HttpServletRequest#getLocale() */ - @Nullable protected Locale determineDefaultLocale(HttpServletRequest request) { Locale defaultLocale = getDefaultLocale(); if (defaultLocale == null) {