Review comment updates

swift/ArrowFlight/Sources/ArrowFlight/FlightClient.swift

@@ -35,7 +35,7 @@ public class FlightClient {
  }
  }
 
- public func listFlights(_ criteria :FlightCriteria, closure: (FlightInfo) throws -> Void ) async throws {
+ public func listFlights(_ criteria :FlightCriteria, closure: (FlightInfo) throws -> Void) async throws {
  let listFlights = client.makeListFlightsCall(criteria.toProtocol())
  for try await data in listFlights.responseStream {
  try closure(FlightInfo(data));

swift/ArrowFlight/Sources/ArrowFlight/RecordBatchStreamReader.swift

@@ -44,12 +44,12 @@ public class RecordBatchStreamReader: AsyncSequence, AsyncIteratorProtocol {
  }
 
  while true {
- let flight_data = try await self.streamIterator.next()
- if flight_data == nil {
+ let flightData = try await self.streamIterator.next()
+ if flightData == nil {
  return nil
  }
 
- let data = (flight_data as! Arrow_Flight_Protocol_FlightData).dataBody
+ let data = (flightData as! Arrow_Flight_Protocol_FlightData).dataBody
  switch reader.fromStream(data) {
  case .success(let rbResult):
  batches = rbResult.batches

swift/ArrowFlight/Tests/ArrowFlightTests/FlightTest.swift

@@ -77,7 +77,7 @@ final class MyFlightServer : ArrowFlightServer {
 
  let rb = try makeRecordBatch()
  try await writer.write(rb)
- }catch {
+ } catch {
  print("Unknown error: \(error)")
  }
  }
@@ -142,13 +142,13 @@ struct FlightServerImpl {
  print("server started on port \(server!.channel.localAddress!.port!)")
 
  // Wait on the server's `onClose` future to stop the program from exiting.
- }catch {
+ } catch {
  print("Unknown server error: \(error)")
  }
  }
 }
 
-public class FlightClientImpl {
+public class FlightClientTester {
  var client: FlightClient?
  var group: MultiThreadedEventLoopGroup?
  var channel: GRPCChannel?
@@ -248,18 +248,29 @@ public class FlightClientImpl {
  }
 }
 
-var serverup = false
+actor FlightServerData {
+ public var serverup = false
+ func SetServerUp(_ serverUp: Bool) {
+ self.serverup = serverUp
+ }
+
+ func IsServerUp() -> Bool {
+ return serverup
+ }
+}
+
 final class FlightTest: XCTestCase {
+ let serverData = FlightServerData()
+
  func testFlightServer() async throws {
-
  let basicTask = Task {
  try await FlightServerImpl.run()
  defer {
  print("server shutting down")
  try! FlightServerImpl.group?.syncShutdownGracefully()
  }
 
- serverup = true
+ await serverData.SetServerUp(true)
  try await FlightServerImpl.server?.onClose.get()
  return "done"
  }
@@ -269,11 +280,11 @@ final class FlightTest: XCTestCase {
  _ = FlightServerImpl.server?.close()
  }
 
- while !serverup {
+ while await !serverData.IsServerUp() {
  try await Task.sleep(nanoseconds: 1_000_000)
  }
 
- let clientImpl = try await FlightClientImpl()
+ let clientImpl = try await FlightClientTester()
  try await clientImpl.listActionTest()
  try await clientImpl.listFlightsTest()
  try await clientImpl.doActionTest()