Merge branch '2.19' into fix4680

FasterXML · Oct 3, 2024 · d48f5f6 · d48f5f6
2 parents f58cdd6 + f562772
commit d48f5f6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -240,7 +240,7 @@ ObjectMapper mapper = ...;
 File jsonFile = new File("test.json");
 // note: method added in Jackson 2.11 (earlier would need to use
 // mapper.getFactory().createGenerator(...)
-JsonGenerator g = f.createGenerator(jsonFile, JsonEncoding.UTF8);
+JsonGenerator g = mapper.createGenerator(jsonFile, JsonEncoding.UTF8);
 // write JSON: { "message" : "Hello world!" }
 g.writeStartObject();
 g.writeStringField("message", "Hello world!");

diff --git a/...abind/tofix/UnwrappedCaching2461Test.java → ...bind/struct/UnwrappedCaching2461Test.java b/...abind/tofix/UnwrappedCaching2461Test.java → ...bind/struct/UnwrappedCaching2461Test.java
@@ -1,12 +1,11 @@
-package com.fasterxml.jackson.databind.tofix;
+package com.fasterxml.jackson.databind.struct;
 
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
-import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;