Housekeeping (#3111)

sbt-zio-http-grpc/src/main/scala/zio/http/grpc/ZIOHttpGRPCGen.scala

@@ -5,23 +5,22 @@ import scala.jdk.CollectionConverters._
 import zio.http.gen.grpc._
 import zio.http.gen.scala.{Code, CodeGen}
 
+import com.google.protobuf._
 import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse
-import com.google.protobuf.{Descriptors, ExtensionRegistry}
 import protocgen.{CodeGenApp, CodeGenRequest, CodeGenResponse}
-import scalapb.compiler.{DescriptorImplicits, ProtobufGenerator}
-import scalapb.options.Scalapb
+import scalapb.compiler._
 
 object ZIOHttpGRPCGen extends CodeGenApp {
 
   def process(request: CodeGenRequest): CodeGenResponse =
     ProtobufGenerator.parseParameters(request.parameter) match {
       case Right(_)    =>
         val services = request.filesToGenerate.flatMap(fromProtobuf(_).files)
-        val schemas  = services.map(getImplicitSchemas(_)).map { case (pkg, tpes) =>
+        val schemas  = services.map(getImplicitSchemas).map { case (pkg, tpes) =>
           schemasFile(pkg, tpes)
         }
         CodeGenResponse.succeed(
-          schemas ++ services.map(fileToPluginCode(_)),
+          schemas ++ services.map(fileToPluginCode),
           Set(CodeGeneratorResponse.Feature.FEATURE_PROTO3_OPTIONAL),
         )
       case Left(error) =>
@@ -55,7 +54,7 @@ object ZIOHttpGRPCGen extends CodeGenApp {
     val content =
       s"package ${pkg.mkString(".")} \nobject Schemas {\n" +
         "import zio.schema.{DeriveSchema, Schema}\n" +
-        tpes.distinct.map(tpeToSchema(_)).mkString("") +
+        tpes.distinct.map(tpeToSchema).mkString("") +
         "\n}"
     b.setContent(content)
     b.build
@@ -66,39 +65,36 @@ object ZIOHttpGRPCGen extends CodeGenApp {
   }
 
   def fromDescriptor(file: Descriptors.FileDescriptor): Protobuf.File = {
-    val deps    = file
-      .getDependencies()
-      .asScala
-      .toList
+    val deps    = file.getDependencies.asScala.toList
       .map(_.getName())
-    val opt     = file.getOptions()
-    val pkg     = if (opt.hasJavaPackage() && opt.getJavaPackage() != "") opt.getJavaPackage() else file.getPackage()
+    val opt     = file.getOptions
+    val pkg     = if (opt.hasJavaPackage && opt.getJavaPackage != "") opt.getJavaPackage else file.getPackage
     val pkgPath = if (pkg == "") Nil else pkg.split('.').toList
     val name0   =
-      if (opt.hasJavaOuterClassname() && opt.getJavaOuterClassname() != "") opt.getJavaOuterClassname()
-      else file.getName()
+      if (opt.hasJavaOuterClassname && opt.getJavaOuterClassname != "") opt.getJavaOuterClassname
+      else file.getName
     val name    = if (name0.endsWith(".proto")) name0.dropRight(6) else name0
 
     def fromService(service: Descriptors.ServiceDescriptor): Protobuf.Service =
       Protobuf.Service(
-        service.getName(),
-        service.getMethods.asScala.toList.map(fromMethod(_)),
+        service.getName,
+        service.getMethods.asScala.toList.map(fromMethod),
       )
 
     def fromMethod(method: Descriptors.MethodDescriptor): Protobuf.Method =
       Protobuf.Method(
-        method.getName(),
-        method.getInputType().getName(),
-        method.getOutputType().getName(),
-        method.isClientStreaming(),
-        method.isServerStreaming(),
+        method.getName,
+        method.getInputType.getName,
+        method.getOutputType.getName,
+        method.isClientStreaming,
+        method.isServerStreaming,
       )
 
     Protobuf.File(
       name,
       pkgPath,
       deps,
-      file.getServices().asScala.toList.map(fromService(_)),
+      file.getServices.asScala.toList.map(fromService),
     )
   }
 

zio-http-benchmarks/src/main/scala/zhttp.benchmarks/HttpCollectEval.scala

@@ -2,8 +2,6 @@ package zio.benchmarks
 
 import java.util.concurrent.TimeUnit
 
-import zio.{Trace, Unsafe}
-
 import zio.http._
 
 import org.openjdk.jmh.annotations._

zio-http-benchmarks/src/main/scala/zhttp.benchmarks/HttpCombineEval.scala

@@ -2,8 +2,6 @@ package zio.benchmarks
 
 import java.util.concurrent.TimeUnit
 
-import zio.{Trace, Unsafe}
-
 import zio.http._
 
 import org.openjdk.jmh.annotations._

zio-http-benchmarks/src/main/scala/zhttp.benchmarks/HttpNestedFlatMapEval.scala

@@ -2,8 +2,6 @@ package zio.benchmarks
 
 import java.util.concurrent.TimeUnit
 
-import zio.{Trace, Unsafe}
-
 import zio.http._
 
 import org.openjdk.jmh.annotations._

zio-http-cli/src/main/scala/zio/http/endpoint/cli/CliRequest.scala

@@ -1,16 +1,6 @@
 package zio.http.endpoint.cli
 
-import java.io.{File, IOException}
-import java.nio.channels.FileChannel
-import java.nio.file.Path
-
-import scala.io.Source
-
 import zio._
-import zio.cli._
-import zio.json.ast._
-
-import zio.stream.{ZSink, ZStream}
 
 import zio.http._
 
@@ -28,16 +18,16 @@ private[cli] final case class CliRequest(
   saveResponse: Boolean = false,
 ) { self =>
 
-  def addBody(value: Retriever) =
+  def addBody(value: Retriever): CliRequest =
     self.copy(body = self.body ++ Chunk(value))
 
   def addHeader(name: String, value: String): CliRequest =
     self.copy(headers = self.headers.addHeader(name, value))
 
-  def addPathParam(value: String) =
+  def addPathParam(value: String): CliRequest =
     self.copy(url = self.url.copy(path = self.url.path / value))
 
-  def addQueryParam(key: String, value: String) =
+  def addQueryParam(key: String, value: String): CliRequest =
     self.copy(url = self.url.setQueryParams(self.url.queryParams.addQueryParam(key, value)))
 
   def method(method: Method): CliRequest =
@@ -63,6 +53,6 @@ private[cli] final case class CliRequest(
 
 private[cli] object CliRequest {
 
-  val empty = CliRequest(Chunk.empty, Headers.empty, Method.GET, URL.empty)
+  val empty: CliRequest = CliRequest(Chunk.empty, Headers.empty, Method.GET, URL.empty)
 
 }

zio-http-cli/src/test/scala/zio/http/endpoint/cli/CliSpec.scala

@@ -61,7 +61,7 @@ object CliSpec extends ZIOSpecDefault {
                 for {
                   text <- body.asMultipartForm
                     .map(_.formData)
-                    .map(_.map(_.stringValue.toString()))
+                    .map(_.map(_.stringValue.toString))
                     .map(_.toString())
                     .mapError(e => Response.error(Status.BadRequest, e.getMessage))
                 } yield if (text == "Chunk(Some(342.76))") Response.text("received 1") else Response.text(text)

zio-http-cli/src/test/scala/zio/http/endpoint/cli/CommandGen.scala

@@ -20,15 +20,15 @@ object CommandGen {
   def getSegment(segment: SegmentCodec[_]): (String, String) = {
     def fromSegment[A](segment: SegmentCodec[A]): (String, String) =
       segment match {
-        case SegmentCodec.UUID(name)                      => (name, "text")
-        case SegmentCodec.Text(name)                      => (name, "text")
-        case SegmentCodec.IntSeg(name)                    => (name, "integer")
-        case SegmentCodec.LongSeg(name)                   => (name, "integer")
-        case SegmentCodec.BoolSeg(name)                   => (name, "boolean")
-        case SegmentCodec.Literal(_)                      => ("", "")
-        case SegmentCodec.Trailing                        => ("", "")
-        case SegmentCodec.Empty                           => ("", "")
-        case SegmentCodec.Combined(left, right, combiner) =>
+        case SegmentCodec.UUID(name)        => (name, "text")
+        case SegmentCodec.Text(name)        => (name, "text")
+        case SegmentCodec.IntSeg(name)      => (name, "integer")
+        case SegmentCodec.LongSeg(name)     => (name, "integer")
+        case SegmentCodec.BoolSeg(name)     => (name, "boolean")
+        case SegmentCodec.Literal(_)        => ("", "")
+        case SegmentCodec.Trailing          => ("", "")
+        case SegmentCodec.Empty             => ("", "")
+        case SegmentCodec.Combined(_, _, _) =>
           ???
       }
 
@@ -37,7 +37,7 @@ object CommandGen {
 
   lazy val anyEndpoint: Gen[Any, HelpRepr[Endpoint[_, _, _, _, _]]] =
     anyCodec
-      .map(_.map2(getCommand(_)))
+      .map(_.map2(getCommand))
       .map(_.map(fromInputCodec(Doc.empty, _)))
 
   def getCommand(cliEndpoint: CliEndpoint): HelpDoc = {

zio-http-cli/src/test/scala/zio/http/endpoint/cli/EndpointGen.scala

@@ -7,7 +7,6 @@ import zio.schema.Schema
 
 import zio.http._
 import zio.http.codec._
-import zio.http.codec.internal.TextBinaryCodec
 import zio.http.endpoint._
 import zio.http.endpoint.cli.AuxGen._
 import zio.http.endpoint.cli.CliRepr.CliReprOf

zio-http-cli/src/test/scala/zio/http/endpoint/cli/OptionsGen.scala

@@ -8,7 +8,6 @@ import zio.schema.Schema
 
 import zio.http._
 import zio.http.codec._
-import zio.http.codec.internal.TextBinaryCodec
 import zio.http.endpoint.cli.AuxGen._
 import zio.http.endpoint.cli.CliRepr._
 

zio-http-example/src/main/scala/example/CombinerTypesExample.scala

@@ -1,6 +1,5 @@
 package example
 
-import zio.http.codec.HttpCodec._
 import zio.http.codec._
 
 object CombinerTypesExample extends App {

zio-http-example/src/main/scala/example/EndpointExamples.scala

@@ -2,7 +2,6 @@ package example
 
 import zio._
 
-import zio.http.Header.Authorization
 import zio.http._
 import zio.http.codec.PathCodec.path
 import zio.http.codec._

zio-http-example/src/main/scala/example/ServerSentEventAsJsonEndpoint.scala

@@ -9,7 +9,7 @@ import zio.stream.ZStream
 import zio.schema.{DeriveSchema, Schema}
 
 import zio.http._
-import zio.http.codec.{CodecConfig, HttpCodec}
+import zio.http.codec._
 import zio.http.endpoint._
 
 object ServerSentEventAsJsonEndpoint extends ZIOAppDefault {

zio-http-example/src/main/scala/example/ServerSentEventEndpoint.scala

@@ -8,7 +8,7 @@ import zio._
 import zio.stream.ZStream
 
 import zio.http._
-import zio.http.codec.{CodecConfig, HttpCodec}
+import zio.http.codec._
 import zio.http.endpoint._
 
 object ServerSentEventEndpoint extends ZIOAppDefault {

zio-http-example/src/main/scala/example/endpoint/EndpointWithMultipleErrorsUsingEither.scala

@@ -5,7 +5,7 @@ import zio._
 import zio.schema.{DeriveSchema, Schema}
 
 import zio.http._
-import zio.http.codec.{CodecConfig, HeaderCodec, PathCodec}
+import zio.http.codec._
 import zio.http.endpoint.{AuthType, Endpoint}
 
 object EndpointWithMultipleErrorsUsingEither extends ZIOAppDefault {

zio-http-example/src/main/scala/example/endpoint/EndpointWithMultipleUnifiedErrors.scala

@@ -7,7 +7,7 @@ import zio._
 import zio.schema.{DeriveSchema, Schema}
 
 import zio.http._
-import zio.http.codec.{CodecConfig, HeaderCodec, HttpCodec, PathCodec}
+import zio.http.codec._
 import zio.http.endpoint.{AuthType, Endpoint}
 
 object EndpointWithMultipleUnifiedErrors extends ZIOAppDefault {

zio-http-testkit/src/main/scala/zio/http/TestChannel.scala

@@ -3,7 +3,7 @@ package zio.http
 import zio._
 import zio.stacktracer.TracingImplicits.disableAutoTrace
 
-import zio.http.ChannelEvent.{Unregistered, UserEvent, UserEventTriggered}
+import zio.http.ChannelEvent._
 
 case class TestChannel(
   in: Queue[WebSocketChannelEvent],

zio-http/js/src/main/scala/zio/http/URLPlatformSpecific.scala

@@ -1,7 +1,5 @@
 package zio.http
 
-import scala.util.Try
-
 trait URLPlatformSpecific {
   self: URL =>
 }

zio-http/jvm/src/main/scala/zio/http/internal/BodyEncodingPlatformSpecific.scala

@@ -18,6 +18,6 @@ package zio.http.internal
 
 import zio.http.netty.NettyBody
 
-trait BodyEncodingPlatformSpecific {
+private[http] trait BodyEncodingPlatformSpecific {
   val default: BodyEncoding = NettyBody
 }

zio-http/jvm/src/main/scala/zio/http/netty/AsyncBodyReader.scala

@@ -29,7 +29,7 @@ import io.netty.buffer.ByteBufUtil
 import io.netty.channel.{ChannelHandlerContext, SimpleChannelInboundHandler}
 import io.netty.handler.codec.http.{HttpContent, LastHttpContent}
 
-abstract class AsyncBodyReader extends SimpleChannelInboundHandler[HttpContent](true) {
+private[netty] abstract class AsyncBodyReader extends SimpleChannelInboundHandler[HttpContent](true) {
   import zio.http.netty.AsyncBodyReader._
 
   private var state: State               = State.Buffering
@@ -138,7 +138,7 @@ abstract class AsyncBodyReader extends SimpleChannelInboundHandler[HttpContent](
   }
 }
 
-object AsyncBodyReader {
+private[netty] object AsyncBodyReader {
 
   sealed trait State
 

zio-http/jvm/src/main/scala/zio/http/netty/CachedDateHeader.scala

@@ -9,7 +9,7 @@ private object CachedDateHeader {
   lazy val default: CachedDateHeader = new CachedDateHeader()
 }
 
-final private class CachedDateHeader(
+private final class CachedDateHeader(
   clock: Clock = Clock.tickSeconds(ZoneOffset.UTC),
   dateEncoding: DateEncoding = DateEncoding.default,
 ) {

zio-http/jvm/src/main/scala/zio/http/netty/ChannelFactories.scala

@@ -25,7 +25,7 @@ import io.netty.channel.epoll._
 import io.netty.channel.kqueue._
 import io.netty.channel.socket.nio._
 import io.netty.incubator.channel.uring._
-object ChannelFactories {
+private[netty] object ChannelFactories {
 
   private[zio] def make[A <: Channel](channel: => A)(implicit trace: Trace): UIO[ChannelFactory[A]] =
     ZIO.succeed(new ChannelFactory[A] {

zio-http/jvm/src/main/scala/zio/http/netty/EventLoopGroups.scala

@@ -16,7 +16,6 @@
 
 package zio.http.netty
 
-import java.time.temporal.TemporalUnit
 import java.util.concurrent.Executor
 
 import scala.concurrent.duration.TimeUnit

zio-http/jvm/src/main/scala/zio/http/netty/HybridContentLengthHandler.scala

@@ -5,7 +5,7 @@ import io.netty.handler.codec.http.HttpUtil.getContentLength
 import io.netty.handler.codec.http._
 import io.netty.handler.stream.ChunkedWriteHandler
 
-class HybridContentLengthHandler(maxAggregatedLength: Int) extends ChannelInboundHandlerAdapter {
+private[netty] class HybridContentLengthHandler(maxAggregatedLength: Int) extends ChannelInboundHandlerAdapter {
   var maxLength                                                        = maxAggregatedLength
   override def channelRead(ctx: ChannelHandlerContext, msg: Any): Unit = {
     msg match {

zio-http/jvm/src/main/scala/zio/http/netty/NettyBody.scala

@@ -79,7 +79,7 @@ object NettyBody extends BodyEncoding {
     override def asStream(implicit trace: Trace): ZStream[Any, Throwable, Byte] =
       ZStream.unwrap(asChunk.map(ZStream.fromChunk(_)))
 
-    override def toString(): String = s"Body.fromAsciiString($asciiString)"
+    override def toString: String = s"Body.fromAsciiString($asciiString)"
 
     private[zio] override def unsafeAsArray(implicit unsafe: Unsafe): Array[Byte] = asciiString.array()
 
@@ -131,7 +131,7 @@ object NettyBody extends BodyEncoding {
 
     override def isEmpty: Boolean = false
 
-    override def toString(): String = s"AsyncBody($unsafeAsync)"
+    override def toString: String = s"AsyncBody($unsafeAsync)"
 
     override def contentType(newContentType: Body.ContentType): Body = copy(contentType = Some(newContentType))
   }

zio-http/jvm/src/main/scala/zio/http/netty/NettyBodyWriter.scala

@@ -32,7 +32,7 @@ import io.netty.buffer.Unpooled
 import io.netty.channel._
 import io.netty.handler.codec.http.{DefaultHttpContent, LastHttpContent}
 
-object NettyBodyWriter {
+private[netty] object NettyBodyWriter {
 
   @tailrec
   def writeAndFlush(

zio-http/jvm/src/main/scala/zio/http/netty/NettyChannel.scala

@@ -16,12 +16,12 @@
 
 package zio.http.netty
 
+import zio._
 import zio.stacktracer.TracingImplicits.disableAutoTrace
-import zio.{Task, Trace, UIO, ZIO}
 
 import io.netty.channel.{Channel => JChannel, ChannelFuture => JChannelFuture}
 
-final case class NettyChannel[-A](
+private[netty] final case class NettyChannel[-A](
   private val channel: JChannel,
   private val convert: A => Any,
 ) {
@@ -67,6 +67,6 @@ final case class NettyChannel[-A](
     }
 }
 
-object NettyChannel {
+private[netty] object NettyChannel {
   def make[A](channel: JChannel): NettyChannel[A] = NettyChannel(channel, identity)
 }