Merge branch '2.7.x'

This commit is contained in:
Andy Wilkinson
2022-03-25 13:34:37 +00:00
12 changed files with 35 additions and 32 deletions

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.docs.web.servlet.springmvc.json;
package org.springframework.boot.docs.features.json.jackson.customserializersanddeserializers;
import java.io.IOException;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.docs.web.servlet.springmvc.json;
package org.springframework.boot.docs.features.json.jackson.customserializersanddeserializers;
class MyObject {

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.docs.web.servlet.springmvc.json.object;
package org.springframework.boot.docs.features.json.jackson.customserializersanddeserializers.object;
import java.io.IOException;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.docs.web.servlet.springmvc.json.object;
package org.springframework.boot.docs.features.json.jackson.customserializersanddeserializers.object;
class MyObject {

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.docs.web.servlet.springmvc.json
package org.springframework.boot.docs.features.json.jackson.customserializersanddeserializers
import com.fasterxml.jackson.core.JsonGenerator
import com.fasterxml.jackson.core.JsonParser

View File

@@ -14,6 +14,6 @@
* limitations under the License.
*/
package org.springframework.boot.docs.web.servlet.springmvc.json
package org.springframework.boot.docs.features.json.jackson.customserializersanddeserializers
class MyObject(val name: String = "", val age: Int = 0)

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.docs.web.servlet.springmvc.json.`object`
package org.springframework.boot.docs.features.json.jackson.customserializersanddeserializers.`object`
import com.fasterxml.jackson.core.JsonGenerator
import com.fasterxml.jackson.core.JsonParser

View File

@@ -14,6 +14,6 @@
* limitations under the License.
*/
package org.springframework.boot.docs.web.servlet.springmvc.json.`object`
package org.springframework.boot.docs.features.json.jackson.customserializersanddeserializers.`object`
class MyObject(val name: String = "", val age: Int = 0)