Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core into feature/Restart-requestUrl
This commit is contained in:
commit
0340f9dda6
@ -152,6 +152,7 @@
|
|||||||
copyObject.customTimeoutTime = self.customTimeoutTime;
|
copyObject.customTimeoutTime = self.customTimeoutTime;
|
||||||
copyObject.backgroundRequest = self.backgroundRequest;
|
copyObject.backgroundRequest = self.backgroundRequest;
|
||||||
copyObject.URL = self.URL;
|
copyObject.URL = self.URL;
|
||||||
|
copyObject.actionMap = self.actionMap;
|
||||||
return copyObject;
|
return copyObject;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -18,6 +18,30 @@ public enum JSONError: Error {
|
|||||||
case error(message: String)
|
case error(message: String)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
extension JSONError: LocalizedError, CustomStringConvertible {
|
||||||
|
|
||||||
|
public var description: String {
|
||||||
|
switch self {
|
||||||
|
case .pathNotFound:
|
||||||
|
return "JSON path not found"
|
||||||
|
case .data(path: let path):
|
||||||
|
return "JSON data in \(path) is corrupt"
|
||||||
|
case .other(error: let error):
|
||||||
|
if let decodingError = error as? DecodingError {
|
||||||
|
// the only way to get the decoding error description and details...
|
||||||
|
return (decodingError as NSError).description
|
||||||
|
}
|
||||||
|
return error.localizedDescription
|
||||||
|
case .error(message: let message):
|
||||||
|
return message
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public var errorDescription: String? {
|
||||||
|
return description
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
extension JSONDictionary {
|
extension JSONDictionary {
|
||||||
|
|
||||||
public func toJSONString(options: JSONSerialization.WritingOptions = []) throws -> String {
|
public func toJSONString(options: JSONSerialization.WritingOptions = []) throws -> String {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user