Changes wrt [core#1378]

FasterXML · Jan 3, 2025 · ab2161e · ab2161e
1 parent 09416da
commit ab2161e
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 13 deletions.
diff --git a/src/main/java/tools/jackson/datatype/joda/deser/DateTimeDeserializer.java b/src/main/java/tools/jackson/datatype/joda/deser/DateTimeDeserializer.java
@@ -54,7 +54,7 @@ public ReadableInstant deserialize(JsonParser p, DeserializationContext ctxt)
         case JsonTokenId.ID_NUMBER_INT:
             return _fromTimestamp(ctxt, p.getLongValue());
         case JsonTokenId.ID_STRING:
-            return _fromString(p, ctxt, p.getText());
+            return _fromString(p, ctxt, p.getString());
         case JsonTokenId.ID_START_OBJECT:
             // 30-Sep-2020, tatu: New! "Scalar from Object" (mostly for XML)
             return _fromString(p, ctxt,

diff --git a/src/main/java/tools/jackson/datatype/joda/deser/DateTimeZoneDeserializer.java b/src/main/java/tools/jackson/datatype/joda/deser/DateTimeZoneDeserializer.java
@@ -26,7 +26,7 @@ public DateTimeZone deserialize(JsonParser p, DeserializationContext ctxt)
             // for fun let's allow use of offsets...
             return _fromOffset(ctxt, p.getIntValue());
         case JsonTokenId.ID_STRING:
-            return _fromString(p, ctxt, p.getText());
+            return _fromString(p, ctxt, p.getString());
         case JsonTokenId.ID_START_OBJECT:
             // 30-Sep-2020, tatu: New! "Scalar from Object" (mostly for XML)
             return _fromString(p, ctxt,

diff --git a/src/main/java/tools/jackson/datatype/joda/deser/DurationDeserializer.java b/src/main/java/tools/jackson/datatype/joda/deser/DurationDeserializer.java
@@ -40,7 +40,7 @@ public Duration deserialize(JsonParser p, DeserializationContext ctxt)
         case JsonTokenId.ID_NUMBER_INT: // assume it's millisecond count
             return _fromTimestamp(ctxt, p.getLongValue());
         case JsonTokenId.ID_STRING:
-            return _fromString(p, ctxt, p.getText());
+            return _fromString(p, ctxt, p.getString());
         case JsonTokenId.ID_START_OBJECT:
             // 30-Sep-2020, tatu: New! "Scalar from Object" (mostly for XML)
             return _fromString(p, ctxt,

diff --git a/src/main/java/tools/jackson/datatype/joda/deser/InstantDeserializer.java b/src/main/java/tools/jackson/datatype/joda/deser/InstantDeserializer.java
@@ -37,7 +37,7 @@ public Instant deserialize(JsonParser p, DeserializationContext ctxt)
         case JsonTokenId.ID_NUMBER_INT:
             return _fromTimestamp(ctxt, p.getLongValue());
         case JsonTokenId.ID_STRING:
-            return _fromString(p, ctxt, p.getText());
+            return _fromString(p, ctxt, p.getString());
         case JsonTokenId.ID_START_OBJECT:
             // 30-Sep-2020, tatu: New! "Scalar from Object" (mostly for XML)
             return _fromString(p, ctxt,

diff --git a/src/main/java/tools/jackson/datatype/joda/deser/IntervalDeserializer.java b/src/main/java/tools/jackson/datatype/joda/deser/IntervalDeserializer.java
@@ -32,7 +32,7 @@ public Interval 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/src/main/java/tools/jackson/datatype/joda/deser/LocalDateDeserializer.java b/src/main/java/tools/jackson/datatype/joda/deser/LocalDateDeserializer.java
@@ -37,7 +37,7 @@ public LocalDate deserialize(JsonParser p, DeserializationContext ctxt)
         case JsonTokenId.ID_NUMBER_INT:
             return _fromTimestamp(ctxt, p.getLongValue());
         case JsonTokenId.ID_STRING:
-            return _fromString(p, ctxt, p.getText());
+            return _fromString(p, ctxt, p.getString());
         case JsonTokenId.ID_START_OBJECT:
             return _fromString(p, ctxt,
                     ctxt.extractScalarFromObject(p, this, handledType()));

diff --git a/src/main/java/tools/jackson/datatype/joda/deser/LocalDateTimeDeserializer.java b/src/main/java/tools/jackson/datatype/joda/deser/LocalDateTimeDeserializer.java
@@ -33,7 +33,7 @@ public LocalDateTime deserialize(JsonParser p, DeserializationContext ctxt)
         case JsonTokenId.ID_NUMBER_INT:
             return _fromTimestamp(ctxt, p.getLongValue());
         case JsonTokenId.ID_STRING:
-            return _fromString(p, ctxt, p.getText());
+            return _fromString(p, ctxt, p.getString());
         case JsonTokenId.ID_START_OBJECT:
             return _fromString(p, ctxt,
                     ctxt.extractScalarFromObject(p, this, handledType()));

diff --git a/src/main/java/tools/jackson/datatype/joda/deser/LocalTimeDeserializer.java b/src/main/java/tools/jackson/datatype/joda/deser/LocalTimeDeserializer.java
@@ -36,7 +36,7 @@ public LocalTime deserialize(JsonParser p, DeserializationContext ctxt)
         case JsonTokenId.ID_NUMBER_INT:
             return new LocalTime(p.getLongValue());            
         case JsonTokenId.ID_STRING:
-            return _fromString(p, ctxt, p.getText());
+            return _fromString(p, ctxt, p.getString());
         case JsonTokenId.ID_START_OBJECT:
             return _fromString(p, ctxt,
                     ctxt.extractScalarFromObject(p, this, handledType()));

diff --git a/src/main/java/tools/jackson/datatype/joda/deser/MonthDayDeserializer.java b/src/main/java/tools/jackson/datatype/joda/deser/MonthDayDeserializer.java
@@ -35,7 +35,7 @@ public MonthDay deserialize(final JsonParser p, final DeserializationContext ctx
         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/src/main/java/tools/jackson/datatype/joda/deser/PeriodDeserializer.java b/src/main/java/tools/jackson/datatype/joda/deser/PeriodDeserializer.java
@@ -36,7 +36,7 @@ public ReadablePeriod deserialize(JsonParser p, DeserializationContext ctxt)
     {
         JsonToken t = p.currentToken();
         if (t == JsonToken.VALUE_STRING) {
-            return _fromString(p, ctxt, p.getText());
+            return _fromString(p, ctxt, p.getString());
         }
         if (t == JsonToken.VALUE_NUMBER_INT) {
             return new Period(p.getLongValue());    
@@ -73,8 +73,8 @@ protected ReadablePeriod _fromObject(final JsonParser p, final DeserializationCo
         //   if we ever hit that.
 
         JsonNode treeNode = p.readValueAsTree();
-        String periodType = treeNode.path("fieldType").path("name").asText();
-        String periodName = treeNode.path("periodType").path("name").asText();
+        String periodType = treeNode.path("fieldType").path("name").asString();
+        String periodName = treeNode.path("periodType").path("name").asString();
         // any "weird" numbers we should worry about?
         int periodValue = treeNode.path(periodType).asInt();
 

diff --git a/src/main/java/tools/jackson/datatype/joda/deser/YearMonthDeserializer.java b/src/main/java/tools/jackson/datatype/joda/deser/YearMonthDeserializer.java
@@ -34,7 +34,7 @@ public YearMonth deserialize(final JsonParser p, final DeserializationContext ct
         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()) {