reformat kotlin files

apache · Jul 5, 2023 · d108ced · d108ced
1 parent 774b824
commit d108ced
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/lib/kotlin/cross-test-client/src/main/kotlin/org/apache/thrift/test/TestClient.kt b/lib/kotlin/cross-test-client/src/main/kotlin/org/apache/thrift/test/TestClient.kt
@@ -101,9 +101,12 @@ class TestClient : CliktCommand() {
 
  private fun createProtocol(transport: TTransport): TProtocol =
  when (protocolType) {
- ProtocolType.Binary, ProtocolType.Multi -> TBinaryProtocol(transport)
- ProtocolType.Compact, ProtocolType.MultiCompact -> TCompactProtocol(transport)
- ProtocolType.Json, ProtocolType.MultiJson -> TJSONProtocol(transport)
+ ProtocolType.Binary,
+ ProtocolType.Multi -> TBinaryProtocol(transport)
+ ProtocolType.Compact,
+ ProtocolType.MultiCompact -> TCompactProtocol(transport)
+ ProtocolType.Json,
+ ProtocolType.MultiJson -> TJSONProtocol(transport)
  }
 
  private fun createTransport(): TNonblockingTransport =
@@ -283,7 +286,8 @@ class TestClient : CliktCommand() {
  if (whoa.size == 2 && whoa.containsKey(1L) && whoa.containsKey(2L)) {
  val firstMap = whoa[1L]!!
  val secondMap = whoa[2L]!!
- if (firstMap.size == 2 &&
+ if (
+ firstMap.size == 2 &&
  firstMap.containsKey(Numberz.TWO) &&
  firstMap.containsKey(Numberz.THREE) &&
  secondMap.size == 1 &&
@@ -361,7 +365,8 @@ class TestClient : CliktCommand() {
 
  private suspend fun multiplexTest(returnCode: Int): Int {
  var code = returnCode
- if (protocolType == ProtocolType.Multi ||
+ if (
+ protocolType == ProtocolType.Multi ||
  protocolType == ProtocolType.MultiJson ||
  protocolType == ProtocolType.MultiCompact
  ) {
@@ -574,7 +579,8 @@ private suspend fun ThriftTestClient.nestedMapTest(returnCode: Int): Int {
  } else {
  val m1 = mm[4]!!
  val m2 = mm[-4]!!
- if (m1[1] != 1 ||
+ if (
+ m1[1] != 1 ||
  m1[2] != 2 ||
  m1[3] != 3 ||
  m1[4] != 4 ||

diff --git a/lib/kotlin/cross-test-server/src/main/kotlin/org/apache/thrift/test/TestServer.kt b/lib/kotlin/cross-test-server/src/main/kotlin/org/apache/thrift/test/TestServer.kt
@@ -226,11 +226,12 @@ class TestServerCommand : CliktCommand() {
 
  private fun getProtocolFactory(): TProtocolFactory =
  when (protocolType) {
- ProtocolType.Json, ProtocolType.MultiJson -> TJSONProtocol.Factory()
- ProtocolType.Compact, ProtocolType.MultiCompact ->
- TCompactProtocol.Factory(stringLimit, containerLimit)
- ProtocolType.Binary, ProtocolType.Multi ->
- TBinaryProtocol.Factory(stringLimit, containerLimit)
+ ProtocolType.Json,
+ ProtocolType.MultiJson -> TJSONProtocol.Factory()
+ ProtocolType.Compact,
+ ProtocolType.MultiCompact -> TCompactProtocol.Factory(stringLimit, containerLimit)
+ ProtocolType.Binary,
+ ProtocolType.Multi -> TBinaryProtocol.Factory(stringLimit, containerLimit)
  }
 }
 
@@ -258,7 +259,8 @@ private fun getServerEngine(
  multiplexedProcessor.registerProcessor("ThriftTest", testProcessor)
  multiplexedProcessor.registerProcessor("SecondService", secondProcessor)
  when (serverType) {
- ServerType.NonBlocking, ServerType.ThreadedSelector -> {
+ ServerType.NonBlocking,
+ ServerType.ThreadedSelector -> {
  val tNonblockingServerSocket =
  TNonblockingServerSocket(NonblockingAbstractServerSocketArgs().port(port))
  when (serverType) {
@@ -283,7 +285,8 @@ private fun getServerEngine(
  }
  }
  }
- ServerType.Simple, ServerType.ThreadPool -> {
+ ServerType.Simple,
+ ServerType.ThreadPool -> {
  // SSL socket
  val tServerSocket: TServerSocket =
  if (ssl) {