fix: PureConfig ProductHint were not picked up correctly (#108)

jakubjanecek · web-flow · commit a35688050d65 · 2019-12-18T17:21:33.000+01:00
diff --git a/cassandra-datastax-driver-pureconfig/src/main/scala/com/avast/sst/datastax/pureconfig/ConfigReaders.scala b/cassandra-datastax-driver-pureconfig/src/main/scala/com/avast/sst/datastax/pureconfig/ConfigReaders.scala
@@ -1,11 +1,14 @@
 package com.avast.sst.datastax.pureconfig
 
 import com.avast.sst.datastax.config._
-import pureconfig.{ConfigFieldMapping, ConfigReader, PascalCase}
+import pureconfig.generic.ProductHint
 import pureconfig.generic.semiauto.{deriveEnumerationReader, deriveReader}
+import pureconfig.{ConfigFieldMapping, ConfigReader, PascalCase}
 
 trait ConfigReaders {
 
+  implicit protected def hint[T]: ProductHint[T] = ProductHint.default
+
   implicit val cassandraDatastaxDriverDatastaxConfigReader: ConfigReader[CassandraDatastaxDriverConfig] = deriveReader
 
   // Basic driver config
diff --git a/cassandra-datastax-driver-pureconfig/src/main/scala/com/avast/sst/datastax/pureconfig/implicits.scala b/cassandra-datastax-driver-pureconfig/src/main/scala/com/avast/sst/datastax/pureconfig/implicits.scala
@@ -14,7 +14,7 @@ object implicits extends ConfigReaders {
 
   /** Contains [[pureconfig.ConfigReader]] instances with "camelCase" naming convention. */
   object CamelCase extends ConfigReaders {
-    implicit def hint[T]: ProductHint[T] = ProductHint(ConfigFieldMapping(pureconfig.CamelCase, pureconfig.CamelCase))
+    implicit override protected def hint[T]: ProductHint[T] = ProductHint(ConfigFieldMapping(pureconfig.CamelCase, pureconfig.CamelCase))
   }
 
 }
diff --git a/doobie-hikari-pureconfig/src/main/scala/com/avast/sst/doobie/pureconfig/ConfigReaders.scala b/doobie-hikari-pureconfig/src/main/scala/com/avast/sst/doobie/pureconfig/ConfigReaders.scala
@@ -5,10 +5,13 @@ import com.avast.sst.doobie.DoobieHikariConfig
 import doobie.enum.TransactionIsolation
 import pureconfig.ConfigReader
 import pureconfig.error.CannotConvert
+import pureconfig.generic.ProductHint
 import pureconfig.generic.semiauto.deriveReader
 
 trait ConfigReaders {
 
+  implicit protected def hint[T]: ProductHint[T] = ProductHint.default
+
   implicit val doobieTransactionIsolationReader: ConfigReader[TransactionIsolation] = ConfigReader[String].emap {
     case "TRANSACTION_NONE"             => TransactionIsolation.TransactionNone.asRight
     case "TRANSACTION_READ_UNCOMMITTED" => TransactionIsolation.TransactionReadUncommitted.asRight
diff --git a/doobie-hikari-pureconfig/src/main/scala/com/avast/sst/doobie/pureconfig/implicits.scala b/doobie-hikari-pureconfig/src/main/scala/com/avast/sst/doobie/pureconfig/implicits.scala
@@ -14,7 +14,7 @@ object implicits extends ConfigReaders {
 
   /** Contains [[pureconfig.ConfigReader]] instances with "camelCase" naming convention. */
   object CamelCase extends ConfigReaders {
-    implicit def hint[T]: ProductHint[T] = ProductHint(ConfigFieldMapping(pureconfig.CamelCase, pureconfig.CamelCase))
+    implicit override protected def hint[T]: ProductHint[T] = ProductHint(ConfigFieldMapping(pureconfig.CamelCase, pureconfig.CamelCase))
   }
 
 }
diff --git a/flyway-pureconfig/src/main/scala/com/avast/sst/flyway/pureconfig/ConfigReaders.scala b/flyway-pureconfig/src/main/scala/com/avast/sst/flyway/pureconfig/ConfigReaders.scala
@@ -7,10 +7,13 @@ import com.avast.sst.flyway.FlywayConfig
 import org.flywaydb.core.api.MigrationVersion
 import pureconfig.ConfigReader
 import pureconfig.error.ExceptionThrown
+import pureconfig.generic.ProductHint
 import pureconfig.generic.semiauto.deriveReader
 
 trait ConfigReaders {
 
+  implicit protected def hint[T]: ProductHint[T] = ProductHint.default
+
   implicit private[pureconfig] val flywayCharsetReader: ConfigReader[Charset] = ConfigReader[String].emap { value =>
     Either.catchNonFatal(Charset.forName(value)).leftMap(ExceptionThrown.apply)
   }
diff --git a/flyway-pureconfig/src/main/scala/com/avast/sst/flyway/pureconfig/implicits.scala b/flyway-pureconfig/src/main/scala/com/avast/sst/flyway/pureconfig/implicits.scala
@@ -14,7 +14,7 @@ object implicits extends ConfigReaders {
 
   /** Contains [[pureconfig.ConfigReader]] instances with "camelCase" naming convention. */
   object CamelCase extends ConfigReaders {
-    implicit def hint[T]: ProductHint[T] = ProductHint(ConfigFieldMapping(pureconfig.CamelCase, pureconfig.CamelCase))
+    implicit override protected def hint[T]: ProductHint[T] = ProductHint(ConfigFieldMapping(pureconfig.CamelCase, pureconfig.CamelCase))
   }
 
 }
diff --git a/grpc-server-pureconfig/src/main/scala/com/avast/sst/grpc/server/pureconfig/ConfigReaders.scala b/grpc-server-pureconfig/src/main/scala/com/avast/sst/grpc/server/pureconfig/ConfigReaders.scala
@@ -2,10 +2,13 @@ package com.avast.sst.grpc.server.pureconfig
 
 import com.avast.sst.grpc.server.GrpcServerConfig
 import pureconfig.ConfigReader
+import pureconfig.generic.ProductHint
 import pureconfig.generic.semiauto.deriveReader
 
 trait ConfigReaders {
 
+  implicit protected def hint[T]: ProductHint[T] = ProductHint.default
+
   implicit val grpcServerGrpcServerConfigReader: ConfigReader[GrpcServerConfig] = deriveReader
 
 }
diff --git a/grpc-server-pureconfig/src/main/scala/com/avast/sst/grpc/server/pureconfig/implicits.scala b/grpc-server-pureconfig/src/main/scala/com/avast/sst/grpc/server/pureconfig/implicits.scala
@@ -14,7 +14,7 @@ object implicits extends ConfigReaders {
 
   /** Contains [[pureconfig.ConfigReader]] instances with "camelCase" naming convention. */
   object CamelCase extends ConfigReaders {
-    implicit def hint[T]: ProductHint[T] = ProductHint(ConfigFieldMapping(pureconfig.CamelCase, pureconfig.CamelCase))
+    implicit override protected def hint[T]: ProductHint[T] = ProductHint(ConfigFieldMapping(pureconfig.CamelCase, pureconfig.CamelCase))
   }
 
 }
diff --git a/http4s-client-blaze-pureconfig/src/main/scala/com/avast/sst/http4s/client/pureconfig/ConfigReaders.scala b/http4s-client-blaze-pureconfig/src/main/scala/com/avast/sst/http4s/client/pureconfig/ConfigReaders.scala
@@ -6,10 +6,13 @@ import org.http4s.client.blaze.ParserMode
 import org.http4s.headers.`User-Agent`
 import pureconfig.ConfigReader
 import pureconfig.error.CannotConvert
+import pureconfig.generic.ProductHint
 import pureconfig.generic.semiauto.{deriveEnumerationReader, deriveReader}
 
 trait ConfigReaders {
 
+  implicit protected def hint[T]: ProductHint[T] = ProductHint.default
+
   implicit val http4sClientUserAgentReader: ConfigReader[`User-Agent`] = ConfigReader[String].emap { value =>
     `User-Agent`.parse(value).leftMap { parseFailure =>
       CannotConvert(value, "User-Agent HTTP header", parseFailure.message)
diff --git a/http4s-client-blaze-pureconfig/src/main/scala/com/avast/sst/http4s/client/pureconfig/implicits.scala b/http4s-client-blaze-pureconfig/src/main/scala/com/avast/sst/http4s/client/pureconfig/implicits.scala
@@ -14,7 +14,7 @@ object implicits extends ConfigReaders {
 
   /** Contains [[pureconfig.ConfigReader]] instances with "camelCase" naming convention. */
   object CamelCase extends ConfigReaders {
-    implicit def hint[T]: ProductHint[T] = ProductHint(ConfigFieldMapping(pureconfig.CamelCase, pureconfig.CamelCase))
+    implicit override protected def hint[T]: ProductHint[T] = ProductHint(ConfigFieldMapping(pureconfig.CamelCase, pureconfig.CamelCase))
   }
 
 }
diff --git a/http4s-server-blaze-pureconfig/src/main/scala/com/avast/sst/http4s/server/pureconfig/ConfigReaders.scala b/http4s-server-blaze-pureconfig/src/main/scala/com/avast/sst/http4s/server/pureconfig/ConfigReaders.scala
@@ -3,10 +3,13 @@ package com.avast.sst.http4s.server.pureconfig
 import com.avast.sst.http4s.server.Http4sBlazeServerConfig
 import com.avast.sst.http4s.server.Http4sBlazeServerConfig.SocketOptions
 import pureconfig.ConfigReader
+import pureconfig.generic.ProductHint
 import pureconfig.generic.semiauto.deriveReader
 
 trait ConfigReaders {
 
+  implicit protected def hint[T]: ProductHint[T] = ProductHint.default
+
   implicit val http4sServerSocketOptionsReader: ConfigReader[SocketOptions] = deriveReader
 
   implicit val http4sServerHttp4sBlazeServerConfigReader: ConfigReader[Http4sBlazeServerConfig] = deriveReader
diff --git a/http4s-server-blaze-pureconfig/src/main/scala/com/avast/sst/http4s/server/pureconfig/implicits.scala b/http4s-server-blaze-pureconfig/src/main/scala/com/avast/sst/http4s/server/pureconfig/implicits.scala
@@ -14,7 +14,7 @@ object implicits extends ConfigReaders {
 
   /** Contains [[pureconfig.ConfigReader]] instances with "camelCase" naming convention. */
   object CamelCase extends ConfigReaders {
-    implicit def hint[T]: ProductHint[T] = ProductHint(ConfigFieldMapping(pureconfig.CamelCase, pureconfig.CamelCase))
+    implicit override protected def hint[T]: ProductHint[T] = ProductHint(ConfigFieldMapping(pureconfig.CamelCase, pureconfig.CamelCase))
   }
 
 }
diff --git a/http4s-server-blaze/src/test/scala/com/avast/sst/http4s/server/Http4sBlazeServerModuleTest.scala b/http4s-server-blaze/src/test/scala/com/avast/sst/http4s/server/Http4sBlazeServerModuleTest.scala
@@ -4,9 +4,9 @@ import cats.effect.{ContextShift, IO, Timer}
 import com.avast.sst.http4s.client.{Http4sBlazeClientConfig, Http4sBlazeClientModule}
 import org.http4s.HttpRoutes
 import org.http4s.dsl.Http4sDsl
+import org.scalatest.funsuite.AsyncFunSuite
 
 import scala.concurrent.ExecutionContext
-import org.scalatest.funsuite.AsyncFunSuite
 
 class Http4sBlazeServerModuleTest extends AsyncFunSuite with Http4sDsl[IO] {
 
diff --git a/jvm-pureconfig/src/main/scala/com/avast/sst/jvm/pureconfig/ConfigReaders.scala b/jvm-pureconfig/src/main/scala/com/avast/sst/jvm/pureconfig/ConfigReaders.scala
@@ -3,10 +3,13 @@ package com.avast.sst.jvm.pureconfig
 import com.avast.sst.jvm.execution.ForkJoinPoolConfig.TaskPeekingMode
 import com.avast.sst.jvm.execution.{ForkJoinPoolConfig, ThreadPoolExecutorConfig}
 import pureconfig.ConfigReader
+import pureconfig.generic.ProductHint
 import pureconfig.generic.semiauto.{deriveEnumerationReader, deriveReader}
 
 trait ConfigReaders {
 
+  implicit protected def hint[T]: ProductHint[T] = ProductHint.default
+
   implicit val jvmThreadPoolExecutorConfigReader: ConfigReader[ThreadPoolExecutorConfig] = deriveReader
 
   implicit val jvmTaskPeekingModeReader: ConfigReader[TaskPeekingMode] = deriveEnumerationReader
diff --git a/jvm-pureconfig/src/main/scala/com/avast/sst/jvm/pureconfig/implicits.scala b/jvm-pureconfig/src/main/scala/com/avast/sst/jvm/pureconfig/implicits.scala
@@ -14,7 +14,7 @@ object implicits extends ConfigReaders {
 
   /** Contains [[pureconfig.ConfigReader]] instances with "camelCase" naming convention. */
   object CamelCase extends ConfigReaders {
-    implicit def hint[T]: ProductHint[T] = ProductHint(ConfigFieldMapping(pureconfig.CamelCase, pureconfig.CamelCase))
+    implicit override protected def hint[T]: ProductHint[T] = ProductHint(ConfigFieldMapping(pureconfig.CamelCase, pureconfig.CamelCase))
   }
 
 }
diff --git a/micrometer-jmx-pureconfig/src/main/scala/com/avast/sst/micrometer/jmx/pureconfig/ConfigReaders.scala b/micrometer-jmx-pureconfig/src/main/scala/com/avast/sst/micrometer/jmx/pureconfig/ConfigReaders.scala
@@ -2,10 +2,13 @@ package com.avast.sst.micrometer.jmx.pureconfig
 
 import com.avast.sst.micrometer.jmx.MicrometerJmxConfig
 import pureconfig.ConfigReader
+import pureconfig.generic.ProductHint
 import pureconfig.generic.semiauto.deriveReader
 
 trait ConfigReaders {
 
+  implicit protected def hint[T]: ProductHint[T] = ProductHint.default
+
   implicit val micrometerMicrometerJmxConfigReader: ConfigReader[MicrometerJmxConfig] = deriveReader
 
 }
diff --git a/micrometer-jmx-pureconfig/src/main/scala/com/avast/sst/micrometer/jmx/pureconfig/implicits.scala b/micrometer-jmx-pureconfig/src/main/scala/com/avast/sst/micrometer/jmx/pureconfig/implicits.scala
@@ -14,7 +14,7 @@ object implicits extends ConfigReaders {
 
   /** Contains [[pureconfig.ConfigReader]] instances with "camelCase" naming convention. */
   object CamelCase extends ConfigReaders {
-    implicit def hint[T]: ProductHint[T] = ProductHint(ConfigFieldMapping(pureconfig.CamelCase, pureconfig.CamelCase))
+    implicit override protected def hint[T]: ProductHint[T] = ProductHint(ConfigFieldMapping(pureconfig.CamelCase, pureconfig.CamelCase))
   }
 
 }
diff --git a/micrometer-statsd-pureconfig/src/main/scala/com/avast/sst/micrometer/statsd/pureconfig/ConfigReaders.scala b/micrometer-statsd-pureconfig/src/main/scala/com/avast/sst/micrometer/statsd/pureconfig/ConfigReaders.scala
@@ -2,10 +2,13 @@ package com.avast.sst.micrometer.statsd.pureconfig
 
 import com.avast.sst.micrometer.statsd.MicrometerStatsDConfig
 import pureconfig.ConfigReader
+import pureconfig.generic.ProductHint
 import pureconfig.generic.semiauto.deriveReader
 
 trait ConfigReaders {
 
+  implicit protected def hint[T]: ProductHint[T] = ProductHint.default
+
   implicit val micrometerMicrometerStatsDConfigReader: ConfigReader[MicrometerStatsDConfig] = deriveReader
 
 }
diff --git a/micrometer-statsd-pureconfig/src/main/scala/com/avast/sst/micrometer/statsd/pureconfig/implicits.scala b/micrometer-statsd-pureconfig/src/main/scala/com/avast/sst/micrometer/statsd/pureconfig/implicits.scala
@@ -14,7 +14,7 @@ object implicits extends ConfigReaders {
 
   /** Contains [[pureconfig.ConfigReader]] instances with "camelCase" naming convention. */
   object CamelCase extends ConfigReaders {
-    implicit def hint[T]: ProductHint[T] = ProductHint(ConfigFieldMapping(pureconfig.CamelCase, pureconfig.CamelCase))
+    implicit override protected def hint[T]: ProductHint[T] = ProductHint(ConfigFieldMapping(pureconfig.CamelCase, pureconfig.CamelCase))
   }
 
 }
diff --git a/monix-catnap-pureconfig/src/main/scala/com/avast/sst/monix/catnap/pureconfig/ConfigReaders.scala b/monix-catnap-pureconfig/src/main/scala/com/avast/sst/monix/catnap/pureconfig/ConfigReaders.scala
@@ -2,10 +2,13 @@ package com.avast.sst.monix.catnap.pureconfig
 
 import com.avast.sst.monix.catnap.CircuitBreakerConfig
 import pureconfig.ConfigReader
+import pureconfig.generic.ProductHint
 import pureconfig.generic.semiauto.deriveReader
 
 trait ConfigReaders {
 
+  implicit protected def hint[T]: ProductHint[T] = ProductHint.default
+
   implicit val monixCatnapCircuitBreakerConfigReader: ConfigReader[CircuitBreakerConfig] = deriveReader
 
 }
diff --git a/monix-catnap-pureconfig/src/main/scala/com/avast/sst/monix/catnap/pureconfig/implicits.scala b/monix-catnap-pureconfig/src/main/scala/com/avast/sst/monix/catnap/pureconfig/implicits.scala
@@ -14,7 +14,7 @@ object implicits extends ConfigReaders {
 
   /** Contains [[pureconfig.ConfigReader]] instances with "camelCase" naming convention. */
   object CamelCase extends ConfigReaders {
-    implicit def hint[T]: ProductHint[T] = ProductHint(ConfigFieldMapping(pureconfig.CamelCase, pureconfig.CamelCase))
+    implicit override protected def hint[T]: ProductHint[T] = ProductHint(ConfigFieldMapping(pureconfig.CamelCase, pureconfig.CamelCase))
   }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ object implicits extends ConfigReaders {`
`14`	`14`
`15`	`15`	`/** Contains [[pureconfig.ConfigReader]] instances with "camelCase" naming convention. */`
`16`	`16`	`object CamelCase extends ConfigReaders {`
`17`		`- implicit def hint[T]: ProductHint[T] = ProductHint(ConfigFieldMapping(pureconfig.CamelCase, pureconfig.CamelCase))`
	`17`	`+ implicit override protected def hint[T]: ProductHint[T] = ProductHint(ConfigFieldMapping(pureconfig.CamelCase, pureconfig.CamelCase))`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`}`