From 703b3b152417c218feb507eeae582241a2c43fed Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 15 Sep 2016 14:31:05 +0200 Subject: [PATCH] StringUtils.parseLocaleString accepts Java 7 variants Issue: SPR-14718 (cherry picked from commit 818c72a) --- .../org/springframework/util/StringUtils.java | 4 +- .../util/StringUtilsTests.java | 58 +++++++++---------- 2 files changed, 29 insertions(+), 33 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/util/StringUtils.java b/spring-core/src/main/java/org/springframework/util/StringUtils.java index 0ad561dadf1..7f9f721c32b 100644 --- a/spring-core/src/main/java/org/springframework/util/StringUtils.java +++ b/spring-core/src/main/java/org/springframework/util/StringUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2016 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. @@ -707,7 +707,7 @@ public abstract class StringUtils { private static void validateLocalePart(String localePart) { for (int i = 0; i < localePart.length(); i++) { char ch = localePart.charAt(i); - if (ch != '_' && ch != ' ' && !Character.isLetterOrDigit(ch)) { + if (ch != ' ' && ch != '_' && ch != '#' && !Character.isLetterOrDigit(ch)) { throw new IllegalArgumentException( "Locale part \"" + localePart + "\" contains invalid characters"); } diff --git a/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java index be40ac2d7c3..2153267b368 100644 --- a/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2016 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. @@ -618,62 +618,55 @@ public class StringUtilsTests { assertNull("When given an empty Locale string, must return null.", locale); } - // SPR-8637 - @Test + @Test // SPR-8637 public void testParseLocaleWithMultiSpecialCharactersInVariant() throws Exception { - final String variant = "proper-northern"; - final String localeString = "en_GB_" + variant; + String variant = "proper-northern"; + String localeString = "en_GB_" + variant; Locale locale = StringUtils.parseLocaleString(localeString); assertEquals("Multi-valued variant portion of the Locale not extracted correctly.", variant, locale.getVariant()); } - // SPR-3671 - @Test + @Test // SPR-3671 public void testParseLocaleWithMultiValuedVariant() throws Exception { - final String variant = "proper_northern"; - final String localeString = "en_GB_" + variant; + String variant = "proper_northern"; + String localeString = "en_GB_" + variant; Locale locale = StringUtils.parseLocaleString(localeString); assertEquals("Multi-valued variant portion of the Locale not extracted correctly.", variant, locale.getVariant()); } - // SPR-3671 - @Test + @Test // SPR-3671 public void testParseLocaleWithMultiValuedVariantUsingSpacesAsSeparators() throws Exception { - final String variant = "proper northern"; - final String localeString = "en GB " + variant; + String variant = "proper northern"; + String localeString = "en GB " + variant; Locale locale = StringUtils.parseLocaleString(localeString); assertEquals("Multi-valued variant portion of the Locale not extracted correctly.", variant, locale.getVariant()); } - // SPR-3671 - @Test + @Test // SPR-3671 public void testParseLocaleWithMultiValuedVariantUsingMixtureOfUnderscoresAndSpacesAsSeparators() throws Exception { - final String variant = "proper northern"; - final String localeString = "en_GB_" + variant; + String variant = "proper northern"; + String localeString = "en_GB_" + variant; Locale locale = StringUtils.parseLocaleString(localeString); assertEquals("Multi-valued variant portion of the Locale not extracted correctly.", variant, locale.getVariant()); } - // SPR-3671 - @Test + @Test // SPR-3671 public void testParseLocaleWithMultiValuedVariantUsingSpacesAsSeparatorsWithLotsOfLeadingWhitespace() throws Exception { - final String variant = "proper northern"; - final String localeString = "en GB " + variant; // lots of whitespace + String variant = "proper northern"; + String localeString = "en GB " + variant; // lots of whitespace Locale locale = StringUtils.parseLocaleString(localeString); assertEquals("Multi-valued variant portion of the Locale not extracted correctly.", variant, locale.getVariant()); } - // SPR-3671 - @Test + @Test // SPR-3671 public void testParseLocaleWithMultiValuedVariantUsingUnderscoresAsSeparatorsWithLotsOfLeadingWhitespace() throws Exception { - final String variant = "proper_northern"; - final String localeString = "en_GB_____" + variant; // lots of underscores + String variant = "proper_northern"; + String localeString = "en_GB_____" + variant; // lots of underscores Locale locale = StringUtils.parseLocaleString(localeString); assertEquals("Multi-valued variant portion of the Locale not extracted correctly.", variant, locale.getVariant()); } - // SPR-7779 - @Test + @Test // SPR-7779 public void testParseLocaleWithInvalidCharacters() { try { StringUtils.parseLocaleString("%0D%0AContent-length:30%0D%0A%0D%0A%3Cscript%3Ealert%28123%29%3C/script%3E"); @@ -684,15 +677,13 @@ public class StringUtilsTests { } } - // SPR-9420 - @Test + @Test // SPR-9420 public void testParseLocaleWithSameLowercaseTokenForLanguageAndCountry() { assertEquals("tr_TR", StringUtils.parseLocaleString("tr_tr").toString()); assertEquals("bg_BG_vnt", StringUtils.parseLocaleString("bg_bg_vnt").toString()); } - // SPR-11806 - @Test + @Test // SPR-11806 public void testParseLocaleWithVariantContainingCountryCode() { String variant = "GBtest"; String localeString = "en_GB_" + variant; @@ -700,4 +691,9 @@ public class StringUtilsTests { assertEquals("Variant containing country code not extracted correctly", variant, locale.getVariant()); } + @Test // SPR-14718 + public void testParseJava7Variant() { + assertEquals("sr_#LATN", StringUtils.parseLocaleString("sr_#LATN").toString()); + } + }