Skip to content

Commit 22caa5a

Browse files
987Nabil987Nabil
authored
Housekeeping (#3111)
1 parent c9dad3c commit 22caa5a

File tree

73 files changed

+120
-184
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+120
-184
lines changed

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

+18-22
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,22 @@ import scala.jdk.CollectionConverters._
55
import zio.http.gen.grpc._
66
import zio.http.gen.scala.{Code, CodeGen}
77

8+
import com.google.protobuf._
89
import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse
9-
import com.google.protobuf.{Descriptors, ExtensionRegistry}
1010
import protocgen.{CodeGenApp, CodeGenRequest, CodeGenResponse}
11-
import scalapb.compiler.{DescriptorImplicits, ProtobufGenerator}
12-
import scalapb.options.Scalapb
11+
import scalapb.compiler._
1312

1413
object ZIOHttpGRPCGen extends CodeGenApp {
1514

1615
def process(request: CodeGenRequest): CodeGenResponse =
1716
ProtobufGenerator.parseParameters(request.parameter) match {
1817
case Right(_) =>
1918
val services = request.filesToGenerate.flatMap(fromProtobuf(_).files)
20-
val schemas = services.map(getImplicitSchemas(_)).map { case (pkg, tpes) =>
19+
val schemas = services.map(getImplicitSchemas).map { case (pkg, tpes) =>
2120
schemasFile(pkg, tpes)
2221
}
2322
CodeGenResponse.succeed(
24-
schemas ++ services.map(fileToPluginCode(_)),
23+
schemas ++ services.map(fileToPluginCode),
2524
Set(CodeGeneratorResponse.Feature.FEATURE_PROTO3_OPTIONAL),
2625
)
2726
case Left(error) =>
@@ -55,7 +54,7 @@ object ZIOHttpGRPCGen extends CodeGenApp {
5554
val content =
5655
s"package ${pkg.mkString(".")} \nobject Schemas {\n" +
5756
"import zio.schema.{DeriveSchema, Schema}\n" +
58-
tpes.distinct.map(tpeToSchema(_)).mkString("") +
57+
tpes.distinct.map(tpeToSchema).mkString("") +
5958
"\n}"
6059
b.setContent(content)
6160
b.build
@@ -66,39 +65,36 @@ object ZIOHttpGRPCGen extends CodeGenApp {
6665
}
6766

6867
def fromDescriptor(file: Descriptors.FileDescriptor): Protobuf.File = {
69-
val deps = file
70-
.getDependencies()
71-
.asScala
72-
.toList
68+
val deps = file.getDependencies.asScala.toList
7369
.map(_.getName())
74-
val opt = file.getOptions()
75-
val pkg = if (opt.hasJavaPackage() && opt.getJavaPackage() != "") opt.getJavaPackage() else file.getPackage()
70+
val opt = file.getOptions
71+
val pkg = if (opt.hasJavaPackage && opt.getJavaPackage != "") opt.getJavaPackage else file.getPackage
7672
val pkgPath = if (pkg == "") Nil else pkg.split('.').toList
7773
val name0 =
78-
if (opt.hasJavaOuterClassname() && opt.getJavaOuterClassname() != "") opt.getJavaOuterClassname()
79-
else file.getName()
74+
if (opt.hasJavaOuterClassname && opt.getJavaOuterClassname != "") opt.getJavaOuterClassname
75+
else file.getName
8076
val name = if (name0.endsWith(".proto")) name0.dropRight(6) else name0
8177

8278
def fromService(service: Descriptors.ServiceDescriptor): Protobuf.Service =
8379
Protobuf.Service(
84-
service.getName(),
85-
service.getMethods.asScala.toList.map(fromMethod(_)),
80+
service.getName,
81+
service.getMethods.asScala.toList.map(fromMethod),
8682
)
8783

8884
def fromMethod(method: Descriptors.MethodDescriptor): Protobuf.Method =
8985
Protobuf.Method(
90-
method.getName(),
91-
method.getInputType().getName(),
92-
method.getOutputType().getName(),
93-
method.isClientStreaming(),
94-
method.isServerStreaming(),
86+
method.getName,
87+
method.getInputType.getName,
88+
method.getOutputType.getName,
89+
method.isClientStreaming,
90+
method.isServerStreaming,
9591
)
9692

9793
Protobuf.File(
9894
name,
9995
pkgPath,
10096
deps,
101-
file.getServices().asScala.toList.map(fromService(_)),
97+
file.getServices.asScala.toList.map(fromService),
10298
)
10399
}
104100

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

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ package zio.benchmarks
22

33
import java.util.concurrent.TimeUnit
44

5-
import zio.{Trace, Unsafe}
6-
75
import zio.http._
86

97
import org.openjdk.jmh.annotations._

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

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ package zio.benchmarks
22

33
import java.util.concurrent.TimeUnit
44

5-
import zio.{Trace, Unsafe}
6-
75
import zio.http._
86

97
import org.openjdk.jmh.annotations._

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

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ package zio.benchmarks
22

33
import java.util.concurrent.TimeUnit
44

5-
import zio.{Trace, Unsafe}
6-
75
import zio.http._
86

97
import org.openjdk.jmh.annotations._

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

+4-14
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
11
package zio.http.endpoint.cli
22

3-
import java.io.{File, IOException}
4-
import java.nio.channels.FileChannel
5-
import java.nio.file.Path
6-
7-
import scala.io.Source
8-
93
import zio._
10-
import zio.cli._
11-
import zio.json.ast._
12-
13-
import zio.stream.{ZSink, ZStream}
144

155
import zio.http._
166

@@ -28,16 +18,16 @@ private[cli] final case class CliRequest(
2818
saveResponse: Boolean = false,
2919
) { self =>
3020

31-
def addBody(value: Retriever) =
21+
def addBody(value: Retriever): CliRequest =
3222
self.copy(body = self.body ++ Chunk(value))
3323

3424
def addHeader(name: String, value: String): CliRequest =
3525
self.copy(headers = self.headers.addHeader(name, value))
3626

37-
def addPathParam(value: String) =
27+
def addPathParam(value: String): CliRequest =
3828
self.copy(url = self.url.copy(path = self.url.path / value))
3929

40-
def addQueryParam(key: String, value: String) =
30+
def addQueryParam(key: String, value: String): CliRequest =
4131
self.copy(url = self.url.setQueryParams(self.url.queryParams.addQueryParam(key, value)))
4232

4333
def method(method: Method): CliRequest =
@@ -63,6 +53,6 @@ private[cli] final case class CliRequest(
6353

6454
private[cli] object CliRequest {
6555

66-
val empty = CliRequest(Chunk.empty, Headers.empty, Method.GET, URL.empty)
56+
val empty: CliRequest = CliRequest(Chunk.empty, Headers.empty, Method.GET, URL.empty)
6757

6858
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ object CliSpec extends ZIOSpecDefault {
6161
for {
6262
text <- body.asMultipartForm
6363
.map(_.formData)
64-
.map(_.map(_.stringValue.toString()))
64+
.map(_.map(_.stringValue.toString))
6565
.map(_.toString())
6666
.mapError(e => Response.error(Status.BadRequest, e.getMessage))
6767
} 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

+10-10
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ object CommandGen {
2020
def getSegment(segment: SegmentCodec[_]): (String, String) = {
2121
def fromSegment[A](segment: SegmentCodec[A]): (String, String) =
2222
segment match {
23-
case SegmentCodec.UUID(name) => (name, "text")
24-
case SegmentCodec.Text(name) => (name, "text")
25-
case SegmentCodec.IntSeg(name) => (name, "integer")
26-
case SegmentCodec.LongSeg(name) => (name, "integer")
27-
case SegmentCodec.BoolSeg(name) => (name, "boolean")
28-
case SegmentCodec.Literal(_) => ("", "")
29-
case SegmentCodec.Trailing => ("", "")
30-
case SegmentCodec.Empty => ("", "")
31-
case SegmentCodec.Combined(left, right, combiner) =>
23+
case SegmentCodec.UUID(name) => (name, "text")
24+
case SegmentCodec.Text(name) => (name, "text")
25+
case SegmentCodec.IntSeg(name) => (name, "integer")
26+
case SegmentCodec.LongSeg(name) => (name, "integer")
27+
case SegmentCodec.BoolSeg(name) => (name, "boolean")
28+
case SegmentCodec.Literal(_) => ("", "")
29+
case SegmentCodec.Trailing => ("", "")
30+
case SegmentCodec.Empty => ("", "")
31+
case SegmentCodec.Combined(_, _, _) =>
3232
???
3333
}
3434

@@ -37,7 +37,7 @@ object CommandGen {
3737

3838
lazy val anyEndpoint: Gen[Any, HelpRepr[Endpoint[_, _, _, _, _]]] =
3939
anyCodec
40-
.map(_.map2(getCommand(_)))
40+
.map(_.map2(getCommand))
4141
.map(_.map(fromInputCodec(Doc.empty, _)))
4242

4343
def getCommand(cliEndpoint: CliEndpoint): HelpDoc = {

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

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import zio.schema.Schema
77

88
import zio.http._
99
import zio.http.codec._
10-
import zio.http.codec.internal.TextBinaryCodec
1110
import zio.http.endpoint._
1211
import zio.http.endpoint.cli.AuxGen._
1312
import zio.http.endpoint.cli.CliRepr.CliReprOf

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

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import zio.schema.Schema
88

99
import zio.http._
1010
import zio.http.codec._
11-
import zio.http.codec.internal.TextBinaryCodec
1211
import zio.http.endpoint.cli.AuxGen._
1312
import zio.http.endpoint.cli.CliRepr._
1413

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

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package example
22

3-
import zio.http.codec.HttpCodec._
43
import zio.http.codec._
54

65
object CombinerTypesExample extends App {

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

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package example
22

33
import zio._
44

5-
import zio.http.Header.Authorization
65
import zio.http._
76
import zio.http.codec.PathCodec.path
87
import zio.http.codec._

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import zio.stream.ZStream
99
import zio.schema.{DeriveSchema, Schema}
1010

1111
import zio.http._
12-
import zio.http.codec.{CodecConfig, HttpCodec}
12+
import zio.http.codec._
1313
import zio.http.endpoint._
1414

1515
object ServerSentEventAsJsonEndpoint extends ZIOAppDefault {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import zio._
88
import zio.stream.ZStream
99

1010
import zio.http._
11-
import zio.http.codec.{CodecConfig, HttpCodec}
11+
import zio.http.codec._
1212
import zio.http.endpoint._
1313

1414
object ServerSentEventEndpoint extends ZIOAppDefault {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import zio._
55
import zio.schema.{DeriveSchema, Schema}
66

77
import zio.http._
8-
import zio.http.codec.{CodecConfig, HeaderCodec, PathCodec}
8+
import zio.http.codec._
99
import zio.http.endpoint.{AuthType, Endpoint}
1010

1111
object EndpointWithMultipleErrorsUsingEither extends ZIOAppDefault {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import zio._
77
import zio.schema.{DeriveSchema, Schema}
88

99
import zio.http._
10-
import zio.http.codec.{CodecConfig, HeaderCodec, HttpCodec, PathCodec}
10+
import zio.http.codec._
1111
import zio.http.endpoint.{AuthType, Endpoint}
1212

1313
object EndpointWithMultipleUnifiedErrors extends ZIOAppDefault {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package zio.http
33
import zio._
44
import zio.stacktracer.TracingImplicits.disableAutoTrace
55

6-
import zio.http.ChannelEvent.{Unregistered, UserEvent, UserEventTriggered}
6+
import zio.http.ChannelEvent._
77

88
case class TestChannel(
99
in: Queue[WebSocketChannelEvent],

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

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package zio.http
22

3-
import scala.util.Try
4-
53
trait URLPlatformSpecific {
64
self: URL =>
75
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ package zio.http.internal
1818

1919
import zio.http.netty.NettyBody
2020

21-
trait BodyEncodingPlatformSpecific {
21+
private[http] trait BodyEncodingPlatformSpecific {
2222
val default: BodyEncoding = NettyBody
2323
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import io.netty.buffer.ByteBufUtil
2929
import io.netty.channel.{ChannelHandlerContext, SimpleChannelInboundHandler}
3030
import io.netty.handler.codec.http.{HttpContent, LastHttpContent}
3131

32-
abstract class AsyncBodyReader extends SimpleChannelInboundHandler[HttpContent](true) {
32+
private[netty] abstract class AsyncBodyReader extends SimpleChannelInboundHandler[HttpContent](true) {
3333
import zio.http.netty.AsyncBodyReader._
3434

3535
private var state: State = State.Buffering
@@ -138,7 +138,7 @@ abstract class AsyncBodyReader extends SimpleChannelInboundHandler[HttpContent](
138138
}
139139
}
140140

141-
object AsyncBodyReader {
141+
private[netty] object AsyncBodyReader {
142142

143143
sealed trait State
144144

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ private object CachedDateHeader {
99
lazy val default: CachedDateHeader = new CachedDateHeader()
1010
}
1111

12-
final private class CachedDateHeader(
12+
private final class CachedDateHeader(
1313
clock: Clock = Clock.tickSeconds(ZoneOffset.UTC),
1414
dateEncoding: DateEncoding = DateEncoding.default,
1515
) {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import io.netty.channel.epoll._
2525
import io.netty.channel.kqueue._
2626
import io.netty.channel.socket.nio._
2727
import io.netty.incubator.channel.uring._
28-
object ChannelFactories {
28+
private[netty] object ChannelFactories {
2929

3030
private[zio] def make[A <: Channel](channel: => A)(implicit trace: Trace): UIO[ChannelFactory[A]] =
3131
ZIO.succeed(new ChannelFactory[A] {

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

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package zio.http.netty
1818

19-
import java.time.temporal.TemporalUnit
2019
import java.util.concurrent.Executor
2120

2221
import scala.concurrent.duration.TimeUnit

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import io.netty.handler.codec.http.HttpUtil.getContentLength
55
import io.netty.handler.codec.http._
66
import io.netty.handler.stream.ChunkedWriteHandler
77

8-
class HybridContentLengthHandler(maxAggregatedLength: Int) extends ChannelInboundHandlerAdapter {
8+
private[netty] class HybridContentLengthHandler(maxAggregatedLength: Int) extends ChannelInboundHandlerAdapter {
99
var maxLength = maxAggregatedLength
1010
override def channelRead(ctx: ChannelHandlerContext, msg: Any): Unit = {
1111
msg match {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ object NettyBody extends BodyEncoding {
7979
override def asStream(implicit trace: Trace): ZStream[Any, Throwable, Byte] =
8080
ZStream.unwrap(asChunk.map(ZStream.fromChunk(_)))
8181

82-
override def toString(): String = s"Body.fromAsciiString($asciiString)"
82+
override def toString: String = s"Body.fromAsciiString($asciiString)"
8383

8484
private[zio] override def unsafeAsArray(implicit unsafe: Unsafe): Array[Byte] = asciiString.array()
8585

@@ -131,7 +131,7 @@ object NettyBody extends BodyEncoding {
131131

132132
override def isEmpty: Boolean = false
133133

134-
override def toString(): String = s"AsyncBody($unsafeAsync)"
134+
override def toString: String = s"AsyncBody($unsafeAsync)"
135135

136136
override def contentType(newContentType: Body.ContentType): Body = copy(contentType = Some(newContentType))
137137
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import io.netty.buffer.Unpooled
3232
import io.netty.channel._
3333
import io.netty.handler.codec.http.{DefaultHttpContent, LastHttpContent}
3434

35-
object NettyBodyWriter {
35+
private[netty] object NettyBodyWriter {
3636

3737
@tailrec
3838
def writeAndFlush(

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616

1717
package zio.http.netty
1818

19+
import zio._
1920
import zio.stacktracer.TracingImplicits.disableAutoTrace
20-
import zio.{Task, Trace, UIO, ZIO}
2121

2222
import io.netty.channel.{Channel => JChannel, ChannelFuture => JChannelFuture}
2323

24-
final case class NettyChannel[-A](
24+
private[netty] final case class NettyChannel[-A](
2525
private val channel: JChannel,
2626
private val convert: A => Any,
2727
) {
@@ -67,6 +67,6 @@ final case class NettyChannel[-A](
6767
}
6868
}
6969

70-
object NettyChannel {
70+
private[netty] object NettyChannel {
7171
def make[A](channel: JChannel): NettyChannel[A] = NettyChannel(channel, identity)
7272
}

0 commit comments

Comments
 (0)