Refactor local exceptions in Swift

cpp/src/slice2swift/Gen.cpp

@@ -1013,7 +1013,7 @@ Gen::TypesVisitor::visitEnum(const EnumPtr& p)
     out << nl << "let rawValue: " << enumType << " = try read(enumMaxValue: " << p->maxValue() << ")";
     out << nl << "guard let val = " << name << "(rawValue: rawValue) else";
     out << sb;
-    out << nl << "throw " << getUnqualified("Ice.MarshalException", swiftModule) << "(reason: \"invalid enum value\")";
+    out << nl << "throw " << getUnqualified("Ice.MarshalException", swiftModule) << "(\"invalid enum value\")";
     out << eb;
     out << nl << "return val";
     out << eb;

swift/src/Ice/CommunicatorI.swift

@@ -254,7 +254,7 @@ class CommunicatorI: LocalObject<ICECommunicator>, Communicator {
 
     func makeProxyImpl<ProxyImpl>(_ proxyString: String) throws -> ProxyImpl where ProxyImpl: ObjectPrxI {
         guard let proxy: ProxyImpl = try stringToProxyImpl(proxyString) else {
-            throw ParseException(str: "invalid empty proxy string")
+            throw ParseException("invalid empty proxy string")
         }
         return proxy
     }

swift/src/Ice/Connection.swift

@@ -24,7 +24,7 @@ extension InputStream {
     public func read() throws -> CompressBatch {
         let rawValue: UInt8 = try read(enumMaxValue: 2)
         guard let val = CompressBatch(rawValue: rawValue) else {
-            throw MarshalException(reason: "invalid enum value")
+            throw MarshalException("invalid enum value")
         }
         return val
     }
@@ -87,7 +87,7 @@ extension InputStream {
     public func read() throws -> ConnectionClose {
         let rawValue: UInt8 = try read(enumMaxValue: 2)
         guard let val = ConnectionClose(rawValue: rawValue) else {
-            throw MarshalException(reason: "invalid enum value")
+            throw MarshalException("invalid enum value")
         }
         return val
     }

swift/src/Ice/CurrentExtensions.swift

@@ -79,30 +79,33 @@ extension Current {
                     fatalError("Unexpected RequestFailedException subclass")
                 }
 
-            if rfe.id.name.isEmpty {
-                rfe.id = id
-            }
+            var id = rfe.id
+            var facet = rfe.facet
+            var operation = rfe.operation
 
-            if rfe.facet.isEmpty {
-                rfe.facet = facet
+            if id.name.isEmpty {
+                id = self.id
+                facet = self.facet
             }
 
-            if rfe.operation.isEmpty {
-                rfe.operation = operation
+            if operation.isEmpty {
+                operation = self.operation
             }
 
-            // We must call ice_print _after_ setting the properties above.
-            exceptionMessage = rfe.ice_print()
+            // [7..] to slice-off the "::Ice::" prefix
+            let typeName = String(exceptionId!.dropFirst(7))
+            exceptionMessage = RequestFailedException.makeMessage(
+                typeName: typeName, id: id, facet: facet, operation: operation)
 
             if requestId != 0 {
                 ostr.write(replyStatus.rawValue)
-                ostr.write(rfe.id)
-                if rfe.facet.isEmpty {
+                ostr.write(id)
+                if facet.isEmpty {
                     ostr.write(size: 0)
                 } else {
-                    ostr.write([rfe.facet])
+                    ostr.write([facet])
                 }
-                ostr.write(rfe.operation)
+                ostr.write(operation)
             }
 
         case let ex as UserException:
@@ -120,28 +123,23 @@ extension Current {
         case let ex as UnknownLocalException:
             exceptionId = ex.ice_id()
             replyStatus = .unknownLocalException
-            exceptionMessage = ex.unknown
+            exceptionMessage = ex.message
 
         case let ex as UnknownUserException:
             exceptionId = ex.ice_id()
             replyStatus = .unknownUserException
-            exceptionMessage = ex.unknown
+            exceptionMessage = ex.message
 
         case let ex as UnknownException:
             exceptionId = ex.ice_id()
             replyStatus = .unknownException
-            exceptionMessage = ex.unknown
+            exceptionMessage = ex.message
 
         case let ex as LocalException:
             exceptionId = ex.ice_id()
             replyStatus = .unknownLocalException
             exceptionMessage = "\(ex)"
 
-        case let ex as Exception:
-            exceptionId = ex.ice_id()
-            replyStatus = .unknownException
-            exceptionMessage = "\(ex)"
-
         default:
             replyStatus = .unknownException
             exceptionId = "\(type(of: error))"

swift/src/Ice/EndpointSelectionType.swift

@@ -21,7 +21,7 @@ extension InputStream {
     public func read() throws -> EndpointSelectionType {
         let rawValue: UInt8 = try read(enumMaxValue: 1)
         guard let val = EndpointSelectionType(rawValue: rawValue) else {
-            throw MarshalException(reason: "invalid enum value")
+            throw MarshalException("invalid enum value")
         }
         return val
     }

swift/src/Ice/Exception.swift

@@ -1,90 +1,4 @@
 // Copyright (c) ZeroC, Inc.
 
 /// Base protocol for Ice exceptions.
-public protocol Exception: Error {
-    /// Returns the type id of this exception.
-    ///
-    /// - returns: `String` - The type id of this exception.
-    func ice_id() -> String
-    static func ice_staticId() -> String
-}
-
-extension Exception {
-    public func ice_id() -> String {
-        return type(of: self).ice_staticId()
-    }
-}
-
-/// Base class for Ice run-time exceptions.
-open class LocalException: Exception, CustomStringConvertible {
-    public let file: String
-    public let line: Int32
-
-    public var description: String {
-        return "\(file): \(line): \(ice_id())\(ice_print())"
-    }
-
-    public init(file: String = #file, line: Int32 = #line) {
-        self.file = file
-        self.line = line
-    }
-
-    open class func ice_staticId() -> String {
-        return "::Ice::LocalException"
-    }
-
-    /// Returns a stringified description of this exception.
-    ///
-    /// - returns: `String` - The exception description.
-    open func ice_print() -> String {
-        return ""
-    }
-}
-
-/// Base class for Ice user exceptions.
-open class UserException: Exception {
-    public required init() {}
-
-    open func _iceReadImpl(from _: InputStream) throws {}
-    open func _iceWriteImpl(to _: OutputStream) {}
-
-    open func _usesClasses() -> Bool {
-        return false
-    }
-
-    /// Returns the Slice type ID of the exception.
-    ///
-    /// - returns: `String` The Slice type ID.
-    open class func ice_staticId() -> String {
-        return "::Ice::UserException"
-    }
-
-    open func _iceRead(from istr: InputStream) throws {
-        istr.startException()
-        try _iceReadImpl(from: istr)
-        try istr.endException()
-    }
-
-    open func _iceWrite(to ostr: OutputStream) {
-        ostr.startException()
-        _iceWriteImpl(to: ostr)
-        ostr.endException()
-    }
-}
-
-/// Error used to wrap C++ std::exception errors.
-public class RuntimeError: LocalException {
-    private let message: String
-
-    override public var description: String {
-        return message
-    }
-
-    override open class func ice_staticId() -> String {
-        return "::Ice::RuntimeError"
-    }
-
-    public init(_ message: String) {
-        self.message = message
-    }
-}
+public protocol Exception: Error {}

swift/src/Ice/Initialize.swift

@@ -12,7 +12,7 @@ import IceImpl
 //
 let factoriesRegistered: Bool = {
     ICEUtil.registerFactories(
-        exception: ExceptionFactory.self,
+        exception: LocalExceptionFactory.self,
         connectionInfo: ConnectionInfoFactory.self,
         endpointInfo: EndpointInfoFactory.self,
         adminFacet: AdminFacetFactory.self)