File tree Expand file tree Collapse file tree 1 file changed +9
-5
lines changed
src/main/java/org/javawebstack/validator Expand file tree Collapse file tree 1 file changed +9
-5
lines changed Original file line number Diff line number Diff line change 11package org .javawebstack .validator ;
22
3- import com .google .gson .annotations .SerializedName ;
43import org .javawebstack .abstractdata .AbstractArray ;
54import org .javawebstack .abstractdata .AbstractElement ;
65import org .javawebstack .abstractdata .AbstractMapper ;
76import org .javawebstack .abstractdata .AbstractNull ;
7+ import org .javawebstack .abstractdata .mapper .MapperTypeSpec ;
8+ import org .javawebstack .abstractdata .mapper .annotation .MapperOptions ;
89import org .javawebstack .validator .rule .*;
910
1011import 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 {
You can’t perform that action at this time.
0 commit comments