Merge branch '2.x' into 3.x

Author: cowtowncoder

.github/workflows/dep_build_v2.yml

@@ -23,7 +23,7 @@ jobs:
       with:
         ref: 2.x
     - name: Set up JDK
-      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+      uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java_version }}

.github/workflows/dep_build_v3.yml

@@ -23,7 +23,7 @@ jobs:
       with:
         ref: 3.x
     - name: Set up JDK
-      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+      uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java_version }}

.github/workflows/main.yml

@@ -27,7 +27,7 @@ jobs:
     steps:
     - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
     - name: Set up JDK
-      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+      uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java_version }}
@@ -55,7 +55,7 @@ jobs:
       run: ./mvnw -B -q -ff -ntp test
     - name: Publish code coverage
       if: ${{ matrix.release_build && github.event_name != 'pull_request' }}
-      uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
+      uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         files: ./target/site/jacoco/jacoco.xml

smile/src/test/java/tools/jackson/dataformat/smile/gen/SmileGeneratorNumbersTest.java

@@ -153,7 +153,7 @@ public void testFloatUnusedBits() throws Exception
         assertArrayEquals(new byte[] {
                 0x08, 0x00, 0x00, 0x00, 0x00
         }, Arrays.copyOfRange(encoded, 1, encoded.length));
-}
+    }
 
     // [dataformats-binary#300]
     @Test
@@ -202,4 +202,46 @@ public void testNumbersAsString() throws Exception
         gen.close();
         assertEquals(10, out.toByteArray().length);
     }
+
+    // [dataformats-binary#608]
+    @Test
+    public void testFloat32FromSpecEncoding() throws Exception
+    {
+        final float f32 = 29.9510f;
+        assertEquals(0x41ef9ba6, Float.floatToIntBits(f32));
+
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try (SmileGenerator gen = smileGenerator(out, false)) {
+            gen.writeNumber(f32);
+        }
+        byte[] encoded = out.toByteArray();
+        assertEquals(6, encoded.length);
+        assertEquals(0x28, encoded[0]); // type byte, float
+
+        // From 0x80 0x00 0x00 0x00 (spread over 5 x 7bits)
+        assertArrayEquals(new byte[] {
+                0x04, 0x0f, 0x3e, 0x37, 0x26
+        }, Arrays.copyOfRange(encoded, 1, encoded.length));
+    }
+
+    // [dataformats-binary#608]
+    @Test
+    public void testDouble64FromSpecEncoding() throws Exception
+    {
+        final double d64 = -29.9510;
+        assertEquals(0xc03df374bc6a7efaL, Double.doubleToLongBits(d64));
+
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try (SmileGenerator gen = smileGenerator(out, false)) {
+            gen.writeNumber(d64);
+        }
+        byte[] encoded = out.toByteArray();
+        assertEquals(11, encoded.length);
+        assertEquals(0x29, encoded[0]); // type byte, float
+
+        // From 0x80 0x00 0x00 0x00 (spread over 5 x 7bits)
+        assertArrayEquals(new byte[] {
+                0x01, 0x40, 0x1e, 0x7c, 0x6e, 0x4b, 0x63, 0x29, 0x7d, 0x7a
+        }, Arrays.copyOfRange(encoded, 1, encoded.length));
+    }
 }

smile/src/test/java/tools/jackson/dataformat/smile/parse/SmileNumberParsingTest.java

@@ -215,7 +215,7 @@ public void testArrayWithInts() throws IOException
     }
 
     @Test
-    public void testFloats() throws IOException
+    public void testFloats() throws Exception
     {
         ByteArrayOutputStream bo = new ByteArrayOutputStream();
         SmileGenerator g = _smileGenerator(bo, false);
@@ -241,7 +241,7 @@ public void testFloats() throws IOException
     }
 
     @Test
-    public void testDoubles() throws IOException
+    public void testDoubles() throws Exception
     {
         ByteArrayOutputStream bo = new ByteArrayOutputStream();
         SmileGenerator g = _smileGenerator(bo, false);
@@ -266,6 +266,38 @@ public void testDoubles() throws IOException
         p.close();
     }
 
+    // [dataformats-binary#608]
+    @Test
+    public void testFloat32FromSpecEncoding() throws Exception {
+        final float f32 = 29.9510f;
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try (SmileGenerator gen = smileGenerator(out, false)) {
+            gen.writeNumber(f32);
+        }
+        try (SmileParser p = _smileParser(out.toByteArray())) {
+            assertToken(JsonToken.VALUE_NUMBER_FLOAT, p.nextToken());
+            assertEquals(JsonParser.NumberType.FLOAT, p.getNumberType());
+            assertEquals(f32, p.getFloatValue());
+            assertNull(p.nextToken());
+        }
+    }
+
+    // [dataformats-binary#608]
+    @Test
+    public void testDouble64FromSpecEncoding() throws Exception {
+        final double d64 = -29.9510;
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try (SmileGenerator gen = smileGenerator(out, false)) {
+            gen.writeNumber(d64);
+        }
+        try (SmileParser p = _smileParser(out.toByteArray())) {
+            assertToken(JsonToken.VALUE_NUMBER_FLOAT, p.nextToken());
+            assertEquals(JsonParser.NumberType.DOUBLE, p.getNumberType());
+            assertEquals(d64, p.getDoubleValue());
+            assertNull(p.nextToken());
+        }
+    }
+    
     @Test
     public void testArrayWithDoubles() throws IOException
     {