Merge branch '2.18' into 2.19

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/databind/objectid/Employee.java

@@ -0,0 +1,36 @@
+package com.fasterxml.jackson.databind.objectid;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.JsonIdentityReference;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+
+// Value class used by ObjectId tests
+@JsonIdentityInfo(property="id",
+        generator=ObjectIdGenerators.PropertyGenerator.class)
+public class Employee {
+    public int id;
+
+    public String name;
+
+    @JsonIdentityReference(alwaysAsId=true)
+    public Employee manager;
+
+    @JsonIdentityReference(alwaysAsId=true)
+    public List<Employee> reports;
+
+    public Employee() { }
+    public Employee(int id, String name, Employee manager) {
+        this.id = id;
+        this.name = name;
+        this.manager = manager;
+        reports = new ArrayList<Employee>();
+    }
+
+    public Employee addReport(Employee e) {
+        reports.add(e);
+        return this;
+    }
+}

src/test/java/com/fasterxml/jackson/databind/objectid/TestObjectId.java

@@ -68,33 +68,6 @@ public void add(Employee e) {
         }
     }
 
-    @JsonIdentityInfo(property="id",
-            generator=ObjectIdGenerators.PropertyGenerator.class)
-    public static class Employee {
-        public int id;
-
-        public String name;
-
-        @JsonIdentityReference(alwaysAsId=true)
-        public Employee manager;
-
-        @JsonIdentityReference(alwaysAsId=true)
-        public List<Employee> reports;
-
-        public Employee() { }
-        public Employee(int id, String name, Employee manager) {
-            this.id = id;
-            this.name = name;
-            this.manager = manager;
-            reports = new ArrayList<Employee>();
-        }
-
-        public Employee addReport(Employee e) {
-            reports.add(e);
-            return this;
-        }
-    }
-
     @JsonIdentityInfo(generator=ObjectIdGenerators.IntSequenceGenerator.class, property="@id")
     @JsonTypeInfo(use=JsonTypeInfo.Id.CLASS, include=JsonTypeInfo.As.PROPERTY, property="@class")
     public static class BaseEntity {  }

src/test/java/com/fasterxml/jackson/databind/objectid/TestObjectIdDeserialization.java

@@ -22,7 +22,6 @@
 import com.fasterxml.jackson.databind.deser.UnresolvedForwardReference;
 import com.fasterxml.jackson.databind.deser.UnresolvedId;
 import com.fasterxml.jackson.databind.objectid.TestObjectId.Company;
-import com.fasterxml.jackson.databind.objectid.TestObjectId.Employee;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
 
 import static org.junit.jupiter.api.Assertions.*;

src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdDeserializationFailTest.java

@@ -8,7 +8,7 @@
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.objectid.TestObjectId.Employee;
+import com.fasterxml.jackson.databind.objectid.Employee;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
 import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 import com.fasterxml.jackson.databind.tofix.ObjectIdDeserializationFailTest.EnumMapCompany.FooEnum;