♻️ NullSerializerProvider保留原默认行为，下游代码无需因此添加配置

ballcat-projects · Apr 12, 2024 · 82a159b · 82a159b
1 parent a8180cb
commit 82a159b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/...cat-common-core/src/main/java/org/ballcat/common/core/jackson/NullSerializerProvider.java b/...cat-common-core/src/main/java/org/ballcat/common/core/jackson/NullSerializerProvider.java
@@ -47,11 +47,11 @@ public class NullSerializerProvider extends DefaultSerializerProvider {
 
 	private static final long serialVersionUID = 1L;
 
-	private boolean writeNullStringValuesAsQuotes = false;
+	private boolean writeNullStringValuesAsQuotes = true;
 
-	private boolean writeNullMapValuesAsBraces = false;
+	private boolean writeNullMapValuesAsBraces = true;
 
-	private boolean writeNullArrayValuesAsBrackets = false;
+	private boolean writeNullArrayValuesAsBrackets = true;
 
 	public NullSerializerProvider() {
 		super();

diff --git a/...b/src/main/java/org/ballcat/autoconfigure/web/jackson/CustomJacksonAutoConfiguration.java b/...b/src/main/java/org/ballcat/autoconfigure/web/jackson/CustomJacksonAutoConfiguration.java
@@ -49,14 +49,12 @@ public Jackson2ObjectMapperBuilderCustomizer jsonCustomizer() {
 		return builder -> {
 			if (null != this.jacksonProperties.getSerialization()) {
 				JacksonProperties.Serialization serialization = this.jacksonProperties.getSerialization();
-				final boolean writeNullStringValuesAsQuotes = serialization.isWriteNullStringValuesAsQuotes();
-				final boolean writeNullMapValuesAsBraces = serialization.isWriteNullMapValuesAsBraces();
-				final boolean writeNullArrayValuesAsBrackets = serialization.isWriteNullArrayValuesAsBrackets();
-
 				final NullSerializerProvider nullSerializerProvider = new NullSerializerProvider();
-				nullSerializerProvider.setWriteNullStringValuesAsQuotes(writeNullStringValuesAsQuotes);
-				nullSerializerProvider.setWriteNullMapValuesAsBraces(writeNullMapValuesAsBraces);
-				nullSerializerProvider.setWriteNullArrayValuesAsBrackets(writeNullArrayValuesAsBrackets);
+				nullSerializerProvider
+					.setWriteNullStringValuesAsQuotes(serialization.isWriteNullStringValuesAsQuotes());
+				nullSerializerProvider.setWriteNullMapValuesAsBraces(serialization.isWriteNullMapValuesAsBraces());
+				nullSerializerProvider
+					.setWriteNullArrayValuesAsBrackets(serialization.isWriteNullArrayValuesAsBrackets());
 				builder.postConfigurer(c -> c.setSerializerProvider(nullSerializerProvider));
 			}
 		};

diff --git a/...ot-starter-web/src/main/java/org/ballcat/autoconfigure/web/jackson/JacksonProperties.java b/...ot-starter-web/src/main/java/org/ballcat/autoconfigure/web/jackson/JacksonProperties.java
@@ -42,17 +42,17 @@ public static class Serialization {
 		/**
 		 * null string -> ""
 		 */
-		private boolean writeNullStringValuesAsQuotes = false;
+		private boolean writeNullStringValuesAsQuotes = true;
 
 		/**
 		 * null map -> {}
 		 */
-		private boolean writeNullMapValuesAsBraces = false;
+		private boolean writeNullMapValuesAsBraces = true;
 
 		/**
 		 * null array -> []
 		 */
-		private boolean writeNullArrayValuesAsBrackets = false;
+		private boolean writeNullArrayValuesAsBrackets = true;
 
 	}