Merge branch '2.18' into textbuffer-double-float-parse

Author: pjfanning

.github/workflows/main.yml

@@ -4,15 +4,15 @@ on:
     branches:
     - master
     - "3.0"
-    - "2.17"
+    - "2.18"
     paths-ignore:
     - "README.md"
     - "release-notes/*"
   pull_request:
     branches:
     - master
     - "3.0"
-    - "2.17"
+    - "2.18"
     paths-ignore:
     - "README.md"
     - "release-notes/*"
@@ -30,9 +30,9 @@ jobs:
     env:
       JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
     steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+    - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - name: Set up JDK
-      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
+      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java_version }}
@@ -63,7 +63,7 @@ jobs:
       run: ./mvnw -B -q -ff -ntp test
     - name: Publish code coverage
       if: github.event_name != 'pull_request' && matrix.java_version == '8'
-      uses: codecov/codecov-action@0cfda1dd0a4ad9efc75517f399d859cd1ea4ced1 # v4.0.2
+      uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # v4.1.0
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         file: ./target/site/jacoco/jacoco.xml

.github/workflows/release.yml

@@ -28,9 +28,9 @@ jobs:
       - name: Validate version name
         run: |
           [[ "$TAG" =~ jackson-core-[0-9]+\.[0-9]+\.[0-9]+(-rc[0-9]+)? ]] || exit 1
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
       - name: Set up JDK
-        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
+        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: "temurin"
           java-version: "8"
@@ -75,7 +75,7 @@ jobs:
       actions: read # To read the workflow path.
       id-token: write # To sign the provenance.
       contents: write # To add assets to a release.
-    uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v1.9.0
+    uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v1.10.0
     with:
       base64-subjects: "${{ needs.release.outputs.hash }}"
       provenance-name: "${{ needs.release.outputs.artifact_name }}.jar.intoto.jsonl"

.github/workflows/scorecard.yml

@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           persist-credentials: false
 
@@ -60,6 +60,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
+        uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
         with:
           sarif_file: results.sarif

pom.xml

@@ -8,12 +8,12 @@
   <parent>
     <groupId>com.fasterxml.jackson</groupId>
     <artifactId>jackson-base</artifactId>
-    <version>2.17.0-SNAPSHOT</version>
+    <version>2.18.0-SNAPSHOT</version>
   </parent>
   <groupId>com.fasterxml.jackson.core</groupId>
   <artifactId>jackson-core</artifactId>
   <name>Jackson-core</name>
-  <version>2.17.0-SNAPSHOT</version>
+  <version>2.18.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <description>Core Jackson processing abstractions (aka Streaming API), implementation for JSON</description>
   <licenses>

release-notes/VERSION-2.x

@@ -14,7 +14,16 @@ a pure JSON library.
 === Releases ===
 ------------------------------------------------------------------------
 
-2.17.0-rc1 (26-Feb-2024)
+2.18.0 (not yet released)
+
+-
+
+2.17.1 (not yet released)
+
+#1241: Fix `NumberInput.looksLikeValidNumber()` implementation
+ (contributed by @pjfanning)
+
+2.17.0 (12-Mar-2024)
 
 #507: Add `JsonWriteFeature.ESCAPE_FORWARD_SLASHES` to allow escaping of '/' for
   String values
@@ -51,9 +60,9 @@ a pure JSON library.
 #1218: Simplify Unicode surrogate pair conversion for generation
  (contributed by @xtonik)
 
-2.16.2 (not yet released)
+2.16.2 (09-Mar-2024)
 
--
+No changes since 2.16.1
 
 2.16.1 (24-Dec-2023)
 

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

@@ -1769,15 +1769,30 @@ public Object getNumberValueDeferred() throws IOException {
      * {@link JsonToken#VALUE_NUMBER_FLOAT}, returns
      * one of {@link NumberTypeFP} constants; otherwise returns
      * {@link NumberTypeFP#UNKNOWN}.
+     *<p>
+     * Default implementation as of Jackson 2.x will call {@link #getNumberType()}
+     * and translate types -- this needs to be overriden actual implementations
+     * if this is not sufficient (which it usually is not for textual formats).
      *
-     * @return Type of current number, if parser points to numeric token; {@code null} otherwise
+     * @return Type of current floating-point number, if parser points to numeric token;
+     *   {@link NumberTypeFP#UNKNOWN} otherwise.
      *
      * @throws IOException for low-level read issues, or
      *   {@link JsonParseException} for decoding problems
      *
      * @since 2.17
      */
     public NumberTypeFP getNumberTypeFP() throws IOException {
+        NumberType nt = getNumberType();
+        if (nt == NumberType.BIG_DECIMAL) {
+            return NumberTypeFP.BIG_DECIMAL;
+        }
+        if (nt == NumberType.DOUBLE) {
+            return NumberTypeFP.DOUBLE64;
+        }
+        if (nt == NumberType.FLOAT) {
+            return NumberTypeFP.FLOAT32;
+        }
         return NumberTypeFP.UNKNOWN;
     }
 

src/main/java/com/fasterxml/jackson/core/io/NumberInput.java

@@ -39,7 +39,7 @@ public final class NumberInput
      * @since 2.17
      */
     private final static Pattern PATTERN_FLOAT = Pattern.compile(
-          "[+-]?[0-9]+(\\.[0-9]+)?([eE][+-]?[0-9]+)?");
+          "[+-]?[0-9]*[\\.]?[0-9]+([eE][+-]?[0-9]+)?");
 
     /**
      * Fast method for parsing unsigned integers that are known to fit into
@@ -622,6 +622,9 @@ public static BigInteger parseBigIntegerWithRadix(final String s, final int radi
      *<p>
      * Note: no trimming ({@code String.trim()}) nor null checks are performed
      * on String passed.
+     *<p>
+     * Note: this method returning {@code true} DOES NOT GUARANTEE String is valid
+     * number but just that it looks close enough.
      *
      * @param s String to validate
      *
@@ -630,6 +633,14 @@ public static BigInteger parseBigIntegerWithRadix(final String s, final int radi
      * @since 2.17
      */
     public static boolean looksLikeValidNumber(final String s) {
-        return (s != null) && PATTERN_FLOAT.matcher(s).matches();
+        // While PATTERN_FLOAT handles most cases we can optimize some simple ones:
+        if (s == null || s.isEmpty()) {
+            return false;
+        }
+        if (s.length() == 1) {
+            char c = s.charAt(0);
+            return (c <= '9') && (c >= '0');
+        }
+        return PATTERN_FLOAT.matcher(s).matches();
     }
 }

src/main/java/com/fasterxml/jackson/core/json/JsonParserBase.java

@@ -1,6 +1,9 @@
 package com.fasterxml.jackson.core.json;
 
+import java.io.IOException;
+
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.JsonParser.NumberTypeFP;
 import com.fasterxml.jackson.core.base.ParserBase;
 import com.fasterxml.jackson.core.io.CharTypes;
 import com.fasterxml.jackson.core.io.IOContext;
@@ -80,6 +83,25 @@ public final JacksonFeatureSet<StreamReadCapability> getReadCapabilities() {
         return JSON_READ_CAPABILITIES;
     }
 
+    /*
+    /**********************************************************************
+    /* Overrides
+    /**********************************************************************
+     */
+
+    /**
+     * JSON format does not have native information on "correct" floating-point
+     * type to use, unlike some formats (most binary formats), so it needs to
+     * indicate this as {@link NumberTypeFP#UNKNOWN}.
+     *
+     * @return Natural floating-point type if known; {@link NumberTypeFP#UNKNOWN} for
+     *    all JSON-backed parsers.
+     */
+    @Override // added in 2.17
+    public NumberTypeFP getNumberTypeFP() throws IOException {
+        return NumberTypeFP.UNKNOWN;
+    }
+
     /*
     /**********************************************************************
     /* Location handling