diff options
Diffstat (limited to 'src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java')
| -rw-r--r-- | src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java index 81dbc97d5..dc7bddb3d 100644 --- a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java +++ b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java @@ -267,7 +267,7 @@ public class BeanDeserializer } } else { if (p.hasTokenId(JsonTokenId.ID_FIELD_NAME)) { - propName = p.getCurrentName(); + propName = p.currentName(); } else { return bean; } @@ -313,7 +313,7 @@ public class BeanDeserializer // [databind#631]: Assign current value, to be accessible by custom serializers p.setCurrentValue(bean); if (p.hasTokenId(JsonTokenId.ID_FIELD_NAME)) { - String propName = p.getCurrentName(); + String propName = p.currentName(); do { p.nextToken(); SettableBeanProperty prop = _beanProperties.find(propName); @@ -347,7 +347,7 @@ public class BeanDeserializer */ if ((_objectIdReader != null) && _objectIdReader.maySerializeAsObject()) { if (p.hasTokenId(JsonTokenId.ID_FIELD_NAME) - && _objectIdReader.isValidReferencePropertyName(p.getCurrentName(), p)) { + && _objectIdReader.isValidReferencePropertyName(p.currentName(), p)) { return deserializeFromObjectId(p, ctxt); } } @@ -392,7 +392,7 @@ public class BeanDeserializer } } if (p.hasTokenId(JsonTokenId.ID_FIELD_NAME)) { - String propName = p.getCurrentName(); + String propName = p.currentName(); do { p.nextToken(); SettableBeanProperty prop = _beanProperties.find(propName); @@ -431,7 +431,7 @@ public class BeanDeserializer JsonToken t = p.currentToken(); List<BeanReferring> referrings = null; for (; t == JsonToken.FIELD_NAME; t = p.nextToken()) { - String propName = p.getCurrentName(); + String propName = p.currentName(); p.nextToken(); // to point to value // Object Id property? if (buffer.readIdProperty(propName)) { @@ -651,7 +651,7 @@ public class BeanDeserializer throws IOException { if (p.hasTokenId(JsonTokenId.ID_FIELD_NAME)) { - String propName = p.getCurrentName(); + String propName = p.currentName(); do { p.nextToken(); // TODO: 06-Jan-2015, tatu: try streamlining call sequences here as well @@ -705,7 +705,7 @@ public class BeanDeserializer injectValues(ctxt, bean); } final Class<?> activeView = _needViewProcesing ? ctxt.getActiveView() : null; - String propName = p.hasTokenId(JsonTokenId.ID_FIELD_NAME) ? p.getCurrentName() : null; + String propName = p.hasTokenId(JsonTokenId.ID_FIELD_NAME) ? p.currentName() : null; for (; propName != null; propName = p.nextFieldName()) { p.nextToken(); @@ -765,7 +765,7 @@ public class BeanDeserializer tokens.writeStartObject(); final Class<?> activeView = _needViewProcesing ? ctxt.getActiveView() : null; for (; t == JsonToken.FIELD_NAME; t = p.nextToken()) { - String propName = p.getCurrentName(); + String propName = p.currentName(); SettableBeanProperty prop = _beanProperties.find(propName); p.nextToken(); if (prop != null) { // normal case @@ -826,7 +826,7 @@ public class BeanDeserializer JsonToken t = p.currentToken(); for (; t == JsonToken.FIELD_NAME; t = p.nextToken()) { - String propName = p.getCurrentName(); + String propName = p.currentName(); p.nextToken(); // to point to value // creator property? SettableBeanProperty creatorProp = creator.findCreatorProperty(propName); @@ -951,7 +951,7 @@ public class BeanDeserializer final ExternalTypeHandler ext = _externalTypeIdHandler.start(); for (JsonToken t = p.currentToken(); t == JsonToken.FIELD_NAME; t = p.nextToken()) { - String propName = p.getCurrentName(); + String propName = p.currentName(); t = p.nextToken(); SettableBeanProperty prop = _beanProperties.find(propName); if (prop != null) { // normal case @@ -1008,7 +1008,7 @@ public class BeanDeserializer JsonToken t = p.currentToken(); for (; t == JsonToken.FIELD_NAME; t = p.nextToken()) { - String propName = p.getCurrentName(); + String propName = p.currentName(); p.nextToken(); // to point to value // creator property? SettableBeanProperty creatorProp = creator.findCreatorProperty(propName); |