Change String collections to use JsonParser.nextTextValue()

Author: cowtowncoder

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

@@ -54,18 +54,18 @@ public String[] deserialize(JsonParser jp, DeserializationContext ctxt) throws I
         Object[] chunk = buffer.resetAndStart();
 
         int ix = 0;
-        JsonToken t;
 
         try {
-            while ((t = jp.nextToken()) != JsonToken.END_ARRAY) {
-                // Ok: no need to convert Strings, but must recognize nulls
-                String value;
-                if (t == JsonToken.VALUE_STRING) {
-                    value = jp.getText();
-                } else if (t == JsonToken.VALUE_NULL) {
-                    value = null; // since we have established that '_elementDeserializer == null' earlier
-                } else {
-                    value = _parseString(jp, ctxt);
+            while (true) {
+                String value = jp.nextTextValue();
+                if (value == null) {
+                    JsonToken t = jp.getCurrentToken();
+                    if (t == JsonToken.END_ARRAY) {
+                        break;
+                    }
+                    if (t != JsonToken.VALUE_NULL) {
+                        value = _parseString(jp, ctxt);
+                    }
                 }
                 if (ix >= chunk.length) {
                     chunk = buffer.appendCompletedChunk(chunk);

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

@@ -173,16 +173,19 @@ public Collection<String> deserialize(JsonParser jp, DeserializationContext ctxt
         if (_valueDeserializer != null) {
             return deserializeUsingCustom(jp, ctxt, result, _valueDeserializer);
         }
-        JsonToken t;
-
         try {
-            while ((t = jp.nextToken()) != JsonToken.END_ARRAY) {
-                String value;
-                if (t == JsonToken.VALUE_STRING) {
-                    value = jp.getText();
-                } else if (t == JsonToken.VALUE_NULL) {
-                    value = null;
-                } else {
+            while (true) {
+                // First the common case:
+                String value = jp.nextTextValue();
+                if (value != null) {
+                    result.add(value);
+                    continue;
+                }
+                JsonToken t = jp.getCurrentToken();
+                if (t == JsonToken.END_ARRAY) {
+                    break;
+                }
+                if (t != JsonToken.VALUE_NULL) {
                     value = _parseString(jp, ctxt);
                 }
                 result.add(value);