Update FixedLength.java

g0ddest · Apr 29, 2024 · f001fd7 · f001fd7
1 parent 7544dfe
commit f001fd7
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/main/java/name/velikodniy/vitaliy/fixedlength/FixedLength.java b/src/main/java/name/velikodniy/vitaliy/fixedlength/FixedLength.java
@@ -53,7 +53,7 @@ private FixedFormatLine<T> classToLineDesc(final Class<? extends T> clazz) {
         if (annotation != null) {
             fixedFormatLine.startsWith = annotation.startsWith();
         }
-        for (Field field : clazz.getDeclaredFields()) {
+        for (Field field : getAllFields(clazz)) {
             FixedField fieldAnnotation = field.getDeclaredAnnotation(FixedField.class);
             if (fieldAnnotation == null) {
                 continue;
@@ -71,6 +71,17 @@ private FixedFormatLine<T> classToLineDesc(final Class<? extends T> clazz) {
         return fixedFormatLine;
     }
 
+    List<Field> getAllFields(final Class<?> clazz) {
+        if (clazz == null) {
+            return Collections.emptyList();
+        }
+
+        List<Field> result = new ArrayList<>(getAllFields(clazz.getSuperclass()));
+        List<Field> filteredFields = Arrays.stream(clazz.getDeclaredFields()).collect(Collectors.toList());
+        result.addAll(filteredFields);
+        return result;
+    }
+
     public FixedLength<T> registerLineType(final Class<? extends T> lineClass) {
         lineTypes.add(classToLineDesc(lineClass));
         return this;
@@ -306,7 +317,8 @@ public String format(List<T> lines) {
 
         for (T line : lines) {
 
-            Arrays.stream(line.getClass().getDeclaredFields())
+            getAllFields(line.getClass())
+                    .stream()
                     .filter(
                             f ->
                                     f.getAnnotation(FixedField.class) != null