Merge branch '5.3.x'

Author: sbrannen

spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolverTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -42,49 +42,49 @@
  * @author Rossen Stoyanchev
  * @author Juergen Hoeller
  */
-public class AcceptHeaderLocaleResolverTests {
+class AcceptHeaderLocaleResolverTests {
 
 	private final AcceptHeaderLocaleResolver resolver = new AcceptHeaderLocaleResolver();
 
 
 	@Test
-	public void resolve() {
+	void resolve() {
 		assertThat(this.resolver.resolveLocale(request(CANADA))).isEqualTo(CANADA);
 		assertThat(this.resolver.resolveLocale(request(US, CANADA))).isEqualTo(US);
 	}
 
 	@Test
-	public void resolvePreferredSupported() {
+	void resolvePreferredSupported() {
 		this.resolver.setSupportedLocales(Collections.singletonList(CANADA));
 		assertThat(this.resolver.resolveLocale(request(US, CANADA))).isEqualTo(CANADA);
 	}
 
 	@Test
-	public void resolvePreferredNotSupported() {
+	void resolvePreferredNotSupported() {
 		this.resolver.setSupportedLocales(Collections.singletonList(CANADA));
 		assertThat(this.resolver.resolveLocale(request(US, UK))).isEqualTo(US);
 	}
 
 	@Test
-	public void resolvePreferredAgainstLanguageOnly() {
+	void resolvePreferredAgainstLanguageOnly() {
 		this.resolver.setSupportedLocales(Collections.singletonList(ENGLISH));
 		assertThat(this.resolver.resolveLocale(request(GERMANY, US, UK))).isEqualTo(ENGLISH);
 	}
 
 	@Test
-	public void resolvePreferredAgainstCountryIfPossible() {
+	void resolvePreferredAgainstCountryIfPossible() {
 		this.resolver.setSupportedLocales(Arrays.asList(ENGLISH, UK));
 		assertThat(this.resolver.resolveLocale(request(GERMANY, US, UK))).isEqualTo(UK);
 	}
 
 	@Test
-	public void resolvePreferredAgainstLanguageWithMultipleSupportedLocales() {
+	void resolvePreferredAgainstLanguageWithMultipleSupportedLocales() {
 		this.resolver.setSupportedLocales(Arrays.asList(GERMAN, US));
 		assertThat(this.resolver.resolveLocale(request(GERMANY, US, UK))).isEqualTo(GERMAN);
 	}
 
 	@Test
-	public void resolvePreferredNotSupportedWithDefault() {
+	void resolvePreferredNotSupportedWithDefault() {
 		this.resolver.setSupportedLocales(Arrays.asList(US, JAPAN));
 		this.resolver.setDefaultLocale(Locale.JAPAN);
 
@@ -95,7 +95,7 @@ public void resolvePreferredNotSupportedWithDefault() {
 	}
 
 	@Test
-	public void defaultLocale() {
+	void defaultLocale() {
 		this.resolver.setDefaultLocale(JAPANESE);
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		assertThat(this.resolver.resolveLocale(request)).isEqualTo(JAPANESE);