Skip to content

Commit 80c09d9

Browse files
committed
Fixed the compilation error by replacing @SerializedName with the new MapperTypeSpec
1 parent 9efe575 commit 80c09d9

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

src/main/java/org/javawebstack/validator/Validator.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package org.javawebstack.validator;
22

3-
import com.google.gson.annotations.SerializedName;
43
import org.javawebstack.abstractdata.AbstractArray;
54
import org.javawebstack.abstractdata.AbstractElement;
65
import org.javawebstack.abstractdata.AbstractMapper;
76
import org.javawebstack.abstractdata.AbstractNull;
7+
import org.javawebstack.abstractdata.mapper.MapperTypeSpec;
8+
import org.javawebstack.abstractdata.mapper.annotation.MapperOptions;
89
import org.javawebstack.validator.rule.*;
910

1011
import java.lang.annotation.Annotation;
@@ -277,10 +278,13 @@ private static String toSnakeCase(String source) {
277278
}
278279

279280
private static String getFieldName(Field field) {
280-
SerializedName[] serializedNames = field.getAnnotationsByType(SerializedName.class);
281-
if (serializedNames.length > 0)
282-
return serializedNames[0].value();
283-
return toSnakeCase(field.getName());
281+
MapperTypeSpec typeSpec = MapperTypeSpec.get(field.getDeclaringClass());
282+
if(typeSpec == null)
283+
return toSnakeCase(field.getName());
284+
MapperTypeSpec.FieldSpec fieldSpec = typeSpec.getFieldSpecs().stream().filter(f -> f.getField().equals(field)).findFirst().orElse(null);
285+
if(fieldSpec == null || fieldSpec.getField() == null)
286+
return toSnakeCase(field.getName());
287+
return fieldSpec.getName();
284288
}
285289

286290
private static class ValidationConfig {

0 commit comments

Comments
 (0)