Switch to Builder for consistent naming

davenverse · Jul 10, 2023 · 19972ac · 19972ac
1 parent 1c87999
commit 19972ac
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/core/src/main/scala/io/chrisdavenport/http4s/log4cats/contextlog/ClientMiddleware.scala b/core/src/main/scala/io/chrisdavenport/http4s/log4cats/contextlog/ClientMiddleware.scala
@@ -44,11 +44,11 @@ object ClientMiddleware {
       DefaultLog.log(prelude, outcome, now)
   }
 
-  def fromLoggerFactory[F[_]: Concurrent: Clock: LoggerFactory]: ClientMiddlewareBuilder[F] =
+  def fromLoggerFactory[F[_]: Concurrent: Clock: LoggerFactory]: Builder[F] =
     fromLogger(LoggerFactory[F].getLogger)
 
-  def fromLogger[F[_]: Concurrent: Clock](logger: SelfAwareStructuredLogger[F]): ClientMiddlewareBuilder[F] =
-    new ClientMiddlewareBuilder[F](
+  def fromLogger[F[_]: Concurrent: Clock](logger: SelfAwareStructuredLogger[F]): Builder[F] =
+    new Builder[F](
       logger,
       Defaults.willLog[F],
       Defaults.routeClassifier(_),
@@ -66,7 +66,7 @@ object ClientMiddleware {
       Defaults.logMessage(_,_,_)
     )
 
-  final class ClientMiddlewareBuilder[F[_]: Concurrent: Clock] private[ClientMiddleware](
+  final class Builder[F[_]: Concurrent: Clock] private[ClientMiddleware](
     logger: SelfAwareStructuredLogger[F],
     willLog: Request[Pure] => F[Boolean],
 
@@ -105,7 +105,7 @@ object ClientMiddleware {
       removedContextKeys: Set[String] = self.removedContextKeys,
       logLevel: (Request[Pure], Outcome[Option, Throwable, Response[Pure]]) => Option[LogLevel] = self.logLevel,
       logMessage: (Request[Pure], Outcome[Option, Throwable, Response[Pure]], FiniteDuration) => String = self.logMessage,
-    ) = new ClientMiddlewareBuilder[F](
+    ) = new Builder[F](
       logger,
       willLog,
       routeClassifier,

diff --git a/core/src/main/scala/io/chrisdavenport/http4s/log4cats/contextlog/ServerMiddleware.scala b/core/src/main/scala/io/chrisdavenport/http4s/log4cats/contextlog/ServerMiddleware.scala
@@ -43,11 +43,11 @@ object ServerMiddleware {
       CommonLog.logMessage(ZoneId.systemDefault())(prelude, outcome, now)
   }
 
-  def fromLoggerFactory[F[_]: Concurrent: Clock: LoggerFactory]: ServerMiddlewareBuilder[F] =
+  def fromLoggerFactory[F[_]: Concurrent: Clock: LoggerFactory]: Builder[F] =
     fromLogger(LoggerFactory[F].getLogger)
 
-  def fromLogger[F[_]: Concurrent: Clock](logger: SelfAwareStructuredLogger[F]): ServerMiddlewareBuilder[F] =
-    new ServerMiddlewareBuilder[F](
+  def fromLogger[F[_]: Concurrent: Clock](logger: SelfAwareStructuredLogger[F]): Builder[F] =
+    new Builder[F](
       logger,
       Defaults.willLog[F],
       Defaults.routeClassifier(_),
@@ -65,7 +65,7 @@ object ServerMiddleware {
       Defaults.logMessage(_,_,_)
     )
 
-  final class ServerMiddlewareBuilder[F[_]: Concurrent: Clock] private[ServerMiddleware](
+  final class Builder[F[_]: Concurrent: Clock] private[ServerMiddleware](
     logger: SelfAwareStructuredLogger[F],
     willLog: Request[Pure] => F[Boolean],
 
@@ -105,7 +105,7 @@ object ServerMiddleware {
       removedContextKeys: Set[String] = self.removedContextKeys,
       logLevel: (Request[Pure], Outcome[Option, Throwable, Response[Pure]]) => Option[LogLevel] = self.logLevel,
       logMessage: (Request[Pure], Outcome[Option, Throwable, Response[Pure]], FiniteDuration) => String = self.logMessage,
-    ) = new ServerMiddlewareBuilder[F](
+    ) = new Builder[F](
       logger,
       willLog,
       routeClassifier,