Enable inherited config class

hogelog · Sep 20, 2014 · 67b8844 · 67b8844
1 parent 7e72857
commit 67b8844
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 6 deletions.
diff --git a/src/main/java/org/hogel/config/annotation/Attribute.java b/src/main/java/org/hogel/config/annotation/Attribute.java
@@ -4,10 +4,12 @@
 import org.hogel.config.loader.BasicAttributeLoader;
 
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+@Inherited
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Attribute {

diff --git a/src/main/java/org/hogel/config/annotation/BooleanDefaultValue.java b/src/main/java/org/hogel/config/annotation/BooleanDefaultValue.java
@@ -1,10 +1,12 @@
 package org.hogel.config.annotation;
 
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+@Inherited
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface BooleanDefaultValue {

diff --git a/src/main/java/org/hogel/config/annotation/DoubleDefaultValue.java b/src/main/java/org/hogel/config/annotation/DoubleDefaultValue.java
@@ -1,10 +1,12 @@
 package org.hogel.config.annotation;
 
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+@Inherited
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface DoubleDefaultValue {

diff --git a/src/main/java/org/hogel/config/annotation/IntDefaultValue.java b/src/main/java/org/hogel/config/annotation/IntDefaultValue.java
@@ -1,10 +1,12 @@
 package org.hogel.config.annotation;
 
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+@Inherited
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface IntDefaultValue {

diff --git a/src/main/java/org/hogel/config/annotation/LongDefaultValue.java b/src/main/java/org/hogel/config/annotation/LongDefaultValue.java
@@ -1,10 +1,12 @@
 package org.hogel.config.annotation;
 
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+@Inherited
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface LongDefaultValue {

diff --git a/src/main/java/org/hogel/config/annotation/StringDefaultValue.java b/src/main/java/org/hogel/config/annotation/StringDefaultValue.java
@@ -1,10 +1,12 @@
 package org.hogel.config.annotation;
 
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+@Inherited
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface StringDefaultValue {

diff --git a/src/main/java/org/hogel/config/loader/BasicConfigLoader.java b/src/main/java/org/hogel/config/loader/BasicConfigLoader.java
@@ -6,7 +6,9 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 public class BasicConfigLoader implements ConfigLoader<Config> {
@@ -19,7 +21,7 @@ public void load(Config config, Object source) throws InvalidConfigException {
         }
 
         Class<? extends Config> klass = config.getClass();
-        Field[] fields = klass.getDeclaredFields();
+        List<Field> fields = getConfigFields(klass);
         try {
             for (Field field : fields) {
                 loadFieldValue(config, field, configMap);
@@ -29,6 +31,19 @@ public void load(Config config, Object source) throws InvalidConfigException {
         }
     }
 
+    private List<Field> getConfigFields(Class<? extends Config> configClass) {
+        List<Field> configFields = new ArrayList<>();
+        Class klass = configClass;
+        do {
+            Field[] fields = klass.getDeclaredFields();
+            for (Field field : fields) {
+                configFields.add(field);
+            }
+            klass = klass.getSuperclass();
+        } while (Config.class != klass);
+        return configFields;
+    }
+
     private void loadFieldValue(Config config, Field field, Map<String, Object> configMap) throws IllegalAccessException, InvalidConfigException {
         Annotation[] annotations = field.getAnnotations();
         Attribute attributeAnnotation = field.getAnnotation(Attribute.class);

diff --git a/src/test/java/org/hogel/config/InheritedSampleConfig.java b/src/test/java/org/hogel/config/InheritedSampleConfig.java
@@ -0,0 +1,4 @@
+package org.hogel.config;
+
+public class InheritedSampleConfig extends SampleConfig {
+}
diff --git a/src/test/java/org/hogel/config/InheritedSampleConfigTest.java b/src/test/java/org/hogel/config/InheritedSampleConfigTest.java
@@ -0,0 +1,22 @@
+package org.hogel.config;
+
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+public class InheritedSampleConfigTest extends ConfigTestCase {
+    @Test
+    public void loadDefaultInheritedValue() throws Exception {
+        InheritedSampleConfig sampleConfig = new InheritedSampleConfig();
+        sampleConfig.load(testConfigPath("empty.yaml"));
+
+        assertThat(sampleConfig.getTimeout(), is(1000));
+        assertThat(sampleConfig.getMark(), is(200_000L));
+        assertThat(sampleConfig.getSalt(), is("salt"));
+        assertThat(sampleConfig.isAbortOnFail(), is(true));
+        assertThat(sampleConfig.getNanika(), is(1800.0));
+        assertThat(sampleConfig.getIgnore(), is("ignore"));
+    }
+
+}
diff --git a/src/test/java/org/hogel/config/SampleConfig.java b/src/test/java/org/hogel/config/SampleConfig.java
@@ -7,8 +7,6 @@
 import org.hogel.config.annotation.LongDefaultValue;
 import org.hogel.config.annotation.StringDefaultValue;
 
-import java.io.IOException;
-
 public class SampleConfig extends Config {
     @Attribute
     @IntDefaultValue(1000)
@@ -32,9 +30,6 @@ public class SampleConfig extends Config {
 
     private String ignore = "ignore";
 
-    public SampleConfig() throws IOException, InvalidConfigException {
-    }
-
     public int getTimeout() {
         return timeout;
     }