Fix config eval in classes section, fixes #283

Author: adrienlauer

CHANGELOG.md

@@ -3,6 +3,7 @@
 * [chg] Move main entrypoint logic from `SeedMain.main()` to `Seed.launch()`, allowing custom main methods in addition to the built-in `SeedMain`. 
 * [chg] Upgrade Shiro to 1.7.1 (fixes CVE-2020-11989, CVE-2020-17510, CVE-2020-1957, CVE-2020-13933 and CVE-2019-12422).
 * [fix] Detection of color output under recent versions of IntelliJ.
+* [fix] Fix configuration evaluation (macros, functions, ...) in `classes` section (see https://github.com/seedstack/seed/issues/283).
 
 # Version 3.11.0 (2020-10-28)
 

core/src/main/java/org/seedstack/seed/core/internal/configuration/ClassConfigurationMapper.java

@@ -7,20 +7,28 @@
  */
 package org.seedstack.seed.core.internal.configuration;
 
-import static org.seedstack.shed.reflect.Types.rawClassOf;
-
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.Map;
+import org.seedstack.coffig.Coffig;
 import org.seedstack.coffig.TreeNode;
 import org.seedstack.coffig.spi.ConfigurationMapper;
 import org.seedstack.seed.ClassConfiguration;
 import org.seedstack.seed.SeedException;
 import org.seedstack.seed.core.internal.CoreErrorCode;
 
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.seedstack.shed.reflect.Types.rawClassOf;
+
 public class ClassConfigurationMapper implements ConfigurationMapper {
+    private Coffig coffig;
+
+    public void initialize(Coffig coffig) {
+        this.coffig = coffig;
+    }
+
     @Override
     public boolean canHandle(Type type) {
         if (type instanceof ParameterizedType) {
@@ -40,7 +48,7 @@ public Object map(TreeNode treeNode, Type type) {
             Map<String, String> result = new HashMap<>();
             treeNode.namedNodes()
                     .filter(namedNode -> isValueNode(namedNode.node()))
-                    .forEach(namedNode -> result.put(namedNode.name(), namedNode.node().value()));
+                    .forEach(namedNode -> result.put(namedNode.name(), (String) coffig.getMapper().map(namedNode.node(), String.class)));
             return ClassConfiguration.of(rawType, result);
         } else {
             throw SeedException.createNew(CoreErrorCode.INVALID_CLASS_CONFIGURATION)

core/src/test/java/org/seedstack/seed/core/ConfigurationIT.java

@@ -10,7 +10,9 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.inject.Injector;
+
 import javax.inject.Inject;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.seedstack.coffig.Coffig;
@@ -134,10 +136,11 @@ public void configuration_object_injection() {
     public void class_attributes_can_be_retrieved() {
         Application application = injector.getInstance(Application.class);
         ClassConfiguration<ConfigurationIT> configuration = application.getConfiguration(ConfigurationIT.class);
-        assertThat(configuration.keySet()).containsExactly("key1", "key2", "key3");
+        assertThat(configuration.keySet()).containsExactlyInAnyOrder("key1", "key2", "key3", "evalKey");
         assertThat(configuration.get("key1")).isEqualTo("value1");
         assertThat(configuration.get("key2")).isEqualTo("value2bis");
         assertThat(configuration.get("key3")).isEqualTo("value3");
+        assertThat(configuration.get("evalKey")).isEqualTo("VALUE");
     }
 
     @Test

core/src/test/resources/application.yaml

@@ -19,6 +19,7 @@ classes:
           ConfigurationIT:
             key2: value2bis
             key3: value3
+            evalKey: ${env.ABDKSKFZOALKCHKHJ:'VALUE'}
 logging:
   level: INFO
   file: