GH-80 Support inherited fields (Resolve #80)

dzikoysk · Aug 9, 2021 · 9fdc393 · 9fdc393
1 parent acbf23b
commit 9fdc393
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/cdn-kt/pom.xml b/cdn-kt/pom.xml
@@ -31,6 +31,7 @@
 
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
     <dependencies>

diff --git a/cdn/src/main/java/net/dzikoysk/cdn/CdnDeserializer.java b/cdn/src/main/java/net/dzikoysk/cdn/CdnDeserializer.java
@@ -47,7 +47,7 @@ public T deserialize(Class<T> scheme, Section content) throws Exception {
     }
 
     private Object deserialize(Object instance, Section root) throws Exception {
-        for (Field field : instance.getClass().getDeclaredFields()) {
+        for (Field field : instance.getClass().getFields()) {
             if (CdnUtils.isIgnored(field)) {
                 continue;
             }

diff --git a/cdn/src/main/java/net/dzikoysk/cdn/CdnSerializer.java b/cdn/src/main/java/net/dzikoysk/cdn/CdnSerializer.java
@@ -50,7 +50,7 @@ public Configuration serialize(Object entity) {
     public Section serialize(Section root, Object entity) throws Exception {
         Class<?> scheme = entity.getClass();
 
-        for (Field field : scheme.getDeclaredFields()) {
+        for (Field field : scheme.getFields()) {
             if (CdnUtils.isIgnored(field)) {
                 continue;
             }

diff --git a/cdn/src/test/groovy/net/dzikoysk/cdn/TestConfiguration.groovy b/cdn/src/test/groovy/net/dzikoysk/cdn/TestConfiguration.groovy
@@ -30,10 +30,7 @@ class TestConfiguration {
     @Description(['', '// Section description'])
     public @Contextual SectionConfiguration section = new SectionConfiguration()
 
-    static class SectionConfiguration {
-
-        @Description('# Random value')
-        public Integer subEntry = -1
+    static class ParentSectionConfiguration {
 
         @Description('# List description')
         public List<String> list = [ 'record', 'record : with : semicolons' ]
@@ -47,4 +44,11 @@ class TestConfiguration {
 
     }
 
+    static class SectionConfiguration extends ParentSectionConfiguration {
+
+        @Description('# Random value')
+        public Integer subEntry = -1
+
+    }
+
 }