Minor fixes for Swift demos

The current.adapter data member is never nil in the context of the demos
zeroc-ice · Oct 10, 2019 · b444aab · b444aab
1 parent 2e94e2d
commit b444aab
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 13 deletions.
diff --git a/swift/Glacier2/callback/Sources/Server/main.swift b/swift/Glacier2/callback/Sources/Server/main.swift
@@ -11,8 +11,8 @@ setbuf(__stdoutp, nil)
 class CallbackI: Callback {
     func initiateCallback(proxy: CallbackReceiverPrx?, current: Current) {
         do {
-            let proxyName = current.adapter?.getCommunicator().proxyToString(proxy)
-            print("initiating callback to: \(String(describing: proxyName)))")
+            let proxyName = current.adapter!.getCommunicator().proxyToString(proxy)
+            print("initiating callback to: \(proxyName)")
             try proxy?.callback()
         } catch {
             print("Error \(error)")
@@ -21,7 +21,7 @@ class CallbackI: Callback {
 
     func shutdown(current: Current) {
         print("shutting down...")
-        current.adapter?.getCommunicator().shutdown()
+        current.adapter!.getCommunicator().shutdown()
     }
 }
 

diff --git a/swift/Ice/async/Sources/Server/main.swift b/swift/Ice/async/Sources/Server/main.swift
@@ -41,7 +41,7 @@ class HelloI: Hello {
         serialQueue.async {
             print("Shutting down...")
             self.done = true
-            current.adapter?.getCommunicator().shutdown()
+            current.adapter!.getCommunicator().shutdown()
         }
     }
 }

diff --git a/swift/Ice/asyncInvocation/Sources/Server/CalculatorI.swift b/swift/Ice/asyncInvocation/Sources/Server/CalculatorI.swift
@@ -34,6 +34,6 @@ class CalculatorI: Calculator {
     }
 
     func shutdown(current: Ice.Current) {
-        current.adapter?.getCommunicator().shutdown()
+        current.adapter!.getCommunicator().shutdown()
     }
 }
diff --git a/swift/Ice/context/Sources/Server/ContextI.swift b/swift/Ice/context/Sources/Server/ContextI.swift
@@ -12,6 +12,6 @@ class ContextI: Context {
 
     func shutdown(current: Ice.Current) {
         print("Shutting down...")
-        current.adapter?.getCommunicator().shutdown()
+        current.adapter!.getCommunicator().shutdown()
     }
 }
diff --git a/swift/Ice/hello/Sources/Server/main.swift b/swift/Ice/hello/Sources/Server/main.swift
@@ -18,7 +18,7 @@ class HelloI: Hello {
 
     func shutdown(current: Ice.Current) throws {
         print("Shutting down...")
-        current.adapter?.getCommunicator().shutdown()
+        current.adapter!.getCommunicator().shutdown()
     }
 }
 

diff --git a/swift/Ice/interceptor/Sources/Server/ThermostatI.swift b/swift/Ice/interceptor/Sources/Server/ThermostatI.swift
@@ -17,6 +17,6 @@ class ThermostatI: Thermostat {
 
     func shutdown(current: Ice.Current) {
         print("Shutting down...")
-        current.adapter?.getCommunicator().shutdown()
+        current.adapter!.getCommunicator().shutdown()
     }
 }
diff --git a/swift/Ice/invoke/Sources/Server/PrinterI.swift b/swift/Ice/invoke/Sources/Server/PrinterI.swift
@@ -76,7 +76,7 @@ class PrinterI: Ice.Blobject {
             outStream.endEncapsulation()
             ret = (ok: false, outParams: outStream.finished())
         case "shutdown":
-            current.adapter?.getCommunicator().shutdown()
+            current.adapter!.getCommunicator().shutdown()
             ret = (ok: true, outParams: Data())
         default:
             throw Ice.OperationNotExistException(id: current.id, facet: current.facet, operation: current.operation)

diff --git a/swift/Ice/optional/Sources/Server/ContactDBI.swift b/swift/Ice/optional/Sources/Server/ContactDBI.swift
@@ -54,6 +54,6 @@ class ContactDBI: ContactDB {
 
     func shutdown(current: Ice.Current) {
         print("Shutting down...")
-        current.adapter?.getCommunicator().shutdown()
+        current.adapter!.getCommunicator().shutdown()
     }
 }
diff --git a/swift/Ice/throughput/Sources/Server/main.swift b/swift/Ice/throughput/Sources/Server/main.swift
@@ -70,7 +70,7 @@ class ThroughputI: Throughput {
     }
 
     func shutdown(current: Current) throws {
-        current.adapter?.getCommunicator().shutdown()
+        current.adapter!.getCommunicator().shutdown()
     }
 }
 

diff --git a/swift/IceDiscovery/hello/Sources/Server/main.swift b/swift/IceDiscovery/hello/Sources/Server/main.swift
@@ -18,7 +18,7 @@ class HelloI: Hello {
 
     func shutdown(current: Ice.Current) throws {
         print("Shutting down...")
-        current.adapter?.getCommunicator().shutdown()
+        current.adapter!.getCommunicator().shutdown()
     }
 }
 

diff --git a/swift/IceDiscovery/replication/Sources/Server/main.swift b/swift/IceDiscovery/replication/Sources/Server/main.swift
@@ -21,7 +21,7 @@ class HelloI: Hello {
 
     func shutdown(current: Ice.Current) throws {
         print("Shutting down...")
-        current.adapter?.getCommunicator().shutdown()
+        current.adapter!.getCommunicator().shutdown()
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -70,7 +70,7 @@ class ThroughputI: Throughput { @@
         }
         func shutdown(current: Current) throws {
-            current.adapter?.getCommunicator().shutdown()
+            current.adapter!.getCommunicator().shutdown()
         }
     }
@@ Expand Down @@