@@ -7,7 +7,6 @@ import io.grpc.Channel
7
7
import org .http4s .Uri
8
8
import org .http4s .client .Client
9
9
import org .ivovk .connect_rpc_scala .http .codec .{JsonSerDeser , JsonSerDeserBuilder , ProtoMessageCodec }
10
- import org .ivovk .connect_rpc_scala .http .{HeaderMapping , HeadersFilter }
11
10
import org .ivovk .connect_rpc_scala .http4s .client .ConnectHttp4sChannel
12
11
13
12
object ConnectHttp4sChannelBuilder {
@@ -16,53 +15,29 @@ object ConnectHttp4sChannelBuilder {
16
15
new ConnectHttp4sChannelBuilder (
17
16
client = client,
18
17
customJsonSerDeser = None ,
19
- incomingHeadersFilter = HeaderMapping .DefaultIncomingHeadersFilter ,
20
- outgoingHeadersFilter = HeaderMapping .DefaultOutgoingHeadersFilter ,
21
18
useBinaryFormat = false ,
22
19
)
23
20
}
24
21
25
22
class ConnectHttp4sChannelBuilder [F [_]: Async ] private (
26
23
client : Client [F ],
27
24
customJsonSerDeser : Option [JsonSerDeser [F ]],
28
- incomingHeadersFilter : HeadersFilter ,
29
- outgoingHeadersFilter : HeadersFilter ,
30
25
useBinaryFormat : Boolean ,
31
26
) {
32
27
33
28
private def copy (
34
29
customJsonSerDeser : Option [JsonSerDeser [F ]] = customJsonSerDeser,
35
- incomingHeadersFilter : HeadersFilter = incomingHeadersFilter,
36
- outgoingHeadersFilter : HeadersFilter = outgoingHeadersFilter,
37
30
useBinaryFormat : Boolean = useBinaryFormat,
38
31
): ConnectHttp4sChannelBuilder [F ] =
39
32
new ConnectHttp4sChannelBuilder (
40
33
client,
41
34
customJsonSerDeser,
42
- incomingHeadersFilter,
43
- outgoingHeadersFilter,
44
35
useBinaryFormat,
45
36
)
46
37
47
38
def withJsonCodecConfigurator (method : Endo [JsonSerDeserBuilder [F ]]): ConnectHttp4sChannelBuilder [F ] =
48
39
copy(customJsonSerDeser = Some (method(JsonSerDeserBuilder [F ]()).build))
49
40
50
- /**
51
- * Filter for incoming headers.
52
- *
53
- * By default, headers with "connection" prefix are filtered out (GRPC requirement).
54
- */
55
- def withIncomingHeadersFilter (filter : String => Boolean ): ConnectHttp4sChannelBuilder [F ] =
56
- copy(incomingHeadersFilter = filter)
57
-
58
- /**
59
- * Filter for outgoing headers.
60
- *
61
- * By default, headers with "grpc-" prefix are filtered out.
62
- */
63
- def withOutgoingHeadersFilter (filter : String => Boolean ): ConnectHttp4sChannelBuilder [F ] =
64
- copy(outgoingHeadersFilter = filter)
65
-
66
41
/**
67
42
* Use protobuf binary format for messages.
68
43
*
@@ -79,11 +54,7 @@ class ConnectHttp4sChannelBuilder[F[_]: Async] private (
79
54
if useBinaryFormat then ProtoMessageCodec [F ]()
80
55
else customJsonSerDeser.getOrElse(JsonSerDeserBuilder [F ]().build).codec
81
56
82
- val headerMapping = Http4sHeaderMapping (
83
- incomingHeadersFilter,
84
- outgoingHeadersFilter,
85
- treatTrailersAsHeaders = true ,
86
- )
57
+ val headerMapping = Http4sHeaderMapping (_ => true , _ => true , treatTrailersAsHeaders = true )
87
58
88
59
new ConnectHttp4sChannel (
89
60
httpClient = client,
0 commit comments