Review fixes

Author: mhawryluk

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

@@ -17,6 +17,7 @@ class HoconBeanDefinitionReader(registry: BeanDefinitionRegistry)
   extends AbstractBeanDefinitionReader(registry) {
 
   import com.typesafe.config.ConfigValueType._
+  import com.avsystem.commons.spring.HoconBeanDefinitionReader._
 
   private implicit class ConfigValueExtensions(value: ConfigValue) {
     def as[T: HoconType] =
@@ -345,12 +346,12 @@ class HoconBeanDefinitionReader(registry: BeanDefinitionRegistry)
   }
 
   private def readConditionals(config: Config): Config = {
-    if (!config.hasPath("conditionals")) config
-    else config.getList("conditionals").asScala.foldLeft(config.withoutPath("conditionals"))((currentConfig, conditionalObject) => {
+    if (!config.hasPath(Conditionals)) config
+    else config.getList(Conditionals).asScala.foldLeft(config.withoutPath(Conditionals))((currentConfig, conditionalObject) => {
       val props = getProps(conditionalObject.as[ConfigObject])
 
-      if (props.get("condition").map(_.unwrapped().asInstanceOf[Boolean]).exists(identity)) {
-        readConditionals(props("beans").as[Config]).withFallback(currentConfig)
+      if (props.get(Condition).exists(_.as[Boolean])) {
+        readConditionals(props(Config).as[Config]).withFallback(currentConfig)
       } else {
         currentConfig
       }
@@ -359,8 +360,8 @@ class HoconBeanDefinitionReader(registry: BeanDefinitionRegistry)
 
   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 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
@@ -369,3 +370,10 @@ class HoconBeanDefinitionReader(registry: BeanDefinitionRegistry)
   def loadBeanDefinitions(resource: Resource): Int =
     loadBeanDefinitions(ConfigFactory.parseURL(resource.getURL).resolve)
 }
+object HoconBeanDefinitionReader {
+  val Conditionals = "conditionals"
+  val Condition = "condition"
+  val Config = "config"
+  val Beans = "beans"
+  val Aliases = "aliases"
+}

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

@@ -3,5 +3,5 @@ featureFlag.enabled = false
 beans.beanFromConditional = null
 
 conditionals = [
-  {condition: ${featureFlag.enabled}, beans: {include "conditionalInclude.conf"}},
+  {condition: ${featureFlag.enabled}, config: {include "conditionalInclude.conf"}},
 ]

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

@@ -3,5 +3,5 @@ featureFlag.enabled = true
 beans.beanFromConditional = null
 
 conditionals = [
-  {condition: ${featureFlag.enabled}, beans: {include "conditionalInclude.conf"}},
+  {condition: ${featureFlag.enabled}, config: {include "conditionalInclude.conf"}},
 ]

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

@@ -7,14 +7,14 @@ beans {
 }
 
 conditionals = [
-  {condition: ${featureFlag.enabled}, beans: {beans.testBean.int = 0}},
-  {condition: ${featureFlag.enabled}, beans: {beans.testBean.int = 1}},
+  {condition: ${featureFlag.enabled}, config: {beans.testBean.int = 0}},
+  {condition: ${featureFlag.enabled}, config: {beans.testBean.int = 1}},
   {
-    condition: ${featureFlag.enabled}, beans: {
+    condition: ${featureFlag.enabled}, config: {
     conditionals = [
-      {condition: true, beans: {beans.testBean.int = 2}}
+      {condition: true, config: {beans.testBean.int = 2}}
     ]
   }
   },
-  {condition: false, beans: {beans.testBean.int = 3}},
+  {condition: false, config: {beans.testBean.int = 3}},
 ]

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

@@ -2,6 +2,7 @@ package com.avsystem.commons
 package spring
 
 import com.typesafe.config.{Config, ConfigFactory}
+import org.scalatest.BeforeAndAfterEach
 import org.scalatest.funsuite.AnyFunSuite
 import org.springframework.beans.factory.support.DefaultListableBeanFactory
 import org.springframework.context.support.GenericApplicationContext
@@ -34,7 +35,7 @@ object ConditionalTestBean {
   var initializedCount = 0
 }
 
-class HoconBeanDefinitionReaderTest extends AnyFunSuite {
+class HoconBeanDefinitionReaderTest extends AnyFunSuite with BeforeAndAfterEach {
   def createContext(resource: String): GenericApplicationContext = {
     val beanFactory = new DefaultListableBeanFactory
     beanFactory.setParameterNameDiscoverer(new StandardReflectionParameterNameDiscoverer)
@@ -49,6 +50,10 @@ class HoconBeanDefinitionReaderTest extends AnyFunSuite {
     ctx
   }
 
+  override def beforeEach(): Unit = {
+    ConditionalTestBean.initializedCount = 0
+  }
+
   test("hocon bean definition reader should work") {
     val ctx = createContext("testBean.conf")
 
@@ -93,15 +98,13 @@ class HoconBeanDefinitionReaderTest extends AnyFunSuite {
   }
 
   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)