Remove conditionals config after reading it + add nested conditionals test

Author: mhawryluk

commons-spring/src/main/scala/com/avsystem/commons/spring/HoconBeanDefinitionReader.scala

@@ -346,22 +346,21 @@ class HoconBeanDefinitionReader(registry: BeanDefinitionRegistry)
 
   private def readConditionals(config: Config): Config = {
     if (!config.hasPath("conditionals")) config
-    else config.getList("conditionals").asScala.foldLeft(config)((currentConfig, conditionalObject) => {
+    else config.getList("conditionals").asScala.foldLeft(config.withoutPath("conditionals"))((currentConfig, conditionalObject) => {
       val props = getProps(conditionalObject.as[ConfigObject])
-      val newConfig = readConditionals(props("beans").as[Config])
 
       if (props.get("condition").map(_.unwrapped().asInstanceOf[Boolean]).exists(identity)) {
-        newConfig.withFallback(currentConfig)
+        readConditionals(props("beans").as[Config]).withFallback(currentConfig)
       } else {
         currentConfig
       }
     })
   }
 
-  def loadBeanDefinitions(config: Config): Int = {
-    val configWithConditionals = readConditionals(config)
-    val beans = if (configWithConditionals.hasPath("beans")) configWithConditionals.getObject("beans") else ConfigFactory.empty.root
-    val aliases = if (configWithConditionals.hasPath("aliases")) configWithConditionals.getObject("aliases") else ConfigFactory.empty.root
+  def loadBeanDefinitions(resourceConfig: Config): Int = {
+    val config = readConditionals(resourceConfig)
+    val beans = if (config.hasPath("beans")) config.getObject("beans") else ConfigFactory.empty.root
+    val aliases = if (config.hasPath("aliases")) config.getObject("aliases") else ConfigFactory.empty.root
     val result = readBeans(beans)
     readAliases(aliases)
     result

commons-spring/src/test/resources/conditionalsNested.conf

@@ -0,0 +1,20 @@
+featureFlag.enabled = true
+
+beans {
+  testBean {
+    %class = com.avsystem.commons.spring.TestBean
+  }
+}
+
+conditionals = [
+  {condition: ${featureFlag.enabled}, beans: {beans.testBean.int = 0}},
+  {condition: ${featureFlag.enabled}, beans: {beans.testBean.int = 1}},
+  {
+    condition: ${featureFlag.enabled}, beans: {
+    conditionals = [
+      {condition: true, beans: {beans.testBean.int = 2}}
+    ]
+  }
+  },
+  {condition: false, beans: {beans.testBean.int = 3}},
+]

commons-spring/src/test/scala/com/avsystem/commons/spring/HoconBeanDefinitionReaderTest.scala

@@ -49,21 +49,6 @@ class HoconBeanDefinitionReaderTest extends AnyFunSuite {
     ctx
   }
 
-  test("file should be included with true condition") {
-    ConditionalTestBean.initializedCount = 0
-    val ctx = createContext("conditionalsEnabled.conf")
-    val testBean = ctx.getBean("beanFromConditional", classOf[ConditionalTestBean])
-    assert(testBean != null)
-    assertResult(1)(ConditionalTestBean.initializedCount)
-  }
-
-  test("file should not be included with false condition") {
-    ConditionalTestBean.initializedCount = 0
-    val ctx = createContext("conditionalsDisabled.conf")
-    assert(!ctx.containsBean("beanFromConditional"))
-    assertResult(0)(ConditionalTestBean.initializedCount)
-  }
-
   test("hocon bean definition reader should work") {
     val ctx = createContext("testBean.conf")
 
@@ -106,4 +91,25 @@ class HoconBeanDefinitionReaderTest extends AnyFunSuite {
     assert(testBeanFMDefAll.constrInt == -1)
     assert(testBeanFMDefAll.constrString == "factoryDefault")
   }
+
+  test("file should be included with true condition") {
+    ConditionalTestBean.initializedCount = 0
+    val ctx = createContext("conditionalsEnabled.conf")
+    val testBean = ctx.getBean("beanFromConditional", classOf[ConditionalTestBean])
+    assert(testBean != null)
+    assertResult(1)(ConditionalTestBean.initializedCount)
+  }
+
+  test("file should not be included with false condition") {
+    ConditionalTestBean.initializedCount = 0
+    val ctx = createContext("conditionalsDisabled.conf")
+    assert(!ctx.containsBean("beanFromConditional"))
+    assertResult(0)(ConditionalTestBean.initializedCount)
+  }
+
+  test("hocon bean definition with nested conditionals should work") {
+    val ctx = createContext("conditionalsNested.conf")
+    val testBean = ctx.getBean("testBean", classOf[TestBean])
+    assert(testBean.int == 2)
+  }
 }