diff --git a/src/main/scala-3/net/ceedubs/ficus/util/EnumerationUtil.scala b/src/main/scala-3/net/ceedubs/ficus/util/EnumerationUtil.scala index 0ae472f..797f72a 100644 --- a/src/main/scala-3/net/ceedubs/ficus/util/EnumerationUtil.scala +++ b/src/main/scala-3/net/ceedubs/ficus/util/EnumerationUtil.scala @@ -1,7 +1,7 @@ package net.ceedubs.ficus.util private[ficus] object EnumerationUtil { - private[this] type Aux[A] = { type Value = A } + private[this] type Aux[A] = { type Value } { type Value = A } type EnumValue[A <: Enumeration] = A match { case Aux[a] => a diff --git a/src/main/scala/net/ceedubs/ficus/readers/CaseInsensitiveEnumerationReader.scala b/src/main/scala/net/ceedubs/ficus/readers/CaseInsensitiveEnumerationReader.scala index 1a0ceae..4822aff 100644 --- a/src/main/scala/net/ceedubs/ficus/readers/CaseInsensitiveEnumerationReader.scala +++ b/src/main/scala/net/ceedubs/ficus/readers/CaseInsensitiveEnumerationReader.scala @@ -4,6 +4,6 @@ import net.ceedubs.ficus.util.EnumerationUtil.EnumValue trait CaseInsensitiveEnumerationReader extends EnumerationReader { - override protected def findEnumValue[T <: Enumeration](`enum`: T, configValue: String): Option[EnumValue[T]] = + override protected def findEnumValue[T <: Enumeration](`enum`: T, configValue: String): Option[`enum`.Value] = `enum`.values.find(_.toString.toLowerCase == configValue.toLowerCase) } diff --git a/src/main/scala/net/ceedubs/ficus/readers/EnumerationReader.scala b/src/main/scala/net/ceedubs/ficus/readers/EnumerationReader.scala index 1ae8a28..c6d7532 100644 --- a/src/main/scala/net/ceedubs/ficus/readers/EnumerationReader.scala +++ b/src/main/scala/net/ceedubs/ficus/readers/EnumerationReader.scala @@ -35,7 +35,7 @@ trait EnumerationReader { } } - protected def findEnumValue[T <: Enumeration](`enum`: T, configValue: String): Option[EnumValue[T]] = + protected def findEnumValue[T <: Enumeration](`enum`: T, configValue: String): Option[`enum`.Value] = `enum`.values.find(_.toString == configValue) }