Skip to content

Commit 5697873

Browse files
committed
refactor!:Make implicit ConfigReader field names as unique as possible
BREAKING CHANGE: public implicits renamed We want to prevent name collision which breaks user code and is very hard to detect.
1 parent c4a8d73 commit 5697873

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

doobie-hikari-pureconfig/src/main/scala/com/avast/sst/doobie/pureconfig/ConfigReaders.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import pureconfig.generic.semiauto.deriveReader
99

1010
trait ConfigReaders {
1111

12-
implicit val transactionIsolationReader: ConfigReader[TransactionIsolation] = ConfigReader[String].emap {
12+
implicit val doobieTransactionIsolationReader: ConfigReader[TransactionIsolation] = ConfigReader[String].emap {
1313
case "TRANSACTION_NONE" => TransactionIsolation.TransactionNone.asRight
1414
case "TRANSACTION_READ_UNCOMMITTED" => TransactionIsolation.TransactionReadUncommitted.asRight
1515
case "TRANSACTION_READ_COMMITTED" => TransactionIsolation.TransactionReadCommitted.asRight
@@ -18,6 +18,6 @@ trait ConfigReaders {
1818
case unknown => Left(CannotConvert(unknown, "TransactionIsolation", "unknown value"))
1919
}
2020

21-
implicit val configReader: ConfigReader[DoobieHikariConfig] = deriveReader
21+
implicit val doobieDoobieHikariConfigReader: ConfigReader[DoobieHikariConfig] = deriveReader
2222

2323
}

flyway-pureconfig/src/main/scala/com/avast/sst/flyway/pureconfig/ConfigReaders.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ import pureconfig.generic.semiauto.deriveReader
1111

1212
trait ConfigReaders {
1313

14-
implicit private[pureconfig] val charsetReader: ConfigReader[Charset] = ConfigReader[String].emap { value =>
14+
implicit private[pureconfig] val flywayCharsetReader: ConfigReader[Charset] = ConfigReader[String].emap { value =>
1515
Either.catchNonFatal(Charset.forName(value)).leftMap(ExceptionThrown.apply)
1616
}
1717

18-
implicit val migrationVersionReader: ConfigReader[MigrationVersion] = ConfigReader[String].map(MigrationVersion.fromVersion)
18+
implicit val flywayMigrationVersionReader: ConfigReader[MigrationVersion] = ConfigReader[String].map(MigrationVersion.fromVersion)
1919

20-
implicit val configReader: ConfigReader[FlywayConfig] = deriveReader
20+
implicit val flywayFlywayConfigReader: ConfigReader[FlywayConfig] = deriveReader
2121

2222
}

http4s-client-blaze-pureconfig/src/main/scala/com/avast/sst/http4s/client/pureconfig/ConfigReaders.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ import pureconfig.generic.semiauto.{deriveEnumerationReader, deriveReader}
1010

1111
trait ConfigReaders {
1212

13-
implicit val userAgentReader: ConfigReader[`User-Agent`] = ConfigReader[String].emap { value =>
13+
implicit val http4sClientUserAgentReader: ConfigReader[`User-Agent`] = ConfigReader[String].emap { value =>
1414
`User-Agent`.parse(value).leftMap { parseFailure =>
1515
CannotConvert(value, "User-Agent HTTP header", parseFailure.message)
1616
}
1717
}
1818

19-
implicit val parserModeReader: ConfigReader[ParserMode] = deriveEnumerationReader
19+
implicit val http4sClientParserModeReader: ConfigReader[ParserMode] = deriveEnumerationReader
2020

21-
implicit val http4sBlazeClientConfigReader: ConfigReader[Http4sBlazeClientConfig] = deriveReader
21+
implicit val http4sClientHttp4sBlazeClientConfigReader: ConfigReader[Http4sBlazeClientConfig] = deriveReader
2222

2323
}

http4s-server-blaze-pureconfig/src/main/scala/com/avast/sst/http4s/server/pureconfig/ConfigReaders.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import pureconfig.generic.semiauto.deriveReader
77

88
trait ConfigReaders {
99

10-
implicit val socketOptionsReader: ConfigReader[SocketOptions] = deriveReader
10+
implicit val http4sServerSocketOptionsReader: ConfigReader[SocketOptions] = deriveReader
1111

12-
implicit val http4sBlazeServerConfigReader: ConfigReader[Http4sBlazeServerConfig] = deriveReader
12+
implicit val http4sServerHttp4sBlazeServerConfigReader: ConfigReader[Http4sBlazeServerConfig] = deriveReader
1313

1414
}

jvm-pureconfig/src/main/scala/com/avast/sst/jvm/pureconfig/ConfigReaders.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import pureconfig.generic.semiauto.{deriveEnumerationReader, deriveReader}
77

88
trait ConfigReaders {
99

10-
implicit val threadPoolExecutorConfigReader: ConfigReader[ThreadPoolExecutorConfig] = deriveReader
10+
implicit val jvmThreadPoolExecutorConfigReader: ConfigReader[ThreadPoolExecutorConfig] = deriveReader
1111

12-
implicit val taskPeekingModeReader: ConfigReader[TaskPeekingMode] = deriveEnumerationReader
12+
implicit val jvmTaskPeekingModeReader: ConfigReader[TaskPeekingMode] = deriveEnumerationReader
1313

14-
implicit val forkJoinPoolConfigReader: ConfigReader[ForkJoinPoolConfig] = deriveReader
14+
implicit val jvmForkJoinPoolConfigReader: ConfigReader[ForkJoinPoolConfig] = deriveReader
1515

1616
}

micrometer-jmx-pureconfig/src/main/scala/com/avast/sst/micrometer/jmx/pureconfig/ConfigReaders.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ import pureconfig.generic.semiauto.deriveReader
66

77
trait ConfigReaders {
88

9-
implicit val micrometerJmxConfigReader: ConfigReader[MicrometerJmxConfig] = deriveReader
9+
implicit val micrometerMicrometerJmxConfigReader: ConfigReader[MicrometerJmxConfig] = deriveReader
1010

1111
}

micrometer-statsd-pureconfig/src/main/scala/com/avast/sst/micrometer/statsd/pureconfig/ConfigReaders.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ import pureconfig.generic.semiauto.deriveReader
66

77
trait ConfigReaders {
88

9-
implicit val micrometerStatsDConfigReader: ConfigReader[MicrometerStatsDConfig] = deriveReader
9+
implicit val micrometerMicrometerStatsDConfigReader: ConfigReader[MicrometerStatsDConfig] = deriveReader
1010

1111
}

0 commit comments

Comments
 (0)