Merge branch '2.12'

sp4ce · Jun 9, 2020 · 0debe99 · 0debe99
2 parents 4f49262 + bbbf41f
commit 0debe99
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/...kson/databind/deser/MiscCoercionTest.java → ...atabind/convert/CoerceContainersTest.java b/...kson/databind/deser/MiscCoercionTest.java → ...atabind/convert/CoerceContainersTest.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.deser;
+package com.fasterxml.jackson.databind.convert;
 
 import java.util.*;
 
@@ -8,7 +8,7 @@
 import com.fasterxml.jackson.databind.cfg.CoercionAction;
 import com.fasterxml.jackson.databind.cfg.CoercionInputShape;
 
-public class MiscCoercionTest extends BaseMapTest
+public class CoerceContainersTest extends BaseMapTest
 {
     private final String JSON_EMPTY = quote("");
 

diff --git a/...n/databind/struct/ScalarCoercionTest.java → ...atabind/convert/CoerceJDKScalarsTest.java b/...n/databind/struct/ScalarCoercionTest.java → ...atabind/convert/CoerceJDKScalarsTest.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.struct;
+package com.fasterxml.jackson.databind.convert;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -11,7 +11,7 @@
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 
-public class ScalarCoercionTest extends BaseMapTest
+public class CoerceJDKScalarsTest extends BaseMapTest
 {
     static class BooleanPOJO {
         public boolean value;

diff --git a/...kson/databind/deser/BeanCoercionTest.java → ...son/databind/convert/CoercePojosTest.java b/...kson/databind/deser/BeanCoercionTest.java → ...son/databind/convert/CoercePojosTest.java
@@ -1,18 +1,17 @@
-package com.fasterxml.jackson.databind.deser;
+package com.fasterxml.jackson.databind.convert;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.cfg.CoercionAction;
 import com.fasterxml.jackson.databind.cfg.CoercionInputShape;
 import com.fasterxml.jackson.databind.type.LogicalType;
 
-public class BeanCoercionTest extends BaseMapTest
+public class CoercePojosTest extends BaseMapTest
 {
     static class Bean {
         public String a;
     }
 
-
     private final ObjectMapper MAPPER = newJsonMapper();
 
     private final String JSON_EMPTY = quote("");