Merge pull request #14399 from Sebastien Deleuze

wilkinsona · wilkinsona · commit 7be8cd68255b · 2018-09-10T16:37:20.000+01:00
* gh-14399: Make standard JSON builder customiser classes package-private
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfiguration.java
@@ -62,7 +62,7 @@ public StandardGsonBuilderCustomizer standardGsonBuilderCustomizer(
 		return new StandardGsonBuilderCustomizer(gsonProperties);
 	}
 
-	private static final class StandardGsonBuilderCustomizer
+	static final class StandardGsonBuilderCustomizer
 			implements GsonBuilderCustomizer, Ordered {
 
 		private final GsonProperties properties;
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java
@@ -213,7 +213,7 @@ public StandardJackson2ObjectMapperBuilderCustomizer standardJacksonObjectMapper
 					jacksonProperties);
 		}
 
-		private static final class StandardJackson2ObjectMapperBuilderCustomizer
+		static final class StandardJackson2ObjectMapperBuilderCustomizer
 				implements Jackson2ObjectMapperBuilderCustomizer, Ordered {
 
 			private final ApplicationContext applicationContext;

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public StandardGsonBuilderCustomizer standardGsonBuilderCustomizer(`
`62`	`62`	`return new StandardGsonBuilderCustomizer(gsonProperties);`
`63`	`63`	`}`
`64`	`64`
`65`		`- private static final class StandardGsonBuilderCustomizer`
	`65`	`+ static final class StandardGsonBuilderCustomizer`
`66`	`66`	`implements GsonBuilderCustomizer, Ordered {`
`67`	`67`
`68`	`68`	`private final GsonProperties properties;`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ public StandardJackson2ObjectMapperBuilderCustomizer standardJacksonObjectMapper`
`213`	`213`	`jacksonProperties);`
`214`	`214`	`}`
`215`	`215`
`216`		`- private static final class StandardJackson2ObjectMapperBuilderCustomizer`
	`216`	`+ static final class StandardJackson2ObjectMapperBuilderCustomizer`
`217`	`217`	`implements Jackson2ObjectMapperBuilderCustomizer, Ordered {`
`218`	`218`
`219`	`219`	`private final ApplicationContext applicationContext;`