Merge branch '2.6.x' into 2.7.x

Closes gh-33226

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/JsonComponentModuleTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.jackson.types.Name;
+import org.springframework.boot.jackson.types.NameAndAge;
+import org.springframework.boot.jackson.types.NameAndCareer;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 import static org.assertj.core.api.Assertions.assertThat;

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/JsonMixinModuleTests.java

@@ -30,6 +30,8 @@ import org.springframework.boot.jackson.scan.a.RenameMixInClass;
 import org.springframework.boot.jackson.scan.b.RenameMixInAbstractClass;
 import org.springframework.boot.jackson.scan.c.RenameMixInInterface;
 import org.springframework.boot.jackson.scan.d.EmptyMixInClass;
+import org.springframework.boot.jackson.types.Name;
+import org.springframework.boot.jackson.types.NameAndAge;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.util.ClassUtils;
 

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/JsonObjectDeserializerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@ import com.fasterxml.jackson.databind.node.NullNode;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.jackson.NameAndAgeJsonComponent.Deserializer;
+import org.springframework.boot.jackson.types.NameAndAge;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/JsonObjectSerializerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ import com.fasterxml.jackson.databind.module.SimpleModule;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.jackson.NameAndAgeJsonComponent.Serializer;
+import org.springframework.boot.jackson.types.NameAndAge;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/NameAndAgeJsonComponent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,8 @@ import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.SerializerProvider;
 
+import org.springframework.boot.jackson.types.NameAndAge;
+
 /**
  * Sample {@link JsonComponent @JsonComponent} used for tests.
  *

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/NameAndAgeJsonKeyComponent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,8 @@ import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.KeyDeserializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 
+import org.springframework.boot.jackson.types.NameAndAge;
+
 /**
  * Sample {@link JsonComponent @JsonComponent} used for tests.
  *

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/NameAndCareerJsonComponent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,9 @@ import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.SerializerProvider;
 
+import org.springframework.boot.jackson.types.Name;
+import org.springframework.boot.jackson.types.NameAndCareer;
+
 /**
  * Sample {@link JsonComponent @JsonComponent} used for tests.
  *

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/scan/a/RenameMixInClass.java

@@ -19,8 +19,8 @@ package org.springframework.boot.jackson.scan.a;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import org.springframework.boot.jackson.JsonMixin;
-import org.springframework.boot.jackson.Name;
-import org.springframework.boot.jackson.NameAndAge;
+import org.springframework.boot.jackson.types.Name;
+import org.springframework.boot.jackson.types.NameAndAge;
 
 @JsonMixin(type = { Name.class, NameAndAge.class })
 public class RenameMixInClass {

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/scan/b/RenameMixInAbstractClass.java

@@ -19,7 +19,7 @@ package org.springframework.boot.jackson.scan.b;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import org.springframework.boot.jackson.JsonMixin;
-import org.springframework.boot.jackson.NameAndAge;
+import org.springframework.boot.jackson.types.NameAndAge;
 
 @JsonMixin(type = NameAndAge.class)
 public abstract class RenameMixInAbstractClass {

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/scan/c/RenameMixInInterface.java

@@ -19,7 +19,7 @@ package org.springframework.boot.jackson.scan.c;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import org.springframework.boot.jackson.JsonMixin;
-import org.springframework.boot.jackson.NameAndAge;
+import org.springframework.boot.jackson.types.NameAndAge;
 
 @JsonMixin(type = NameAndAge.class)
 public interface RenameMixInInterface {

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/scan/d/EmptyMixInClass.java

@@ -17,8 +17,8 @@
 package org.springframework.boot.jackson.scan.d;
 
 import org.springframework.boot.jackson.JsonMixin;
-import org.springframework.boot.jackson.Name;
-import org.springframework.boot.jackson.NameAndAge;
+import org.springframework.boot.jackson.types.Name;
+import org.springframework.boot.jackson.types.NameAndAge;
 
 @JsonMixin(type = { Name.class, NameAndAge.class })
 public class EmptyMixInClass {

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/types/Name.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jackson;
+package org.springframework.boot.jackson.types;
 
 /**
  * Sample object used for tests.

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/types/NameAndAge.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jackson;
+package org.springframework.boot.jackson.types;
 
 import org.springframework.util.ObjectUtils;
 

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/types/NameAndCareer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jackson;
+package org.springframework.boot.jackson.types;
 
 /**
  * Sample object used for tests.