Try to resolve 3.0 issues wrt #3259

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/deser/jdk/JDKFromStringDeserializer.java

@@ -254,6 +254,12 @@ protected int _firstHyphenOrUnderscore(String str)
     private Locale _deserializeLocale(String value, DeserializationContext ctxt)
         throws JacksonException
     {
+        // 10-Sep-2021, tatu: Looks like a simplified version might just work:
+        return Locale.forLanguageTag(value);
+
+        // ... but leaving Jackson 2.13.0 implementation below in case inspiration might
+        // be needed; feel free to remove once 3.0.0 is released
+/*
         int ix = _firstHyphenOrUnderscore(value);
         if (ix < 0) { // single argument
             return new Locale(value);
@@ -271,8 +277,10 @@ private Locale _deserializeLocale(String value, DeserializationContext ctxt)
             return new Locale(first, second, value.substring(ix+1));
         }
         return _deSerializeBCP47Locale(value, ix, first, second, extMarkerIx);
+        */
     }
 
+    /*
     private Locale _deSerializeBCP47Locale(String value, int ix, String first, String second,
             int extMarkerIx)
     {
@@ -307,6 +315,7 @@ private Locale _deSerializeBCP47Locale(String value, int ix, String first, Strin
             return new Locale(first, second, third);
         }
     }
+    */
 
     static class StringBuilderDeserializer extends JDKFromStringDeserializer
     {

src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKStringLikeTypesTest.java

@@ -5,7 +5,6 @@
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.Currency;
-import java.util.Locale;
 import java.util.UUID;
 import java.util.regex.Pattern;
 
@@ -129,16 +128,6 @@ public void testFile() throws Exception
         assertEquals(abs, result.getAbsolutePath());
     }
 
-    public void testLocale() throws IOException
-    {
-        assertEquals(new Locale("en"), MAPPER.readValue(q("en"), Locale.class));
-        assertEquals(new Locale("es", "ES"), MAPPER.readValue(q("es_ES"), Locale.class));
-        assertEquals(new Locale("FI", "fi", "savo"),
-                MAPPER.readValue(q("fi_FI_savo"), Locale.class));
-        assertEquals(new Locale("en", "US"),
-                MAPPER.readValue(q("en-US"), Locale.class));
-    }
-
     public void testCharSequence() throws IOException
     {
         CharSequence cs = MAPPER.readValue("\"abc\"", CharSequence.class);

src/test/java/com/fasterxml/jackson/databind/deser/jdk/MapDeserializationTest.java

@@ -357,6 +357,7 @@ public void testEnumPolymorphicSerializationTest() throws Exception
     /* Test methods, maps with Date
     /**********************************************************
      */
+
     public void testDateMap() throws Exception
     {
     	 Date date1=new Date(123456000L);
@@ -419,19 +420,6 @@ public void testUUIDKeyMap() throws Exception
          assertEquals(key, ob);
     }
 
-    public void testLocaleKeyMap() throws Exception {
-        Locale key = Locale.CHINA;
-        String JSON = "{ \"" + key + "\":4}";
-        Map<Locale, Object> result = MAPPER.readValue(JSON, new TypeReference<Map<Locale, Object>>() {
-        });
-        assertNotNull(result);
-        assertEquals(1, result.size());
-        Object ob = result.keySet().iterator().next();
-        assertNotNull(ob);
-        assertEquals(Locale.class, ob.getClass());
-        assertEquals(key, ob);
-    }
-
     public void testCurrencyKeyMap() throws Exception {
         Currency key = Currency.getInstance("USD");
         String JSON = "{ \"" + key + "\":4}";

src/test/java/com/fasterxml/jackson/databind/deser/std/FromStringDeserializerTest.java

@@ -1,16 +1,55 @@
 package com.fasterxml.jackson.databind.deser.std;
 
+import java.io.IOException;
 import java.util.Locale;
+import java.util.Map;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.BaseMapTest;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class FromStringDeserializerTest extends BaseMapTest
 {
     private final Locale[] LOCALES = new Locale[]
             {Locale.CANADA, Locale.ROOT, Locale.GERMAN, Locale.CHINESE, Locale.KOREA, Locale.TAIWAN};
+
+    /*
+    /**********************************************************************
+    /* Test methods, old, from Jackson pre-2.13
+    /**********************************************************************
+     */
+
     private final ObjectMapper MAPPER = newJsonMapper();
 
+    public void testLocale() throws IOException
+    {
+        assertEquals(new Locale("en"), MAPPER.readValue(q("en"), Locale.class));
+        assertEquals(new Locale("es", "ES"), MAPPER.readValue(q("es_ES"), Locale.class));
+        assertEquals(new Locale("FI", "fi", "savo"),
+                MAPPER.readValue(q("fi_FI_savo"), Locale.class));
+        assertEquals(new Locale("en", "US"),
+                MAPPER.readValue(q("en-US"), Locale.class));
+    }
+
+    public void testLocaleKeyMap() throws Exception {
+        Locale key = Locale.CHINA;
+        String JSON = "{ \"" + key + "\":4}";
+        Map<Locale, Object> result = MAPPER.readValue(JSON, new TypeReference<Map<Locale, Object>>() {
+        });
+        assertNotNull(result);
+        assertEquals(1, result.size());
+        Object ob = result.keySet().iterator().next();
+        assertNotNull(ob);
+        assertEquals(Locale.class, ob.getClass());
+        assertEquals(key, ob);
+    }
+
+    /*
+    /**********************************************************************
+    /* Test methods, advanced (2.13+) -- [databind#3259]
+    /**********************************************************************
+     */
+
     public void testLocaleDeserializeNonBCPFormat() throws Exception {
         Locale locale = new Locale("en", "US");
         Locale deSerializedLocale = MAPPER.readValue(MAPPER.writeValueAsString(locale), Locale.class);

src/test/java/com/fasterxml/jackson/failing/ConstructorDetector3241Test.java

@@ -2,7 +2,6 @@
 
 import java.lang.annotation.*;
 
-import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.Nulls;
 
 import com.fasterxml.jackson.databind.*;