Skip to content

Commit

Permalink
yet bit more refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
@cowtowncoder
cowtowncoder committed Jun 13, 2020
1 parent dca5adf commit 565ccb1
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 23 deletions.
64 changes: 41 additions & 23 deletions src/main/java/com/fasterxml/jackson/databind/deser/std/StdDeserializer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,24 @@ protected final boolean _parseBooleanPrimitive(DeserializationContext ctxt,
return ((Boolean) ctxt.handleUnexpectedToken(Boolean.TYPE, p)).booleanValue();
}

/**
* Helper method called for cases where non-primitive, boolean-based value
* is to be deserialized: result of this method will be {@link java.lang.Boolean},
* although actual target type may be something different.
*<p>
* Note: does NOT dynamically access "empty value" or "null value" of deserializer
* since those values could be of type other than {@link java.lang.Boolean}.
* Caller may need to translate from 3 possible result types into appropriately
* matching output types.
*
* @param ctxt Deserialization context for accessing configuration
* @param p Underlying parser
* @param targetType Actual type that is being deserialized, may be
* same as {@link #handledType} but could be {@code AtomicBoolean} for example.
* Used for coercion config access.
*
* @since 2.12
*/
protected final Boolean _parseBoolean(DeserializationContext ctxt,
JsonParser p, Class<?> targetType)
throws IOException
Expand All @@ -436,30 +454,30 @@ protected final Boolean _parseBoolean(DeserializationContext ctxt,
CoercionAction act = _checkFromStringCoercion(ctxt, text,
LogicalType.Boolean, targetType);
if (act == CoercionAction.AsNull) {
return (Boolean) getNullValue(ctxt);
return null;
}
if (act == CoercionAction.AsEmpty) {
return (Boolean) getEmptyValue(ctxt);
return false;
}
text = text.trim();
// [databind#422]: Allow aliases
if ("true".equals(text) || "True".equals(text)) {
return Boolean.TRUE;
return true;
}
if ("false".equals(text) || "False".equals(text)) {
return Boolean.FALSE;
return false;
}
if (_hasTextualNull(text)) {
return (Boolean) _coerceTextualNull(ctxt, false);
if (_checkTextualNull(ctxt, text)) {
return null;
}
return (Boolean) ctxt.handleWeirdStringValue(_valueClass, text,
return (Boolean) ctxt.handleWeirdStringValue(targetType, text,
"only \"true\" or \"false\" recognized");
case JsonTokenId.ID_TRUE:
return true;
case JsonTokenId.ID_FALSE:
return false;
case JsonTokenId.ID_NULL: // null fine for non-primitive
return (Boolean) getNullValue(ctxt);
return null;
case JsonTokenId.ID_NUMBER_INT:
// may accept ints too, (0 == false, otherwise true)
return _coerceBooleanFromInt(ctxt, p, targetType);
Expand All @@ -470,20 +488,6 @@ protected final Boolean _parseBoolean(DeserializationContext ctxt,
return (Boolean) ctxt.handleUnexpectedToken(targetType, p);
}

@Deprecated // since 2.12
protected boolean _parseBooleanFromInt(JsonParser p, DeserializationContext ctxt)
throws IOException
{
// 13-Oct-2016, tatu: As per [databind#1324], need to be careful wrt
// degenerate case of huge integers, legal in JSON.
// ... this is, on the other hand, probably wrong/sub-optimal for non-JSON
// input. For now, no rea
_verifyNumberForScalarCoercion(ctxt, p);
// Anyway, note that since we know it's valid (JSON) integer, it can't have
// extra whitespace to trim.
return !"0".equals(p.getText());
}

@Deprecated // since 2.12, use overloaded variant
protected final byte _parseBytePrimitive(JsonParser p, DeserializationContext ctxt) throws IOException {
return _parseBytePrimitive(ctxt, p);
Expand Down Expand Up @@ -1308,7 +1312,21 @@ protected String _coercedTypeDesc() {
/* Helper methods for sub-classes, coercions, older (pre-2.12), deprecated
/**********************************************************************
*/


@Deprecated // since 2.12
protected boolean _parseBooleanFromInt(JsonParser p, DeserializationContext ctxt)
throws IOException
{
// 13-Oct-2016, tatu: As per [databind#1324], need to be careful wrt
// degenerate case of huge integers, legal in JSON.
// ... this is, on the other hand, probably wrong/sub-optimal for non-JSON
// input. For now, no rea
_verifyNumberForScalarCoercion(ctxt, p);
// Anyway, note that since we know it's valid (JSON) integer, it can't have
// extra whitespace to trim.
return !"0".equals(p.getText());
}

/**
* @deprecated Since 2.12 use {@link #_checkFromStringCoercion} instead
*/
Expand Down
7 changes: 7 additions & 0 deletions src/test/java/com/fasterxml/jackson/databind/convert/CoerceJDKScalarsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.io.StringReader;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.concurrent.atomic.AtomicBoolean;

import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
Expand Down Expand Up @@ -52,6 +53,7 @@ public void testNullValueFromEmpty() throws Exception

_verifyNullOkFromEmpty(BigInteger.class, null);
_verifyNullOkFromEmpty(BigDecimal.class, null);
_verifyNullOkFromEmpty(AtomicBoolean.class, null);
}

private void _verifyNullOkFromEmpty(Class<?> type, Object exp) throws IOException
Expand Down Expand Up @@ -88,6 +90,7 @@ public void testNullFailFromEmpty() throws Exception

_verifyNullFail(BigInteger.class);
_verifyNullFail(BigDecimal.class);
_verifyNullFail(AtomicBoolean.class);
}

private void _verifyNullFail(Class<?> type) throws IOException
Expand Down Expand Up @@ -137,6 +140,10 @@ public void testStringCoercionOk() throws Exception

_verifyCoerceSuccess(quote("123"), BigInteger.class, BigInteger.valueOf(123));
_verifyCoerceSuccess(quote("123.0"), BigDecimal.class, new BigDecimal("123.0"));

AtomicBoolean ab = COERCING_MAPPER.readValue(quote("true"), AtomicBoolean.class);
assertNotNull(ab);
assertTrue(ab.get());
}

public void testStringCoercionFailBoolean() throws Exception
Expand Down

0 comments on commit 565ccb1

Please sign in to comment.