Skip to content

Commit

Permalink
Merge branch '2.19'
Browse files Browse the repository at this point in the history
  • Loading branch information
cowtowncoder committed Jan 30, 2025
2 parents 9e5dd4b + cefd4f1 commit dc30b92
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public void testUnknownClassAsSubtype() throws Exception
ObjectReader reader = MAPPER.readerFor(BaseUnknownWrapper.class)
.without(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE);
BaseUnknownWrapper w = reader.readValue(a2q
("{'value':{'clazz':'com.foobar.Nothing'}}'"));
("{'value':{'clazz':'com.foobar.Nothing'}}"));
assertNotNull(w);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ public void testUnknownClassAsSubtype() throws Exception
.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, false)
.build();
BaseWrapper w = mapper.readValue(a2q
("{'value':{'clazz':'com.foobar.Nothing'}}'"),
("{'value':{'clazz':'com.foobar.Nothing'}}"),
BaseWrapper.class);
assertNotNull(w);
assertNull(w.value);
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/tools/jackson/databind/misc/TestBlocking.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package tools.jackson.databind.misc;

import java.io.*;
import java.io.IOException;

import org.junit.jupiter.api.Test;

Expand All @@ -24,7 +24,7 @@ public class TestBlocking
* quite yet.
*/
@Test
public void testEagerAdvance() throws IOException
public void testEagerAdvance() throws Exception
{
ObjectMapper mapper = jsonMapperBuilder()
.disable(DeserializationFeature.FAIL_ON_TRAILING_TOKENS)
Expand Down

0 comments on commit dc30b92

Please sign in to comment.