Merge branch '2.17'

FasterXML · Dec 5, 2023 · ec2a59e · ec2a59e
2 parents f3e86f1 + 6a125c3
commit ec2a59e
Showing 1 changed file with 57 additions and 57 deletions.
diff --git a/src/test/java/tools/jackson/dataformat/xml/lists/StringListRoundtripTest.java b/src/test/java/tools/jackson/dataformat/xml/lists/StringListRoundtripTest.java
@@ -18,34 +18,35 @@
 import static org.junit.Assert.assertNull;
 
 // [dataformat-xml#584]
-public class StringListRoundtripTest {
-	private final static String[] TEST_DATA = new String[] {"", "test", null, "test2"};
-
-	private final static XmlMapper MAPPER_READ_WRITE_NULLS = XmlMapper.builder()
-             .enable(PROCESS_XSI_NIL)
-             .enable(WRITE_NULLS_AS_XSI_NIL)
-             .build();
-     private final static XmlMapper MAPPER_READ_NULLS = XmlMapper.builder()
-             .enable(PROCESS_XSI_NIL)
-             .disable(WRITE_NULLS_AS_XSI_NIL)
-             .build();
-     private final static XmlMapper MAPPER_WRITE_NULLS = XmlMapper.builder()
-             .disable(PROCESS_XSI_NIL)
-             .enable(WRITE_NULLS_AS_XSI_NIL)
-             .build();
-
-     @Test
-	public void testStringArray() throws Exception
-	{
-		// default mode, should get back empty string
-		_stringArrayRoundtrip(MAPPER_READ_NULLS, false);
-
-		// xsi null enabled, should get back null
-		_stringArrayRoundtrip(MAPPER_READ_WRITE_NULLS, true);
-
-		// xsi null write enabled but processing disabled, should get back empty string
-		_stringArrayRoundtrip(MAPPER_WRITE_NULLS, false);
-	}
+public class StringListRoundtripTest
+{
+    private final static String[] TEST_DATA = new String[] {"", "test", null, "test2"};
+
+    private final static XmlMapper MAPPER_READ_WRITE_NULLS = XmlMapper.builder()
+            .enable(PROCESS_XSI_NIL)
+            .enable(WRITE_NULLS_AS_XSI_NIL)
+            .build();
+    private final static XmlMapper MAPPER_READ_NULLS = XmlMapper.builder()
+            .enable(PROCESS_XSI_NIL)
+            .disable(WRITE_NULLS_AS_XSI_NIL)
+            .build();
+    private final static XmlMapper MAPPER_WRITE_NULLS = XmlMapper.builder()
+            .disable(PROCESS_XSI_NIL)
+            .enable(WRITE_NULLS_AS_XSI_NIL)
+            .build();
+
+    @Test
+    public void testStringArray() throws Exception
+    {
+        // default mode, should get back empty string
+        _stringArrayRoundtrip(MAPPER_READ_NULLS, false);
+
+        // xsi null enabled, should get back null
+        _stringArrayRoundtrip(MAPPER_READ_WRITE_NULLS, true);
+
+        // xsi null write enabled but processing disabled, should get back empty string
+        _stringArrayRoundtrip(MAPPER_WRITE_NULLS, false);
+    }
 
 	private void _stringArrayRoundtrip(ObjectMapper mapper, boolean shouldBeNull) throws Exception
 	{
@@ -215,35 +216,34 @@ public void testStringMapPojo() throws Exception
 		_stringMapPojoRoundtrip(MAPPER_WRITE_NULLS, false);
 	}
 
-	private void _stringMapPojoRoundtrip(ObjectMapper mapper, boolean shouldBeNull) throws Exception
-	{
-		Map<String, String> map = new HashMap<String, String>() {{
-			put("a", "");
-			put("b", "test");
-			put("c", null);
-			put("d", "test2");
-		}};
-		MapPojo mapPojo = new MapPojo();
-		mapPojo.setMap(map);
-
-		// serialize to string
-		String xml = mapper.writeValueAsString(mapPojo);
-		assertNotNull(xml);
-
-		// then bring it back
-		MapPojo result = mapper.readValue(xml, MapPojo.class);
-		assertEquals(4, result.map.size());
-		assertEquals("", result.map.get("a"));
-		assertEquals("test", result.map.get("b"));
-		if (shouldBeNull)
-		{
-			assertNull(result.map.get("c"));
-		} else
-		{
-			assertEquals("", result.map.get("c"));
-		}
-		assertEquals("test2", result.map.get("d"));
-	}
+    private void _stringMapPojoRoundtrip(ObjectMapper mapper, boolean shouldBeNull) throws Exception
+    {
+        @SuppressWarnings("serial")
+        Map<String, String> map = new HashMap<String, String>() {{
+            put("a", "");
+            put("b", "test");
+            put("c", null);
+            put("d", "test2");
+        }};
+        MapPojo mapPojo = new MapPojo();
+        mapPojo.setMap(map);
+
+        // serialize to string
+        String xml = mapper.writeValueAsString(mapPojo);
+        assertNotNull(xml);
+
+        // then bring it back
+        MapPojo result = mapper.readValue(xml, MapPojo.class);
+        assertEquals(4, result.map.size());
+        assertEquals("", result.map.get("a"));
+        assertEquals("test", result.map.get("b"));
+        if (shouldBeNull) {
+            assertNull(result.map.get("c"));
+        } else {
+            assertEquals("", result.map.get("c"));
+        }
+        assertEquals("test2", result.map.get("d"));
+    }
 
 	static class MapPojo {
 		Map<String, String> map;