Merge 19bd2b6 into b48cffe

pureconfig · Aug 15, 2021 · ae78d8e · ae78d8e
2 parents b48cffe + 19bd2b6
commit ae78d8e
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/core/src/main/scala/pureconfig/BasicReaders.scala b/core/src/main/scala/pureconfig/BasicReaders.scala
@@ -5,6 +5,7 @@ import java.math.{BigDecimal => JavaBigDecimal, BigInteger}
 import java.net.{URI, URL}
 import java.nio.file.{Path, Paths}
 import java.time._
+import java.time.temporal.ChronoUnit
 import java.time.{Duration => JavaDuration}
 import java.util.UUID
 import java.util.regex.Pattern
@@ -66,11 +67,19 @@ trait PrimitiveReaders {
   */
 trait JavaEnumReader {
 
-  implicit def javaEnumReader[A <: java.lang.Enum[A]](implicit tag: ClassTag[A]): ConfigReader[A] =
+  private[pureconfig] def baseJavaEnumReader[A <: java.lang.Enum[A]](
+      transformValue: String => String
+  )(implicit tag: ClassTag[A]): ConfigReader[A] =
     ConfigReader.fromString(catchReadError(s => {
       val enumClass = tag.runtimeClass.asInstanceOf[Class[A]]
-      Enum.valueOf(enumClass, s)
+      Enum.valueOf(enumClass, transformValue(s))
     }))
+
+  implicit def javaEnumReader[A <: java.lang.Enum[A]](implicit tag: ClassTag[A]): ConfigReader[A] =
+    baseJavaEnumReader[A](identity)
+
+  private[pureconfig] def mixedCaseJavaEnumReader[A <: java.lang.Enum[A]](implicit tag: ClassTag[A]): ConfigReader[A] =
+    baseJavaEnumReader[A](_.toUpperCase)
 }
 
 /** Trait containing `ConfigReader` instances for classes related to file system paths and URIs.
@@ -95,7 +104,7 @@ trait RegexReaders {
 
 /** Trait containing `ConfigReader` instances for `java.time` classes.
   */
-trait JavaTimeReaders {
+trait JavaTimeReaders extends JavaEnumReader {
 
   implicit val instantConfigReader: ConfigReader[Instant] =
     ConfigReader.fromNonEmptyString[Instant](catchReadError(Instant.parse))
@@ -109,6 +118,9 @@ trait JavaTimeReaders {
   implicit val periodConfigReader: ConfigReader[Period] =
     ConfigReader.fromNonEmptyString[Period](PeriodUtils.fromString)
 
+  implicit val chronoUnitReader: ConfigReader[ChronoUnit] =
+    mixedCaseJavaEnumReader[ChronoUnit]
+
   implicit val javaDurationConfigReader: ConfigReader[JavaDuration] =
     ConfigReader.fromNonEmptyString[JavaDuration](catchReadError(JavaDuration.parse))