Remove JavaType as input argument from emulation (#160)

mincong-h · web-flow · commit d6675f7a28a0 · 2020-06-16T22:18:39.000+02:00
to avoid type casting
diff --git a/src/main/java/io/vavr/jackson/datatype/serialize/ArraySerializer.java b/src/main/java/io/vavr/jackson/datatype/serialize/ArraySerializer.java
@@ -31,12 +31,14 @@
 class ArraySerializer<T extends Value<?>> extends ValueSerializer<T> implements ContextualSerializer {
 
     private static final long serialVersionUID = 1L;
+    private final CollectionLikeType collectionType;
 
-    ArraySerializer(JavaType collectionType, BeanProperty property) {
+    ArraySerializer(CollectionLikeType collectionType, BeanProperty property) {
         super(collectionType, property);
+        this.collectionType = collectionType;
     }
 
-    ArraySerializer(JavaType collectionType) {
+    ArraySerializer(CollectionLikeType collectionType) {
         this(collectionType, null);
     }
 
@@ -47,7 +49,7 @@ class ArraySerializer<T extends Value<?>> extends ValueSerializer<T> implements
      * @param property the new bean property
      */
     ArraySerializer(ArraySerializer<T> origin, BeanProperty property) {
-        this(origin.type, property);
+        this(origin.collectionType, property);
     }
 
     @Override
@@ -56,9 +58,8 @@ Object toJavaObj(T value) throws IOException {
     }
 
     @Override
-    JavaType emulatedJavaType(JavaType type, TypeFactory typeFactory) {
-        CollectionLikeType collectionLikeType = (CollectionLikeType) type;
-        return typeFactory.constructCollectionType(ArrayList.class, collectionLikeType.getContentType());
+    JavaType emulatedJavaType(TypeFactory typeFactory) {
+        return typeFactory.constructCollectionType(ArrayList.class, collectionType.getContentType());
     }
 
     @Override
diff --git a/src/main/java/io/vavr/jackson/datatype/serialize/CharSeqSerializer.java b/src/main/java/io/vavr/jackson/datatype/serialize/CharSeqSerializer.java
@@ -40,7 +40,7 @@ Object toJavaObj(CharSeq value) throws IOException {
     }
 
     @Override
-    JavaType emulatedJavaType(JavaType type, TypeFactory typeFactory) {
+    JavaType emulatedJavaType(TypeFactory typeFactory) {
         return typeFactory.constructType(String.class);
     }
 
diff --git a/src/main/java/io/vavr/jackson/datatype/serialize/MapSerializer.java b/src/main/java/io/vavr/jackson/datatype/serialize/MapSerializer.java
@@ -31,13 +31,15 @@
 class MapSerializer extends ValueSerializer<Map<?, ?>> implements ContextualSerializer {
 
     private static final long serialVersionUID = 1L;
+    private final MapLikeType mapType;
 
-    MapSerializer(JavaType type, BeanProperty beanProperty) {
-        super(type, beanProperty);
+    MapSerializer(MapLikeType mapType, BeanProperty beanProperty) {
+        super(mapType, beanProperty);
+        this.mapType = mapType;
     }
 
-    MapSerializer(JavaType type) {
-        this(type, null);
+    MapSerializer(MapLikeType mapType) {
+        this(mapType, null);
     }
 
     @Override
@@ -46,9 +48,8 @@ Object toJavaObj(Map<?, ?> value) throws IOException {
     }
 
     @Override
-    JavaType emulatedJavaType(JavaType type, TypeFactory typeFactory) {
-        MapLikeType mapLikeType = (MapLikeType) type;
-        return typeFactory.constructMapType(LinkedHashMap.class, mapLikeType.getKeyType(), mapLikeType.getContentType());
+    JavaType emulatedJavaType(TypeFactory typeFactory) {
+        return typeFactory.constructMapType(LinkedHashMap.class, mapType.getKeyType(), mapType.getContentType());
     }
 
     @Override
@@ -61,6 +62,6 @@ public JsonSerializer<?> createContextual(SerializerProvider prov, BeanProperty
         if (property == beanProperty) {
             return this;
         }
-        return new MapSerializer(type, property);
+        return new MapSerializer(mapType, property);
     }
 }
diff --git a/src/main/java/io/vavr/jackson/datatype/serialize/MultimapSerializer.java b/src/main/java/io/vavr/jackson/datatype/serialize/MultimapSerializer.java
@@ -33,13 +33,15 @@
 class MultimapSerializer extends ValueSerializer<Multimap<?, ?>> implements ContextualSerializer {
 
     private static final long serialVersionUID = 1L;
+    private final MapLikeType mapType;
 
-    MultimapSerializer(JavaType type) {
-        this(type, null);
+    MultimapSerializer(MapLikeType mapType) {
+        this(mapType, null);
     }
 
-    MultimapSerializer(JavaType type, BeanProperty beanProperty) {
-        super(type, beanProperty);
+    MultimapSerializer(MapLikeType mapType, BeanProperty beanProperty) {
+        super(mapType, beanProperty);
+        this.mapType = mapType;
     }
 
     @Override
@@ -57,8 +59,7 @@ Object toJavaObj(Multimap<?, ?> value) throws IOException {
     }
 
     @Override
-    JavaType emulatedJavaType(JavaType type, TypeFactory typeFactory) {
-        MapLikeType mapType = (MapLikeType) type;
+    JavaType emulatedJavaType(TypeFactory typeFactory) {
         JavaType containerType = typeFactory.constructCollectionType(ArrayList.class, mapType.getContentType());
         return typeFactory.constructMapType(LinkedHashMap.class, mapType.getKeyType(), containerType);
     }
@@ -73,6 +74,6 @@ public JsonSerializer<?> createContextual(SerializerProvider prov, BeanProperty
         if (property == beanProperty) {
             return this;
         }
-        return new MultimapSerializer(type, property);
+        return new MultimapSerializer(mapType, property);
     }
 }
diff --git a/src/main/java/io/vavr/jackson/datatype/serialize/SerializableSerializer.java b/src/main/java/io/vavr/jackson/datatype/serialize/SerializableSerializer.java
@@ -43,7 +43,7 @@ Object toJavaObj(T value) throws IOException {
     }
 
     @Override
-    JavaType emulatedJavaType(JavaType type, TypeFactory typeFactory) {
+    JavaType emulatedJavaType(TypeFactory typeFactory) {
         return typeFactory.constructArrayType(byte.class);
     }
 
diff --git a/src/main/java/io/vavr/jackson/datatype/serialize/ValueSerializer.java b/src/main/java/io/vavr/jackson/datatype/serialize/ValueSerializer.java
@@ -48,7 +48,7 @@ abstract class ValueSerializer<T> extends StdSerializer<T> {
     }
 
     abstract Object toJavaObj(T value) throws IOException;
-    abstract JavaType emulatedJavaType(JavaType type, TypeFactory typeFactory);
+    abstract JavaType emulatedJavaType(TypeFactory typeFactory);
 
     @Override
     public void serialize(T value, JsonGenerator gen, SerializerProvider provider) throws IOException {
@@ -58,7 +58,7 @@ public void serialize(T value, JsonGenerator gen, SerializerProvider provider) t
         } else {
             JsonSerializer<Object> ser;
             try {
-                JavaType emulated = emulatedJavaType(type, provider.getTypeFactory());
+                JavaType emulated = emulatedJavaType(provider.getTypeFactory());
                 if (emulated.getRawClass() != Object.class) {
                     ser = provider.findTypedValueSerializer(emulated, true, beanProperty);
                 } else {

Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,14 @@`
`31`	`31`	`class ArraySerializer<T extends Value<?>> extends ValueSerializer<T> implements ContextualSerializer {`
`32`	`32`
`33`	`33`	`private static final long serialVersionUID = 1L;`
	`34`	`+ private final CollectionLikeType collectionType;`
`34`	`35`
`35`		`- ArraySerializer(JavaType collectionType, BeanProperty property) {`
	`36`	`+ ArraySerializer(CollectionLikeType collectionType, BeanProperty property) {`
`36`	`37`	`super(collectionType, property);`
	`38`	`+ this.collectionType = collectionType;`
`37`	`39`	`}`
`38`	`40`
`39`		`- ArraySerializer(JavaType collectionType) {`
	`41`	`+ ArraySerializer(CollectionLikeType collectionType) {`
`40`	`42`	`this(collectionType, null);`
`41`	`43`	`}`
`42`	`44`
`@@ -47,7 +49,7 @@ class ArraySerializer<T extends Value<?>> extends ValueSerializer<T> implements`
`47`	`49`	`* @param property the new bean property`
`48`	`50`	`*/`
`49`	`51`	`ArraySerializer(ArraySerializer<T> origin, BeanProperty property) {`
`50`		`- this(origin.type, property);`
	`52`	`+ this(origin.collectionType, property);`
`51`	`53`	`}`
`52`	`54`
`53`	`55`	`@Override`
`@@ -56,9 +58,8 @@ Object toJavaObj(T value) throws IOException {`
`56`	`58`	`}`
`57`	`59`
`58`	`60`	`@Override`
`59`		`- JavaType emulatedJavaType(JavaType type, TypeFactory typeFactory) {`
`60`		`- CollectionLikeType collectionLikeType = (CollectionLikeType) type;`
`61`		`- return typeFactory.constructCollectionType(ArrayList.class, collectionLikeType.getContentType());`
	`61`	`+ JavaType emulatedJavaType(TypeFactory typeFactory) {`
	`62`	`+ return typeFactory.constructCollectionType(ArrayList.class, collectionType.getContentType());`
`62`	`63`	`}`
`63`	`64`
`64`	`65`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ Object toJavaObj(CharSeq value) throws IOException {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@Override`
`43`		`- JavaType emulatedJavaType(JavaType type, TypeFactory typeFactory) {`
	`43`	`+ JavaType emulatedJavaType(TypeFactory typeFactory) {`
`44`	`44`	`return typeFactory.constructType(String.class);`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -31,13 +31,15 @@`
`31`	`31`	`class MapSerializer extends ValueSerializer<Map<?, ?>> implements ContextualSerializer {`
`32`	`32`
`33`	`33`	`private static final long serialVersionUID = 1L;`
	`34`	`+ private final MapLikeType mapType;`
`34`	`35`
`35`		`- MapSerializer(JavaType type, BeanProperty beanProperty) {`
`36`		`- super(type, beanProperty);`
	`36`	`+ MapSerializer(MapLikeType mapType, BeanProperty beanProperty) {`
	`37`	`+ super(mapType, beanProperty);`
	`38`	`+ this.mapType = mapType;`
`37`	`39`	`}`
`38`	`40`
`39`		`- MapSerializer(JavaType type) {`
`40`		`- this(type, null);`
	`41`	`+ MapSerializer(MapLikeType mapType) {`
	`42`	`+ this(mapType, null);`
`41`	`43`	`}`
`42`	`44`
`43`	`45`	`@Override`
`@@ -46,9 +48,8 @@ Object toJavaObj(Map<?, ?> value) throws IOException {`
`46`	`48`	`}`
`47`	`49`
`48`	`50`	`@Override`
`49`		`- JavaType emulatedJavaType(JavaType type, TypeFactory typeFactory) {`
`50`		`- MapLikeType mapLikeType = (MapLikeType) type;`
`51`		`- return typeFactory.constructMapType(LinkedHashMap.class, mapLikeType.getKeyType(), mapLikeType.getContentType());`
	`51`	`+ JavaType emulatedJavaType(TypeFactory typeFactory) {`
	`52`	`+ return typeFactory.constructMapType(LinkedHashMap.class, mapType.getKeyType(), mapType.getContentType());`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`@Override`
`@@ -61,6 +62,6 @@ public JsonSerializer<?> createContextual(SerializerProvider prov, BeanProperty`
`61`	`62`	`if (property == beanProperty) {`
`62`	`63`	`return this;`
`63`	`64`	`}`
`64`		`- return new MapSerializer(type, property);`
	`65`	`+ return new MapSerializer(mapType, property);`
`65`	`66`	`}`
`66`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,13 +33,15 @@`
`33`	`33`	`class MultimapSerializer extends ValueSerializer<Multimap<?, ?>> implements ContextualSerializer {`
`34`	`34`
`35`	`35`	`private static final long serialVersionUID = 1L;`
	`36`	`+ private final MapLikeType mapType;`
`36`	`37`
`37`		`- MultimapSerializer(JavaType type) {`
`38`		`- this(type, null);`
	`38`	`+ MultimapSerializer(MapLikeType mapType) {`
	`39`	`+ this(mapType, null);`
`39`	`40`	`}`
`40`	`41`
`41`		`- MultimapSerializer(JavaType type, BeanProperty beanProperty) {`
`42`		`- super(type, beanProperty);`
	`42`	`+ MultimapSerializer(MapLikeType mapType, BeanProperty beanProperty) {`
	`43`	`+ super(mapType, beanProperty);`
	`44`	`+ this.mapType = mapType;`
`43`	`45`	`}`
`44`	`46`
`45`	`47`	`@Override`
`@@ -57,8 +59,7 @@ Object toJavaObj(Multimap<?, ?> value) throws IOException {`
`57`	`59`	`}`
`58`	`60`
`59`	`61`	`@Override`
`60`		`- JavaType emulatedJavaType(JavaType type, TypeFactory typeFactory) {`
`61`		`- MapLikeType mapType = (MapLikeType) type;`
	`62`	`+ JavaType emulatedJavaType(TypeFactory typeFactory) {`
`62`	`63`	`JavaType containerType = typeFactory.constructCollectionType(ArrayList.class, mapType.getContentType());`
`63`	`64`	`return typeFactory.constructMapType(LinkedHashMap.class, mapType.getKeyType(), containerType);`
`64`	`65`	`}`
`@@ -73,6 +74,6 @@ public JsonSerializer<?> createContextual(SerializerProvider prov, BeanProperty`
`73`	`74`	`if (property == beanProperty) {`
`74`	`75`	`return this;`
`75`	`76`	`}`
`76`		`- return new MultimapSerializer(type, property);`
	`77`	`+ return new MultimapSerializer(mapType, property);`
`77`	`78`	`}`
`78`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ Object toJavaObj(T value) throws IOException {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`@Override`
`46`		`- JavaType emulatedJavaType(JavaType type, TypeFactory typeFactory) {`
	`46`	`+ JavaType emulatedJavaType(TypeFactory typeFactory) {`
`47`	`47`	`return typeFactory.constructArrayType(byte.class);`
`48`	`48`	`}`
`49`	`49`