Changes wrt [core#1378]

FasterXML · Jan 3, 2025 · ebcb134 · ebcb134
1 parent ef99aba
commit ebcb134
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 12 deletions.
diff --git a/datetime/src/main/java/tools/jackson/datatype/jsr310/deser/DurationDeserializer.java b/datetime/src/main/java/tools/jackson/datatype/jsr310/deser/DurationDeserializer.java
@@ -150,7 +150,7 @@ public Duration deserialize(JsonParser parser, DeserializationContext context)
             case JsonTokenId.ID_NUMBER_INT:
                 return _fromTimestamp(context, parser.getLongValue());
             case JsonTokenId.ID_STRING:
-                return _fromString(parser, context, parser.getText());
+                return _fromString(parser, context, parser.getString());
             // 30-Sep-2020, tatu: New! "Scalar from Object" (mostly for XML)
             case JsonTokenId.ID_START_OBJECT:
                 return _fromString(parser, context,

diff --git a/datetime/src/main/java/tools/jackson/datatype/jsr310/deser/InstantDeserializer.java b/datetime/src/main/java/tools/jackson/datatype/jsr310/deser/InstantDeserializer.java
@@ -325,7 +325,7 @@ public T deserialize(JsonParser parser, DeserializationContext context)
             case JsonTokenId.ID_NUMBER_INT:
                 return _fromLong(context, parser.getLongValue());
             case JsonTokenId.ID_STRING:
-                return _fromString(parser, context, parser.getText());
+                return _fromString(parser, context, parser.getString());
             // 30-Sep-2020, tatu: New! "Scalar from Object" (mostly for XML)
             case JsonTokenId.ID_START_OBJECT:
                 return _fromString(parser, context,

diff --git a/...e/src/main/java/tools/jackson/datatype/jsr310/deser/JSR310StringParsableDeserializer.java b/...e/src/main/java/tools/jackson/datatype/jsr310/deser/JSR310StringParsableDeserializer.java
@@ -111,7 +111,7 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt)
         throws JacksonException
     {
         if (p.hasToken(JsonToken.VALUE_STRING)) {
-            return _fromString(p, ctxt, p.getText());
+            return _fromString(p, ctxt, p.getString());
         }
         // 30-Sep-2020, tatu: New! "Scalar from Object" (mostly for XML)
         if (p.isExpectedStartObjectToken()) {

diff --git a/datetime/src/main/java/tools/jackson/datatype/jsr310/deser/LocalDateDeserializer.java b/datetime/src/main/java/tools/jackson/datatype/jsr310/deser/LocalDateDeserializer.java
@@ -88,7 +88,7 @@ public LocalDate deserialize(JsonParser parser, DeserializationContext context)
         throws JacksonException
     {
         if (parser.hasToken(JsonToken.VALUE_STRING)) {
-            return _fromString(parser, context, parser.getText());
+            return _fromString(parser, context, parser.getString());
         }
         // 30-Sep-2020, tatu: New! "Scalar from Object" (mostly for XML)
         if (parser.isExpectedStartObjectToken()) {

diff --git a/datetime/src/main/java/tools/jackson/datatype/jsr310/deser/LocalDateTimeDeserializer.java b/datetime/src/main/java/tools/jackson/datatype/jsr310/deser/LocalDateTimeDeserializer.java
@@ -109,7 +109,7 @@ protected JSR310DateTimeDeserializerBase<?> _withFormatOverrides(Deserialization
     public LocalDateTime deserialize(JsonParser parser, DeserializationContext context) throws JacksonException
     {
         if (parser.hasTokenId(JsonTokenId.ID_STRING)) {
-            return _fromString(parser, context, parser.getText());
+            return _fromString(parser, context, parser.getString());
         }
         // 30-Sep-2020, tatu: New! "Scalar from Object" (mostly for XML)
         if (parser.isExpectedStartObjectToken()) {

diff --git a/datetime/src/main/java/tools/jackson/datatype/jsr310/deser/LocalTimeDeserializer.java b/datetime/src/main/java/tools/jackson/datatype/jsr310/deser/LocalTimeDeserializer.java
@@ -103,7 +103,7 @@ protected JSR310DateTimeDeserializerBase<?> _withFormatOverrides(Deserialization
     public LocalTime deserialize(JsonParser parser, DeserializationContext context) throws JacksonException
     {
         if (parser.hasToken(JsonToken.VALUE_STRING)) {
-            return _fromString(parser, context, parser.getText());
+            return _fromString(parser, context, parser.getString());
         }
         // 30-Sep-2020, tatu: New! "Scalar from Object" (mostly for XML)
         if (parser.isExpectedStartObjectToken()) {

diff --git a/datetime/src/main/java/tools/jackson/datatype/jsr310/deser/MonthDayDeserializer.java b/datetime/src/main/java/tools/jackson/datatype/jsr310/deser/MonthDayDeserializer.java
@@ -62,7 +62,7 @@ public MonthDay deserialize(JsonParser parser, DeserializationContext context)
         throws JacksonException
     {
         if (parser.hasToken(JsonToken.VALUE_STRING)) {
-            return _fromString(parser, context, parser.getText());
+            return _fromString(parser, context, parser.getString());
         }
         // 30-Sep-2020, tatu: New! "Scalar from Object" (mostly for XML)
         if (parser.isExpectedStartObjectToken()) {

diff --git a/datetime/src/main/java/tools/jackson/datatype/jsr310/deser/OffsetTimeDeserializer.java b/datetime/src/main/java/tools/jackson/datatype/jsr310/deser/OffsetTimeDeserializer.java
@@ -101,7 +101,7 @@ public OffsetTime deserialize(JsonParser parser, DeserializationContext context)
         throws JacksonException
    {
         if (parser.hasToken(JsonToken.VALUE_STRING)) {
-            return _fromString(parser, context, parser.getText());
+            return _fromString(parser, context, parser.getString());
         }
         // 30-Sep-2020, tatu: New! "Scalar from Object" (mostly for XML)
         if (parser.isExpectedStartObjectToken()) {
@@ -160,7 +160,7 @@ public OffsetTime deserialize(JsonParser parser, DeserializationContext context)
             }
         }
         if (parser.currentToken() == JsonToken.VALUE_STRING) {
-            OffsetTime result = OffsetTime.of(hour, minute, second, partialSecond, ZoneOffset.of(parser.getText()));
+            OffsetTime result = OffsetTime.of(hour, minute, second, partialSecond, ZoneOffset.of(parser.getString()));
             if (parser.nextToken() != JsonToken.END_ARRAY) {
                 _reportWrongToken(context, JsonToken.END_ARRAY, "timezone");
             }

diff --git a/datetime/src/main/java/tools/jackson/datatype/jsr310/deser/OneBasedMonthDeserializer.java b/datetime/src/main/java/tools/jackson/datatype/jsr310/deser/OneBasedMonthDeserializer.java
@@ -24,7 +24,7 @@ public OneBasedMonthDeserializer(ValueDeserializer<?> defaultDeserializer) {
     public Object deserialize(JsonParser parser, DeserializationContext context) {
         JsonToken token = parser.currentToken();
         Month zeroBaseMonth = (Month) getDelegatee().deserialize(parser, context);
-        if (!_isNumericValue(parser.getText(), token)) {
+        if (!_isNumericValue(parser.getString(), token)) {
             return zeroBaseMonth;
         }
         if (zeroBaseMonth == Month.JANUARY) {

diff --git a/datetime/src/main/java/tools/jackson/datatype/jsr310/deser/YearDeserializer.java b/datetime/src/main/java/tools/jackson/datatype/jsr310/deser/YearDeserializer.java
@@ -81,7 +81,7 @@ public Year deserialize(JsonParser parser, DeserializationContext context) throw
     {
         JsonToken t = parser.currentToken();
         if (t == JsonToken.VALUE_STRING) {
-            return _fromString(parser, context, parser.getText());
+            return _fromString(parser, context, parser.getString());
         }
         // 30-Sep-2020, tatu: New! "Scalar from Object" (mostly for XML)
         if (t == JsonToken.START_OBJECT) {

diff --git a/datetime/src/main/java/tools/jackson/datatype/jsr310/deser/YearMonthDeserializer.java b/datetime/src/main/java/tools/jackson/datatype/jsr310/deser/YearMonthDeserializer.java
@@ -82,7 +82,7 @@ protected YearMonthDeserializer withLeniency(Boolean leniency) {
     public YearMonth deserialize(JsonParser parser, DeserializationContext context) throws JacksonException
     {
         if (parser.hasToken(JsonToken.VALUE_STRING)) {
-            return _fromString(parser, context, parser.getText());
+            return _fromString(parser, context, parser.getString());
         }
         // 30-Sep-2020, tatu: New! "Scalar from Object" (mostly for XML)
         if (parser.isExpectedStartObjectToken()) {