Merge branch '2.18' into 2.19

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -47,6 +47,12 @@ a pure JSON library.
  (requested by Ilenia S)
  (fixed by @pjfanning)
 
+2.18.5 (not yet released)
+
+#1433: `JsonParser#getNumberType()` throws `JsonParseException` when
+  the current token is non-numeric instead of returning null
+ (reported by @CrazySqueak)
+
 2.18.4 (06-May-2025)
 
 No changes since 2.18.3

src/main/java/com/fasterxml/jackson/core/JsonParser.java

@@ -1778,12 +1778,18 @@ public Object getNumberValueDeferred() throws IOException {
      * If current token is of type
      * {@link JsonToken#VALUE_NUMBER_INT} or
      * {@link JsonToken#VALUE_NUMBER_FLOAT}, returns
-     * one of {@link NumberType} constants; otherwise returns {@code null}.
+     * one of {@link NumberType} constants; otherwise throws
+     * a {@link JsonParseException}.
+     *<p>
+     * NOTE: before 2.18 was documented to return {@code null} for non-numeric
+     * tokens, but this has never been the case.
      *
-     * @return Type of current number, if parser points to numeric token; {@code null} otherwise
+     * @return Type of current number, if parser points to numeric token.
      *
-     * @throws IOException for low-level read issues, or
-     *   {@link JsonParseException} for decoding problems
+     * @throws IOException {@link JsonParseException} if
+     *    the current token is not numeric, or if decoding of the value fails
+     *    (invalid format for numbers); plain {@link IOException} if underlying
+     *    content read fails (possible if numbers are decoded lazily).
      */
     public abstract NumberType getNumberType() throws IOException;
 

src/test/java/com/fasterxml/jackson/core/read/NumberParsingTest.java

@@ -22,7 +22,7 @@
  */
 @SuppressWarnings("resource")
 class NumberParsingTest
-        extends JUnit5TestBase
+    extends JUnit5TestBase
 {
     protected JsonFactory jsonFactory() {
         return sharedStreamFactory();
@@ -33,7 +33,7 @@ protected JsonFactory jsonFactory() {
 
     /*
     /**********************************************************************
-    /* Tests, Boolean
+    /* Tests, Boolean (why here?)
     /**********************************************************************
      */