refactor: NumberJsonFormat移除simpleTypeSupport

livk-cloud · Dec 15, 2023 · 4172117 · 4172117
1 parent ee3304d
commit 4172117
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/...ng-extension-commons/src/main/java/com/livk/commons/jackson/support/NumberJsonFormat.java b/...ng-extension-commons/src/main/java/com/livk/commons/jackson/support/NumberJsonFormat.java
@@ -24,6 +24,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.text.DecimalFormat;
 
 /**
  * Number类型数据Jackson序列化处理注解
@@ -40,13 +41,8 @@
 	/**
 	 * 序列化表达式
 	 * @return the string
+	 * @see DecimalFormat#DecimalFormat(String)
 	 */
 	String pattern() default "#0.00";
 
-	/**
-	 * 是否支持基础类型
-	 * @return the boolean
-	 */
-	boolean simpleTypeSupport() default true;
-
 }
diff --git a/...xtension-commons/src/main/java/com/livk/commons/jackson/support/NumberJsonSerializer.java b/...xtension-commons/src/main/java/com/livk/commons/jackson/support/NumberJsonSerializer.java
@@ -28,8 +28,8 @@
 
 import java.io.IOException;
 import java.text.DecimalFormat;
-import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 
 /**
  * NumberJsonFormat序列化处理
@@ -41,8 +41,8 @@
 @NoArgsConstructor
 public class NumberJsonSerializer extends JsonSerializer<Number> implements ContextualSerializer {
 
-	private static final List<Class<?>> SUPPORT_PRIMITIVE_CLASS = List.of(byte.class, short.class, int.class,
-			long.class, float.class, double.class);
+	private static final Set<Class<?>> SUPPORT_PRIMITIVE_CLASS = Set.of(byte.class, short.class, int.class, long.class,
+			float.class, double.class);
 
 	private String format;
 
@@ -57,15 +57,14 @@ public JsonSerializer<?> createContextual(SerializerProvider prov, BeanProperty
 		Class<?> rawClass = property.getType().getRawClass();
 		NumberJsonFormat jsonFormat = Optional.ofNullable(property.getAnnotation((NumberJsonFormat.class)))
 			.orElse(property.getContextAnnotation(NumberJsonFormat.class));
-		if (Number.class.isAssignableFrom(rawClass)
-				|| this.simpleTypeSupport(jsonFormat.simpleTypeSupport(), rawClass)) {
+		if (Number.class.isAssignableFrom(rawClass) || this.simpleTypeSupport(rawClass)) {
 			return new NumberJsonSerializer(jsonFormat.pattern());
 		}
 		return prov.findValueSerializer(property.getType(), property);
 	}
 
-	private boolean simpleTypeSupport(boolean support, Class<?> rawClass) {
-		return support && rawClass.isPrimitive() && SUPPORT_PRIMITIVE_CLASS.contains(rawClass);
+	private boolean simpleTypeSupport(Class<?> rawClass) {
+		return rawClass.isPrimitive() && SUPPORT_PRIMITIVE_CLASS.contains(rawClass);
 	}
 
 }