spotless apply

connectrpc · May 15, 2024 · 112e545 · 112e545
1 parent 6fabe84
commit 112e545
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 23 deletions.
diff --git a/library/src/main/kotlin/com/connectrpc/protocols/ConnectInterceptor.kt b/library/src/main/kotlin/com/connectrpc/protocols/ConnectInterceptor.kt
@@ -122,8 +122,8 @@ internal class ConnectInterceptor(
                 } else {
                     message = responseBody
                     val isValidContentType =
-                        (serializationStrategy.serializationName() == "json" && contentTypeIsJSON(contentType))
-                                || contentType == "application/" + serializationStrategy.serializationName()
+                        (serializationStrategy.serializationName() == "json" && contentTypeIsJSON(contentType)) ||
+                            contentType == "application/" + serializationStrategy.serializationName()
                     if (isValidContentType) {
                         exception = null
                     } else {
@@ -184,11 +184,13 @@ internal class ConnectInterceptor(
                             // this an internal error. Otherwise, we infer a code from the HTTP status,
                             // which means a code of UNKNOWN since HTTP status is 200.
                             val code = if (contentType.startsWith("application/connect+")) Code.INTERNAL_ERROR else Code.UNKNOWN
-                            StreamResult.Complete(ConnectException(
-                                code = code,
-                                message = "unexpected content-type: $contentType",
-                                metadata = responseHeaders,
-                            ))
+                            StreamResult.Complete(
+                                ConnectException(
+                                    code = code,
+                                    message = "unexpected content-type: $contentType",
+                                    metadata = responseHeaders,
+                                ),
+                            )
                         } else {
                             responseCompressionPool =
                                 clientConfig.compressionPool(responseHeaders[CONNECT_STREAMING_CONTENT_ENCODING]?.first())
@@ -357,4 +359,4 @@ fun Headers.toLowercase(): Headers {
     }.aggregate { _: String, accumulator: List<String>?, element: Map.Entry<String, List<String>>, _: Boolean ->
         accumulator?.plus(element.value) ?: element.value
     }
-}
+}
diff --git a/library/src/main/kotlin/com/connectrpc/protocols/GRPCInterceptor.kt b/library/src/main/kotlin/com/connectrpc/protocols/GRPCInterceptor.kt
@@ -107,7 +107,7 @@ internal class GRPCInterceptor(
                             cause = ConnectException(
                                 code = Code.UNIMPLEMENTED,
                                 message = "unary stream has no messages",
-                                metadata = headers.plus(trailers)
+                                metadata = headers.plus(trailers),
                             ),
                         )
                     }
@@ -123,7 +123,7 @@ internal class GRPCInterceptor(
                             cause = ConnectException(
                                 code = Code.UNIMPLEMENTED,
                                 message = "unary stream has multiple messages",
-                                metadata = headers.plus(trailers)
+                                metadata = headers.plus(trailers),
                             ),
                         )
                     }
@@ -217,11 +217,11 @@ internal class GRPCInterceptor(
     }
 }
 
-internal fun contentTypeIsGRPC(contentType: String) : Boolean {
+internal fun contentTypeIsGRPC(contentType: String): Boolean {
     return contentType == "application/grpc" || contentType.startsWith("application/grpc+")
 }
 
-internal fun contentTypeIsExpectedGRPC(contentType: String, expectCodec: String) : Boolean {
-    return (expectCodec == "proto" && contentType == "application/grpc" )
-        || contentType == "application/grpc+$expectCodec"
-}
+internal fun contentTypeIsExpectedGRPC(contentType: String, expectCodec: String): Boolean {
+    return (expectCodec == "proto" && contentType == "application/grpc") ||
+        contentType == "application/grpc+$expectCodec"
+}
diff --git a/library/src/main/kotlin/com/connectrpc/protocols/GRPCWebInterceptor.kt b/library/src/main/kotlin/com/connectrpc/protocols/GRPCWebInterceptor.kt
@@ -295,11 +295,11 @@ internal class GRPCWebInterceptor(
     }
 }
 
-internal fun contentTypeIsGRPCWeb(contentType: String) : Boolean {
+internal fun contentTypeIsGRPCWeb(contentType: String): Boolean {
     return contentType == "application/grpc-web" || contentType.startsWith("application/grpc-web+")
 }
 
-internal fun contentTypeIsExpectedGRPCWeb(contentType: String, expectCodec: String) : Boolean {
-    return (expectCodec == "proto" && contentType == "application/grpc-web" )
-            || contentType == "application/grpc-web+$expectCodec"
-}
+internal fun contentTypeIsExpectedGRPCWeb(contentType: String, expectCodec: String): Boolean {
+    return (expectCodec == "proto" && contentType == "application/grpc-web") ||
+        contentType == "application/grpc-web+$expectCodec"
+}
diff --git a/library/src/test/kotlin/com/connectrpc/InterceptorChainTest.kt b/library/src/test/kotlin/com/connectrpc/InterceptorChainTest.kt
@@ -101,9 +101,11 @@ class InterceptorChainTest {
 
     @Test
     fun lifo_stream_result() {
-        val streamResult = streamingChain.streamResultFunction(StreamResult.Headers(
-            mapOf(CONTENT_TYPE to listOf("application/connect+encoding_type")),
-        )) as StreamResult.Headers
+        val streamResult = streamingChain.streamResultFunction(
+            StreamResult.Headers(
+                mapOf(CONTENT_TYPE to listOf("application/connect+encoding_type")),
+            ),
+        ) as StreamResult.Headers
         assertThat(streamResult.headers["id"]).containsExactly("4", "3", "2", "1")
     }