Fix #1344

Author: cowtowncoder

release-notes/VERSION

@@ -10,6 +10,9 @@ Project: jackson-databind
  (reported by MichaelChambers@github)
 #1332: Fixed ArrayIndexOutOfBoundException for enum by index deser
  (reported by Max D)
+#1344: Deserializing locale assumes JDK separator (underscore), does not
+  accept RFC specified (hyphen)
+ (reported by Jim M)
 
 2.7.6 (23-Jul-2016)
 

src/main/java/com/fasterxml/jackson/databind/deser/std/FromStringDeserializer.java

@@ -228,13 +228,13 @@ protected Object _deserialize(String value, DeserializationContext ctxt) throws
                 return Pattern.compile(value);
             case STD_LOCALE:
                 {
-                    int ix = value.indexOf('_');
+                    int ix = _firstHyphenOrUnderscore(value);
                     if (ix < 0) { // single argument
                         return new Locale(value);
                     }
                     String first = value.substring(0, ix);
                     value = value.substring(ix+1);
-                    ix = value.indexOf('_');
+                    ix = _firstHyphenOrUnderscore(value);
                     if (ix < 0) { // two pieces
                         return new Locale(first, value);
                     }
@@ -287,5 +287,17 @@ protected Object _deserializeFromEmptyString() throws IOException {
             }
             return super._deserializeFromEmptyString();
         }
+
+
+        protected int _firstHyphenOrUnderscore(String str)
+        {
+            for (int i = 0, end = str.length(); i < end; ++i) {
+                char c = str.charAt(i);
+                if (c == '_' || c == '-') {
+                    return i;
+                }
+            }
+            return -1;
+        }
     }
 }

src/test/java/com/fasterxml/jackson/databind/deser/TestJdkTypes.java

@@ -68,7 +68,7 @@ public BooleanBean(@JsonProperty("ctor") Boolean foo) {
         }
     }
 
-    // [Issue#429]
+    // [databind#429]
     static class StackTraceBean {
         public final static int NUM = 13;
 
@@ -145,6 +145,9 @@ public void testLocale() throws IOException
         assertEquals(new Locale("es", "ES"), MAPPER.readValue(quote("es_ES"), Locale.class));
         assertEquals(new Locale("FI", "fi", "savo"),
                 MAPPER.readValue(quote("fi_FI_savo"), Locale.class));
+        assertEquals(new Locale("en", "US"),
+                MAPPER.readValue(quote("en-US"), Locale.class));
+
         // [databind#1123]
         Locale loc = MAPPER.readValue(quote(""), Locale.class);
         assertSame(Locale.ROOT, loc);

src/test/java/com/fasterxml/jackson/databind/ser/TestJdkTypes.java

@@ -74,6 +74,8 @@ public void testLocale() throws IOException
         assertEquals(quote("es_ES"), MAPPER.writeValueAsString(new Locale("es", "ES")));
         assertEquals(quote("fi_FI_savo"), MAPPER.writeValueAsString(new Locale("FI", "fi", "savo")));
 
+        assertEquals(quote("en_US"), MAPPER.writeValueAsString(Locale.US));
+
         // [databind#1123]
         assertEquals(quote(""), MAPPER.writeValueAsString(Locale.ROOT));
     }