Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 4a1ea8a

Browse filesBrowse files
cowtowncodercowtowncoder
committed
Minor cleanup to optimized int/long/String deserializers
1 parent ab34af4 commit 4a1ea8a
Copy full SHA for 4a1ea8a

File tree

Expand file treeCollapse file tree

9 files changed

+37
-19
lines changed
Filter options
Expand file treeCollapse file tree

9 files changed

+37
-19
lines changed

‎afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/deser/SettableIntFieldProperty.java

Copy file name to clipboardExpand all lines: afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/deser/SettableIntFieldProperty.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public SettableBeanProperty withMutator(BeanPropertyMutator mut) {
3737
public void deserializeAndSet(JsonParser p, DeserializationContext ctxt,
3838
Object bean) throws IOException
3939
{
40-
int v = p.hasToken(JsonToken.VALUE_NUMBER_INT) ? p.getIntValue() : _deserializeInt(p, ctxt);
40+
int v = p.isExpectedNumberIntToken() ? p.getIntValue() : _deserializeInt(p, ctxt);
4141
try {
4242
_propertyMutator.intField(bean, _optimizedIndex, v);
4343
} catch (Throwable e) {
@@ -60,7 +60,7 @@ public void set(Object bean, Object value) throws IOException {
6060
public Object deserializeSetAndReturn(JsonParser p,
6161
DeserializationContext ctxt, Object instance) throws IOException
6262
{
63-
int v = p.hasToken(JsonToken.VALUE_NUMBER_INT) ? p.getIntValue() : _deserializeInt(p, ctxt);
63+
int v = p.isExpectedNumberIntToken() ? p.getIntValue() : _deserializeInt(p, ctxt);
6464
return setAndReturn(instance, v);
6565
}
6666
}

‎afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/deser/SettableIntMethodProperty.java

Copy file name to clipboardExpand all lines: afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/deser/SettableIntMethodProperty.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public SettableBeanProperty withMutator(BeanPropertyMutator mut) {
3737
public void deserializeAndSet(JsonParser p, DeserializationContext ctxt,
3838
Object bean) throws IOException
3939
{
40-
int v = p.hasToken(JsonToken.VALUE_NUMBER_INT) ? p.getIntValue() : _deserializeInt(p, ctxt);
40+
int v = p.isExpectedNumberIntToken() ? p.getIntValue() : _deserializeInt(p, ctxt);
4141
try {
4242
_propertyMutator.intSetter(bean, _optimizedIndex, v);
4343
return;
@@ -62,7 +62,7 @@ public Object deserializeSetAndReturn(JsonParser p,
6262
DeserializationContext ctxt, Object instance)
6363
throws IOException
6464
{
65-
int v = p.hasToken(JsonToken.VALUE_NUMBER_INT) ? p.getIntValue() : _deserializeInt(p, ctxt);
65+
int v = p.isExpectedNumberIntToken() ? p.getIntValue() : _deserializeInt(p, ctxt);
6666
return setAndReturn(instance, v);
6767
}
6868
}

‎afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/deser/SettableLongFieldProperty.java

Copy file name to clipboardExpand all lines: afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/deser/SettableLongFieldProperty.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public SettableBeanProperty withMutator(BeanPropertyMutator mut) {
3737
public void deserializeAndSet(JsonParser p, DeserializationContext ctxt,
3838
Object bean) throws IOException
3939
{
40-
long v = p.hasToken(JsonToken.VALUE_NUMBER_INT) ? p.getLongValue() : _deserializeLong(p, ctxt);
40+
long v = p.isExpectedNumberIntToken() ? p.getLongValue() : _deserializeLong(p, ctxt);
4141
try {
4242
_propertyMutator.longField(bean, _optimizedIndex, v);
4343
} catch (Throwable e) {
@@ -60,7 +60,7 @@ public void set(Object bean, Object value) throws IOException {
6060
public Object deserializeSetAndReturn(JsonParser p,
6161
DeserializationContext ctxt, Object instance) throws IOException
6262
{
63-
long l = p.hasToken(JsonToken.VALUE_NUMBER_INT) ? p.getLongValue() : _deserializeLong(p, ctxt);
63+
long l = p.isExpectedNumberIntToken() ? p.getLongValue() : _deserializeLong(p, ctxt);
6464
return setAndReturn(instance, l);
6565
}
6666
}

‎afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/deser/SettableLongMethodProperty.java

Copy file name to clipboardExpand all lines: afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/deser/SettableLongMethodProperty.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public SettableBeanProperty withMutator(BeanPropertyMutator mut) {
3737
public void deserializeAndSet(JsonParser p, DeserializationContext ctxt,
3838
Object bean) throws IOException
3939
{
40-
long v = p.hasToken(JsonToken.VALUE_NUMBER_INT) ? p.getLongValue() : _deserializeLong(p, ctxt);
40+
long v = p.isExpectedNumberIntToken() ? p.getLongValue() : _deserializeLong(p, ctxt);
4141
try {
4242
_propertyMutator.longSetter(bean, _optimizedIndex, v);
4343
} catch (Throwable e) {
@@ -60,7 +60,7 @@ public void set(Object bean, Object value) throws IOException {
6060
public Object deserializeSetAndReturn(JsonParser p,
6161
DeserializationContext ctxt, Object instance) throws IOException
6262
{
63-
long l = p.hasToken(JsonToken.VALUE_NUMBER_INT) ? p.getLongValue() : _deserializeLong(p, ctxt);
63+
long l = p.isExpectedNumberIntToken() ? p.getLongValue() : _deserializeLong(p, ctxt);
6464
return setAndReturn(instance, l);
6565
}
6666
}

‎afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/deser/SettableStringFieldProperty.java

Copy file name to clipboardExpand all lines: afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/deser/SettableStringFieldProperty.java
+9-3Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,16 @@ public void deserializeAndSet(JsonParser p, DeserializationContext ctxt,
3838
Object bean) throws IOException
3939
{
4040
String text;
41-
if (p.hasToken(JsonToken.VALUE_NULL)) {
41+
42+
if (p.hasToken(JsonToken.VALUE_STRING)) {
43+
text = p.getText();
44+
} else if (p.hasToken(JsonToken.VALUE_NULL)) {
4245
if (_skipNulls) {
4346
return;
4447
}
4548
text = (String) _nullProvider.getNullValue(ctxt);
4649
} else {
47-
text = p.getValueAsString();
50+
text = p.getValueAsString();
4851
if (text == null) {
4952
text = _deserializeString(p, ctxt);
5053
}
@@ -61,7 +64,10 @@ public Object deserializeSetAndReturn(JsonParser p, DeserializationContext ctxt,
6164
throws IOException
6265
{
6366
String text;
64-
if (p.hasToken(JsonToken.VALUE_NULL)) {
67+
68+
if (p.hasToken(JsonToken.VALUE_STRING)) {
69+
text = p.getText();
70+
} else if (p.hasToken(JsonToken.VALUE_NULL)) {
6571
if (_skipNulls) {
6672
return instance;
6773
}

‎afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/deser/SettableStringMethodProperty.java

Copy file name to clipboardExpand all lines: afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/deser/SettableStringMethodProperty.java
+8-2Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ public SettableBeanProperty withMutator(BeanPropertyMutator mut) {
3838
public void deserializeAndSet(JsonParser p, DeserializationContext ctxt, Object bean) throws IOException
3939
{
4040
String text;
41-
if (p.hasToken(JsonToken.VALUE_NULL)) {
41+
42+
if (p.hasToken(JsonToken.VALUE_STRING)) {
43+
text = p.getText();
44+
} else if (p.hasToken(JsonToken.VALUE_NULL)) {
4245
if (_skipNulls) {
4346
return;
4447
}
@@ -60,7 +63,10 @@ public void deserializeAndSet(JsonParser p, DeserializationContext ctxt, Object
6063
public Object deserializeSetAndReturn(JsonParser p, DeserializationContext ctxt, Object instance) throws IOException
6164
{
6265
String text;
63-
if (p.hasToken(JsonToken.VALUE_NULL)) {
66+
67+
if (p.hasToken(JsonToken.VALUE_STRING)) {
68+
text = p.getText();
69+
} else if (p.hasToken(JsonToken.VALUE_NULL)) {
6470
if (_skipNulls) {
6571
return instance;
6672
}

‎blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/deser/SettableIntProperty.java

Copy file name to clipboardExpand all lines: blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/deser/SettableIntProperty.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ protected SettableBeanProperty withDelegate(SettableBeanProperty del) {
3434
public void deserializeAndSet(JsonParser p, DeserializationContext ctxt,
3535
Object bean) throws IOException
3636
{
37-
int v = p.hasToken(JsonToken.VALUE_NUMBER_INT) ? p.getIntValue() : _deserializeInt(p, ctxt);
37+
int v = p.isExpectedNumberIntToken() ? p.getIntValue() : _deserializeInt(p, ctxt);
3838
try {
3939
_optimizedSetter.accept(bean, v);
4040
} catch (Throwable e) {
@@ -58,7 +58,7 @@ public Object deserializeSetAndReturn(JsonParser p,
5858
DeserializationContext ctxt, Object instance)
5959
throws IOException
6060
{
61-
int v = p.hasToken(JsonToken.VALUE_NUMBER_INT) ? p.getIntValue() : _deserializeInt(p, ctxt);
61+
int v = p.isExpectedNumberIntToken() ? p.getIntValue() : _deserializeInt(p, ctxt);
6262
return setAndReturn(instance, v);
6363
}
6464
}

‎blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/deser/SettableLongProperty.java

Copy file name to clipboardExpand all lines: blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/deser/SettableLongProperty.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ protected SettableBeanProperty withDelegate(SettableBeanProperty del) {
3434
public void deserializeAndSet(JsonParser p, DeserializationContext ctxt,
3535
Object bean) throws IOException
3636
{
37-
long v = p.hasToken(JsonToken.VALUE_NUMBER_INT) ? p.getLongValue() : _deserializeLong(p, ctxt);
37+
long v = p.isExpectedNumberIntToken() ? p.getLongValue() : _deserializeLong(p, ctxt);
3838
try {
3939
_optimizedSetter.accept(bean, v);
4040
} catch (Throwable e) {
@@ -57,7 +57,7 @@ public void set(Object bean, Object value) throws IOException {
5757
public Object deserializeSetAndReturn(JsonParser p,
5858
DeserializationContext ctxt, Object instance) throws IOException
5959
{
60-
long l = p.hasToken(JsonToken.VALUE_NUMBER_INT) ? p.getLongValue() : _deserializeLong(p, ctxt);
60+
long l = p.isExpectedNumberIntToken() ? p.getLongValue() : _deserializeLong(p, ctxt);
6161
return setAndReturn(instance, l);
6262
}
6363
}

‎blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/deser/SettableStringProperty.java

Copy file name to clipboardExpand all lines: blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/deser/SettableStringProperty.java
+8-2Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ protected SettableBeanProperty withDelegate(SettableBeanProperty del) {
3535
public void deserializeAndSet(JsonParser p, DeserializationContext ctxt, Object bean) throws IOException
3636
{
3737
String text;
38-
if (p.hasToken(JsonToken.VALUE_NULL)) {
38+
39+
if (p.hasToken(JsonToken.VALUE_STRING)) {
40+
text = p.getText();
41+
} else if (p.hasToken(JsonToken.VALUE_NULL)) {
3942
if (_skipNulls) {
4043
return;
4144
}
@@ -53,7 +56,10 @@ public void deserializeAndSet(JsonParser p, DeserializationContext ctxt, Object
5356
public Object deserializeSetAndReturn(JsonParser p, DeserializationContext ctxt, Object instance) throws IOException
5457
{
5558
String text;
56-
if (p.hasToken(JsonToken.VALUE_NULL)) {
59+
60+
if (p.hasToken(JsonToken.VALUE_STRING)) {
61+
text = p.getText();
62+
} else if (p.hasToken(JsonToken.VALUE_NULL)) {
5763
if (_skipNulls) {
5864
return instance;
5965
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.