Merge branch '2.18'

FasterXML · Apr 27, 2024 · 20204ed · 20204ed
2 parents f0fd4b7 + a359144
commit 20204ed
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 38 deletions.
diff --git a/src/test/java/tools/jackson/core/JDKSerializabilityTest.java b/src/test/java/tools/jackson/core/JDKSerializabilityTest.java
@@ -12,8 +12,6 @@
 import tools.jackson.core.util.JsonRecyclerPools;
 import tools.jackson.core.util.RecyclerPool;
 
-import static com.fasterxml.jackson.core.util.JdkSerializationTestUtils.jdkDeserialize;
-import static com.fasterxml.jackson.core.util.JdkSerializationTestUtils.jdkSerialize;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**

diff --git a/src/test/java/tools/jackson/core/JUnit5TestBase.java b/src/test/java/tools/jackson/core/JUnit5TestBase.java
@@ -415,6 +415,12 @@ protected int[] calcQuads(byte[] wordBytes) {
         return result;
     }
 
+    /*
+    /**********************************************************************
+    /* Content reading, serialization
+    /**********************************************************************
+     */
+
     public static byte[] readResource(String ref)
     {
        ByteArrayOutputStream bytes = new ByteArrayOutputStream();
@@ -437,4 +443,28 @@ public static byte[] readResource(String ref)
        }
        return bytes.toByteArray();
     }
+
+    public static byte[] jdkSerialize(Object o) throws IOException
+    {
+        ByteArrayOutputStream bytes = new ByteArrayOutputStream(1000);
+        ObjectOutputStream obOut = new ObjectOutputStream(bytes);
+        obOut.writeObject(o);
+        obOut.close();
+        return bytes.toByteArray();
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> T jdkDeserialize(byte[] raw) throws IOException
+    {
+        ObjectInputStream objIn = new ObjectInputStream(new ByteArrayInputStream(raw));
+        try {
+            return (T) objIn.readObject();
+        } catch (ClassNotFoundException e) {
+            fail("Missing class: "+e.getMessage());
+            return null;
+        } finally {
+            objIn.close();
+        }
+    }
+
 }
diff --git a/src/test/java/tools/jackson/core/util/JdkSerializationTestUtils.java b/src/test/java/tools/jackson/core/util/JdkSerializationTestUtils.java
diff --git a/src/test/java/tools/jackson/core/util/TestSerializedString.java b/src/test/java/tools/jackson/core/util/TestSerializedString.java
@@ -10,8 +10,6 @@
 import tools.jackson.core.io.SerializedString;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static tools.jackson.core.util.JdkSerializationTestUtils.jdkDeserialize;
-import static tools.jackson.core.util.JdkSerializationTestUtils.jdkSerialize;
 
 /**
  * Simple unit tests to try to verify that the default