fix InclusionTest

pjfanning · pjfanning · commit dd66085737db · 2025-10-18T07:41:21.000+01:00
diff --git a/hibernate4/src/test/java/tools/jackson/datatype/hibernate4/BaseTest.java b/hibernate4/src/test/java/tools/jackson/datatype/hibernate4/BaseTest.java
@@ -3,21 +3,27 @@
 import java.util.Arrays;
 
 import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
 
 import static org.junit.jupiter.api.Assertions.fail;
 
 public abstract class BaseTest
 {
     protected BaseTest() { }
 
+    protected JsonMapper.Builder mapperBuilderWithModule(boolean forceLazyLoading)
+    {
+        return JsonMapper.builder().addModule(hibernateModule(forceLazyLoading, false));
+    }
+
     protected ObjectMapper mapperWithModule(boolean forceLazyLoading)
     {
-        return new ObjectMapper().registerModule(hibernateModule(forceLazyLoading, false));
+        return mapperBuilderWithModule(forceLazyLoading).build();
     }
 
     protected ObjectMapper mapperWithModule(boolean forceLazyLoading, boolean nullMissingEntities)
     {
-        return new ObjectMapper().registerModule(hibernateModule(forceLazyLoading, nullMissingEntities));
+        return JsonMapper.builder().addModule(hibernateModule(forceLazyLoading, nullMissingEntities)).build();
     }
 
     protected Hibernate4Module hibernateModule(boolean forceLazyLoading) {
diff --git a/hibernate4/src/test/java/tools/jackson/datatype/hibernate4/InclusionTest.java b/hibernate4/src/test/java/tools/jackson/datatype/hibernate4/InclusionTest.java
@@ -21,8 +21,9 @@ static class Mock
     @Test
     public void testInclusion() throws Exception
     {
-        final ObjectMapper mapper = mapperWithModule(false);
-        mapper.setSerializationInclusion(Include.NON_EMPTY);
+        final JsonMapper.Builder builder = mapperBuilderWithModule(false);
+        builder.changeDefaultPropertyInclusion(inc -> inc.withValueInclusion(Include.NON_EMPTY));
+        ObjectMapper mapper = builder.build();
         String json = mapper.writeValueAsString(new Mock());
         assertEquals("{\"id\":13}", json);
     }
diff --git a/hibernate5-jakarta/src/test/java/tools/jackson/datatype/hibernate5/jakarta/BaseTest.java b/hibernate5-jakarta/src/test/java/tools/jackson/datatype/hibernate5/jakarta/BaseTest.java
@@ -5,6 +5,7 @@
 import org.apache.log4j.Logger;
 
 import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
 
 import static org.junit.jupiter.api.Assertions.fail;
 
@@ -20,19 +21,24 @@ protected BaseTest() {
 	}
     }
 
+    protected JsonMapper.Builder mapperBuilderWithModule(boolean forceLazyLoading)
+    {
+        return JsonMapper.builder().addModule(hibernateModule(forceLazyLoading, false));
+    }
+
     protected ObjectMapper mapperWithModule(boolean forceLazyLoading)
     {
-        return new ObjectMapper().registerModule(hibernateModule(forceLazyLoading, false));
+        return mapperBuilderWithModule(forceLazyLoading).build();
     }
 
     protected ObjectMapper mapperWithModule(boolean forceLazyLoading, boolean nullMissingEntities)
     {
-        return new ObjectMapper().registerModule(hibernateModule(forceLazyLoading, nullMissingEntities));
+        return JsonMapper.builder().addModule(hibernateModule(forceLazyLoading, nullMissingEntities)).build();
     }
     
     protected Hibernate5JakartaModule hibernateModule(boolean forceLazyLoading)
     {
-        return  hibernateModule(forceLazyLoading, false);
+        return hibernateModule(forceLazyLoading, false);
     }
 
     protected Hibernate5JakartaModule hibernateModule(boolean forceLazyLoading, boolean nullMissingEntities)
diff --git a/hibernate5-jakarta/src/test/java/tools/jackson/datatype/hibernate5/jakarta/InclusionTest.java b/hibernate5-jakarta/src/test/java/tools/jackson/datatype/hibernate5/jakarta/InclusionTest.java
@@ -21,8 +21,9 @@ static class Mock
     @Test
     public void testInclusion() throws Exception
     {
-        final ObjectMapper mapper = mapperWithModule(false);
-        mapper.setSerializationInclusion(Include.NON_EMPTY);
+        final JsonMapper.Builder builder = mapperBuilderWithModule(false);
+        builder.changeDefaultPropertyInclusion(inc -> inc.withValueInclusion(Include.NON_EMPTY));
+        ObjectMapper mapper = builder.build();
         String json = mapper.writeValueAsString(new Mock());
         assertEquals("{\"id\":13}", json);
     }
diff --git a/hibernate5/src/test/java/tools/jackson/datatype/hibernate5/BaseTest.java b/hibernate5/src/test/java/tools/jackson/datatype/hibernate5/BaseTest.java
@@ -5,6 +5,7 @@
 import org.apache.log4j.Logger;
 
 import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
 
 import static org.junit.jupiter.api.Assertions.fail;
 
@@ -20,14 +21,19 @@ protected BaseTest() {
 	}
     }
 
+    protected JsonMapper.Builder mapperBuilderWithModule(boolean forceLazyLoading)
+    {
+        return JsonMapper.builder().addModule(hibernateModule(forceLazyLoading, false));
+    }
+
     protected ObjectMapper mapperWithModule(boolean forceLazyLoading)
     {
-        return new ObjectMapper().registerModule(hibernateModule(forceLazyLoading, false));
+        return mapperBuilderWithModule(forceLazyLoading).build();
     }
 
     protected ObjectMapper mapperWithModule(boolean forceLazyLoading, boolean nullMissingEntities)
     {
-        return new ObjectMapper().registerModule(hibernateModule(forceLazyLoading, nullMissingEntities));
+        return JsonMapper.builder().addModule(hibernateModule(forceLazyLoading, nullMissingEntities)).build();
     }
     
     protected Hibernate5Module hibernateModule(boolean forceLazyLoading)
diff --git a/hibernate5/src/test/java/tools/jackson/datatype/hibernate5/InclusionTest.java b/hibernate5/src/test/java/tools/jackson/datatype/hibernate5/InclusionTest.java
@@ -21,8 +21,9 @@ static class Mock
     @Test
     public void testInclusion() throws Exception
     {
-        final ObjectMapper mapper = mapperWithModule(false);
-        mapper.setSerializationInclusion(Include.NON_EMPTY);
+        final JsonMapper.Builder builder = mapperBuilderWithModule(false);
+        builder.changeDefaultPropertyInclusion(inc -> inc.withValueInclusion(Include.NON_EMPTY));
+        ObjectMapper mapper = builder.build();
         String json = mapper.writeValueAsString(new Mock());
         assertEquals("{\"id\":13}", json);
     }
diff --git a/hibernate6/src/test/java/tools/jackson/datatype/hibernate6/BaseTest.java b/hibernate6/src/test/java/tools/jackson/datatype/hibernate6/BaseTest.java
@@ -20,9 +20,14 @@ protected BaseTest() {
         }
     }
 
+    protected JsonMapper.Builder mapperBuilderWithModule(boolean forceLazyLoading)
+    {
+        return JsonMapper.builder().addModule(hibernateModule(forceLazyLoading, false));
+    }
+
     protected ObjectMapper mapperWithModule(boolean forceLazyLoading)
     {
-        return JsonMapper.builder().addModule(hibernateModule(forceLazyLoading, false)).build();
+        return mapperBuilderWithModule(forceLazyLoading).build();
     }
 
     protected ObjectMapper mapperWithModule(boolean forceLazyLoading, boolean nullMissingEntities)
@@ -32,7 +37,7 @@ protected ObjectMapper mapperWithModule(boolean forceLazyLoading, boolean nullMi
     
     protected Hibernate6Module hibernateModule(boolean forceLazyLoading)
     {
-        return  hibernateModule(forceLazyLoading, false);
+        return hibernateModule(forceLazyLoading, false);
     }
 
     protected Hibernate6Module hibernateModule(boolean forceLazyLoading, boolean nullMissingEntities)
diff --git a/hibernate6/src/test/java/tools/jackson/datatype/hibernate6/InclusionTest.java b/hibernate6/src/test/java/tools/jackson/datatype/hibernate6/InclusionTest.java
@@ -21,8 +21,9 @@ static class Mock
     @Test
     public void testInclusion() throws Exception
     {
-        final ObjectMapper mapper = mapperWithModule(false);
-        mapper.setSerializationInclusion(Include.NON_EMPTY);
+        final JsonMapper.Builder builder = mapperBuilderWithModule(false);
+        builder.changeDefaultPropertyInclusion(inc -> inc.withValueInclusion(Include.NON_EMPTY));
+        ObjectMapper mapper = builder.build();
         String json = mapper.writeValueAsString(new Mock());
         assertEquals("{\"id\":13}", json);
     }
diff --git a/hibernate7/src/test/java/tools/jackson/datatype/hibernate7/BaseTest.java b/hibernate7/src/test/java/tools/jackson/datatype/hibernate7/BaseTest.java
@@ -20,9 +20,14 @@ protected BaseTest() {
         }
     }
 
+    protected JsonMapper.Builder mapperBuilderWithModule(boolean forceLazyLoading)
+    {
+        return JsonMapper.builder().addModule(hibernateModule(forceLazyLoading, false));
+    }
+
     protected ObjectMapper mapperWithModule(boolean forceLazyLoading)
     {
-        return JsonMapper.builder().addModule(hibernateModule(forceLazyLoading, false)).build();
+        return mapperBuilderWithModule(forceLazyLoading).build();
     }
 
     protected ObjectMapper mapperWithModule(boolean forceLazyLoading, boolean nullMissingEntities)
diff --git a/hibernate7/src/test/java/tools/jackson/datatype/hibernate7/InclusionTest.java b/hibernate7/src/test/java/tools/jackson/datatype/hibernate7/InclusionTest.java
@@ -6,6 +6,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -21,9 +22,9 @@ static class Mock
     @Test
     public void testInclusion() throws Exception
     {
-        final ObjectMapper mapper = mapperWithModule(false);
-        //TODO: enable when issue is fixed
-        //mapper.setSerializationInclusion(Include.NON_EMPTY);
+        final JsonMapper.Builder builder = mapperBuilderWithModule(false);
+        builder.changeDefaultPropertyInclusion(inc -> inc.withValueInclusion(Include.NON_EMPTY));
+        ObjectMapper mapper = builder.build();
         String json = mapper.writeValueAsString(new Mock());
         assertEquals("{\"id\":13}", json);
     }

Original file line number	Diff line number	Diff line change
`@@ -3,21 +3,27 @@`
`3`	`3`	`import java.util.Arrays;`
`4`	`4`
`5`	`5`	`import tools.jackson.databind.ObjectMapper;`
	`6`	`+import tools.jackson.databind.json.JsonMapper;`
`6`	`7`
`7`	`8`	`import static org.junit.jupiter.api.Assertions.fail;`
`8`	`9`
`9`	`10`	`public abstract class BaseTest`
`10`	`11`	`{`
`11`	`12`	`protected BaseTest() { }`
`12`	`13`
	`14`	`+ protected JsonMapper.Builder mapperBuilderWithModule(boolean forceLazyLoading)`
	`15`	`+ {`
	`16`	`+ return JsonMapper.builder().addModule(hibernateModule(forceLazyLoading, false));`
	`17`	`+ }`
	`18`	`+`
`13`	`19`	`protected ObjectMapper mapperWithModule(boolean forceLazyLoading)`
`14`	`20`	`{`
`15`		`- return new ObjectMapper().registerModule(hibernateModule(forceLazyLoading, false));`
	`21`	`+ return mapperBuilderWithModule(forceLazyLoading).build();`
`16`	`22`	`}`
`17`	`23`
`18`	`24`	`protected ObjectMapper mapperWithModule(boolean forceLazyLoading, boolean nullMissingEntities)`
`19`	`25`	`{`
`20`		`- return new ObjectMapper().registerModule(hibernateModule(forceLazyLoading, nullMissingEntities));`
	`26`	`+ return JsonMapper.builder().addModule(hibernateModule(forceLazyLoading, nullMissingEntities)).build();`
`21`	`27`	`}`
`22`	`28`
`23`	`29`	`protected Hibernate4Module hibernateModule(boolean forceLazyLoading) {`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,9 @@ static class Mock`
`21`	`21`	`@Test`
`22`	`22`	`public void testInclusion() throws Exception`
`23`	`23`	`{`
`24`		`- final ObjectMapper mapper = mapperWithModule(false);`
`25`		`- mapper.setSerializationInclusion(Include.NON_EMPTY);`
	`24`	`+ final JsonMapper.Builder builder = mapperBuilderWithModule(false);`
	`25`	`+ builder.changeDefaultPropertyInclusion(inc -> inc.withValueInclusion(Include.NON_EMPTY));`
	`26`	`+ ObjectMapper mapper = builder.build();`
`26`	`27`	`String json = mapper.writeValueAsString(new Mock());`
`27`	`28`	`assertEquals("{\"id\":13}", json);`
`28`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`import org.apache.log4j.Logger;`
`6`	`6`
`7`	`7`	`import tools.jackson.databind.ObjectMapper;`
	`8`	`+import tools.jackson.databind.json.JsonMapper;`
`8`	`9`
`9`	`10`	`import static org.junit.jupiter.api.Assertions.fail;`
`10`	`11`
`@@ -20,19 +21,24 @@ protected BaseTest() {`
`20`	`21`	`}`
`21`	`22`	`}`
`22`	`23`
	`24`	`+ protected JsonMapper.Builder mapperBuilderWithModule(boolean forceLazyLoading)`
	`25`	`+ {`
	`26`	`+ return JsonMapper.builder().addModule(hibernateModule(forceLazyLoading, false));`
	`27`	`+ }`
	`28`	`+`
`23`	`29`	`protected ObjectMapper mapperWithModule(boolean forceLazyLoading)`
`24`	`30`	`{`
`25`		`- return new ObjectMapper().registerModule(hibernateModule(forceLazyLoading, false));`
	`31`	`+ return mapperBuilderWithModule(forceLazyLoading).build();`
`26`	`32`	`}`
`27`	`33`
`28`	`34`	`protected ObjectMapper mapperWithModule(boolean forceLazyLoading, boolean nullMissingEntities)`
`29`	`35`	`{`
`30`		`- return new ObjectMapper().registerModule(hibernateModule(forceLazyLoading, nullMissingEntities));`
	`36`	`+ return JsonMapper.builder().addModule(hibernateModule(forceLazyLoading, nullMissingEntities)).build();`
`31`	`37`	`}`
`32`	`38`
`33`	`39`	`protected Hibernate5JakartaModule hibernateModule(boolean forceLazyLoading)`
`34`	`40`	`{`
`35`		`- return hibernateModule(forceLazyLoading, false);`
	`41`	`+ return hibernateModule(forceLazyLoading, false);`
`36`	`42`	`}`
`37`	`43`
`38`	`44`	`protected Hibernate5JakartaModule hibernateModule(boolean forceLazyLoading, boolean nullMissingEntities)`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,14 @@ protected BaseTest() {`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
	`23`	`+ protected JsonMapper.Builder mapperBuilderWithModule(boolean forceLazyLoading)`
	`24`	`+ {`
	`25`	`+ return JsonMapper.builder().addModule(hibernateModule(forceLazyLoading, false));`
	`26`	`+ }`
	`27`	`+`
`23`	`28`	`protected ObjectMapper mapperWithModule(boolean forceLazyLoading)`
`24`	`29`	`{`
`25`		`- return JsonMapper.builder().addModule(hibernateModule(forceLazyLoading, false)).build();`
	`30`	`+ return mapperBuilderWithModule(forceLazyLoading).build();`
`26`	`31`	`}`
`27`	`32`
`28`	`33`	`protected ObjectMapper mapperWithModule(boolean forceLazyLoading, boolean nullMissingEntities)`
`@@ -32,7 +37,7 @@ protected ObjectMapper mapperWithModule(boolean forceLazyLoading, boolean nullMi`
`32`	`37`
`33`	`38`	`protected Hibernate6Module hibernateModule(boolean forceLazyLoading)`
`34`	`39`	`{`
`35`		`- return hibernateModule(forceLazyLoading, false);`
	`40`	`+ return hibernateModule(forceLazyLoading, false);`
`36`	`41`	`}`
`37`	`42`
`38`	`43`	`protected Hibernate6Module hibernateModule(boolean forceLazyLoading, boolean nullMissingEntities)`