Merge pull request #790 from ikesyo/nsurlrequest-utilize-restricted-setter

Author: swift-ci

Foundation/NSURLRequest.swift

@@ -134,12 +134,12 @@ open class NSURLRequest : NSObject, NSSecureCoding, NSCopying, NSMutableCopying
 
     public init(url: URL, cachePolicy: NSURLRequest.CachePolicy, timeoutInterval: TimeInterval) {
         self.url = url
-        _cachePolicy = cachePolicy
-        _timeoutInterval = timeoutInterval
+        self.cachePolicy = cachePolicy
+        self.timeoutInterval = timeoutInterval
     }
 
     private func setValues(from source: NSURLRequest) {
-        self._allHTTPHeaderFields = source.allHTTPHeaderFields
+        self.allHTTPHeaderFields = source.allHTTPHeaderFields
         self.url = source.url
         self.mainDocumentURL = source.mainDocumentURL
         self.httpMethod = source.httpMethod
@@ -165,7 +165,7 @@ open class NSURLRequest : NSObject, NSSecureCoding, NSCopying, NSMutableCopying
         }
 
         if let encodedHeaders = aDecoder.decodeObject(forKey: "NS._allHTTPHeaderFields") as? NSDictionary {
-            self._allHTTPHeaderFields = encodedHeaders.reduce([String : String]()) { result, item in
+            self.allHTTPHeaderFields = encodedHeaders.reduce([String : String]()) { result, item in
                 var result = result
                 if let key = item.key as? NSString,
                     let value = item.value as? NSString {
@@ -184,10 +184,10 @@ open class NSURLRequest : NSObject, NSSecureCoding, NSCopying, NSMutableCopying
         }
 
         let encodedCachePolicy = aDecoder.decodeObject(forKey: "NS._cachePolicy") as! NSNumber
-        self._cachePolicy = CachePolicy(rawValue: encodedCachePolicy.uintValue)!
+        self.cachePolicy = CachePolicy(rawValue: encodedCachePolicy.uintValue)!
 
         let encodedTimeout = aDecoder.decodeObject(forKey: "NS._timeoutInterval") as! NSNumber
-        self._timeoutInterval = encodedTimeout.doubleValue
+        self.timeoutInterval = encodedTimeout.doubleValue
 
         let encodedHttpBody: Data? = aDecoder.withDecodedUnsafeBufferPointer(forKey: "NS.httpBody") {
             guard let buffer = $0 else { return nil }
@@ -199,16 +199,16 @@ open class NSURLRequest : NSObject, NSSecureCoding, NSCopying, NSMutableCopying
         }
 
         let encodedNetworkServiceType = aDecoder.decodeObject(forKey: "NS._networkServiceType") as! NSNumber
-        self._networkServiceType = NetworkServiceType(rawValue: encodedNetworkServiceType.uintValue)!
+        self.networkServiceType = NetworkServiceType(rawValue: encodedNetworkServiceType.uintValue)!
 
         let encodedCellularAccess = aDecoder.decodeObject(forKey: "NS._allowsCellularAccess") as! NSNumber
-        self._allowsCellularAccess = encodedCellularAccess.boolValue
+        self.allowsCellularAccess = encodedCellularAccess.boolValue
 
         let encodedHandleCookies = aDecoder.decodeObject(forKey: "NS._httpShouldHandleCookies") as! NSNumber
-        self._httpShouldHandleCookies = encodedHandleCookies.boolValue
+        self.httpShouldHandleCookies = encodedHandleCookies.boolValue
 
         let encodedUsePipelining = aDecoder.decodeObject(forKey: "NS._httpShouldUsePipelining") as! NSNumber
-        self._httpShouldUsePipelining = encodedUsePipelining.boolValue
+        self.httpShouldUsePipelining = encodedUsePipelining.boolValue
     }
 
     open func encode(with aCoder: NSCoder) {
@@ -217,20 +217,20 @@ open class NSURLRequest : NSObject, NSSecureCoding, NSCopying, NSMutableCopying
         }
 
         aCoder.encode(self.url?._bridgeToObjectiveC(), forKey: "NS.url")
-        aCoder.encode(self._allHTTPHeaderFields?._bridgeToObjectiveC(), forKey: "NS._allHTTPHeaderFields")
+        aCoder.encode(self.allHTTPHeaderFields?._bridgeToObjectiveC(), forKey: "NS._allHTTPHeaderFields")
         aCoder.encode(self.mainDocumentURL?._bridgeToObjectiveC(), forKey: "NS.mainDocumentURL")
         aCoder.encode(self.httpMethod?._bridgeToObjectiveC(), forKey: "NS.httpMethod")
-        aCoder.encode(self._cachePolicy.rawValue._bridgeToObjectiveC(), forKey: "NS._cachePolicy")
-        aCoder.encode(self._timeoutInterval._bridgeToObjectiveC(), forKey: "NS._timeoutInterval")
+        aCoder.encode(self.cachePolicy.rawValue._bridgeToObjectiveC(), forKey: "NS._cachePolicy")
+        aCoder.encode(self.timeoutInterval._bridgeToObjectiveC(), forKey: "NS._timeoutInterval")
         if let httpBody = self.httpBody?._bridgeToObjectiveC() {
             let bytePtr = httpBody.bytes.bindMemory(to: UInt8.self, capacity: httpBody.length)
             aCoder.encodeBytes(bytePtr, length: httpBody.length, forKey: "NS.httpBody")
         }
         //On macOS input stream is not encoded.
-        aCoder.encode(self._networkServiceType.rawValue._bridgeToObjectiveC(), forKey: "NS._networkServiceType")
-        aCoder.encode(self._allowsCellularAccess._bridgeToObjectiveC(), forKey: "NS._allowsCellularAccess")
-        aCoder.encode(self._httpShouldHandleCookies._bridgeToObjectiveC(), forKey: "NS._httpShouldHandleCookies")
-        aCoder.encode(self._httpShouldUsePipelining._bridgeToObjectiveC(), forKey: "NS._httpShouldUsePipelining")
+        aCoder.encode(self.networkServiceType.rawValue._bridgeToObjectiveC(), forKey: "NS._networkServiceType")
+        aCoder.encode(self.allowsCellularAccess._bridgeToObjectiveC(), forKey: "NS._allowsCellularAccess")
+        aCoder.encode(self.httpShouldHandleCookies._bridgeToObjectiveC(), forKey: "NS._httpShouldHandleCookies")
+        aCoder.encode(self.httpShouldUsePipelining._bridgeToObjectiveC(), forKey: "NS._httpShouldUsePipelining")
     }
 
     open override func isEqual(_ object: Any?) -> Bool {
@@ -245,10 +245,10 @@ open class NSURLRequest : NSObject, NSSecureCoding, NSCopying, NSMutableCopying
                 || (other.url == self.url
                     && other.mainDocumentURL == self.mainDocumentURL
                     && other.httpMethod == self.httpMethod
-                    && other._cachePolicy == self._cachePolicy
+                    && other.cachePolicy == self.cachePolicy
                     && other.httpBodyStream == self.httpBodyStream
-                    && other._allowsCellularAccess == self._allowsCellularAccess
-                    && other._httpShouldHandleCookies == self._httpShouldHandleCookies)
+                    && other.allowsCellularAccess == self.allowsCellularAccess
+                    && other.httpShouldHandleCookies == self.httpShouldHandleCookies)
         }
         return false
     }
@@ -265,27 +265,16 @@ open class NSURLRequest : NSObject, NSSecureCoding, NSCopying, NSMutableCopying
     /// document" policy. There may also be other future uses.
     /*@NSCopying*/ open fileprivate(set) var mainDocumentURL: URL?
 
-    internal var _cachePolicy: CachePolicy = .useProtocolCachePolicy
-    open var cachePolicy: CachePolicy {
-        return _cachePolicy
-    }
+    open internal(set) var cachePolicy: CachePolicy = .useProtocolCachePolicy
 
-    internal var _timeoutInterval: TimeInterval = 60.0
-    open var timeoutInterval: TimeInterval {
-        return _timeoutInterval
-    }
+    open internal(set) var timeoutInterval: TimeInterval = 60.0
 
     /// Returns the HTTP request method of the receiver.
     open fileprivate(set) var httpMethod: String? = "GET"
 
     /// A dictionary containing all the HTTP header fields
     /// of the receiver.
-    internal var _allHTTPHeaderFields: [String : String]? = nil
-    open var allHTTPHeaderFields: [String : String]? {
-        get {
-            return _allHTTPHeaderFields
-        }
-    }
+    open internal(set) var allHTTPHeaderFields: [String : String]? = nil
 
     /// Returns the value which corresponds to the given header field.
     ///
@@ -330,25 +319,13 @@ open class NSURLRequest : NSObject, NSSecureCoding, NSCopying, NSMutableCopying
         return nil
     }
 
-    internal var _networkServiceType: NetworkServiceType = .`default`
-    open var networkServiceType: NetworkServiceType {
-        return _networkServiceType
-    }
+    open internal(set) var networkServiceType: NetworkServiceType = .default
 
-    internal var _allowsCellularAccess: Bool = true
-    open var allowsCellularAccess: Bool {
-        return _allowsCellularAccess
-    }
+    open internal(set) var allowsCellularAccess: Bool = true
 
-    internal var _httpShouldHandleCookies: Bool = true
-    open var httpShouldHandleCookies: Bool {
-        return _httpShouldHandleCookies
-    }
+    open internal(set) var httpShouldHandleCookies: Bool = true
 
-    internal var _httpShouldUsePipelining: Bool = true
-    open var httpShouldUsePipelining: Bool {
-        return _httpShouldUsePipelining
-    }
+    open internal(set) var httpShouldUsePipelining: Bool = true
 }
 
 /// An `NSMutableURLRequest` object represents a mutable URL load
@@ -422,30 +399,18 @@ open class NSMutableURLRequest : NSURLRequest {
     }
 
     open override var cachePolicy: CachePolicy {
-        get {
-            return _cachePolicy
-        }
-        set {
-            _cachePolicy = newValue
-        }
+        get { return super.cachePolicy }
+        set { super.cachePolicy = newValue }
     }
 
     open override var timeoutInterval: TimeInterval {
-        get {
-            return _timeoutInterval
-        }
-        set {
-            _timeoutInterval = newValue
-        }
+        get { return super.timeoutInterval }
+        set { super.timeoutInterval = newValue }
     }
 
     open override var allHTTPHeaderFields: [String : String]? {
-        get {
-            return _allHTTPHeaderFields
-        }
-        set {
-            _allHTTPHeaderFields = newValue
-        }
+        get { return super.allHTTPHeaderFields }
+        set { super.allHTTPHeaderFields = newValue }
     }
 
     /// Sets the value of the given HTTP header field.
@@ -462,7 +427,7 @@ open class NSMutableURLRequest : NSURLRequest {
             f.removeValue(forKey: old.0)
         }
         f[field] = value
-        _allHTTPHeaderFields = f
+        allHTTPHeaderFields = f
     }
 
     /// Adds an HTTP header field in the current header dictionary.
@@ -483,7 +448,7 @@ open class NSMutableURLRequest : NSURLRequest {
         } else {
             f[field] = value
         }
-        _allHTTPHeaderFields = f
+        allHTTPHeaderFields = f
     }
 
     open override var httpBody: Data? {
@@ -529,39 +494,23 @@ open class NSMutableURLRequest : NSURLRequest {
     }
 
     open override var networkServiceType: NetworkServiceType {
-        get {
-            return _networkServiceType
-        }
-        set {
-            _networkServiceType = newValue
-        }
+        get { return super.networkServiceType }
+        set { super.networkServiceType = newValue }
     }
 
     open override var allowsCellularAccess: Bool {
-        get {
-            return _allowsCellularAccess
-        }
-        set {
-            _allowsCellularAccess = newValue
-        }
+        get { return super.allowsCellularAccess }
+        set { super.allowsCellularAccess = newValue }
     }
 
     open override var httpShouldHandleCookies: Bool {
-        get {
-            return _httpShouldHandleCookies
-        }
-        set {
-            _httpShouldHandleCookies = newValue
-        }
+        get { return super.httpShouldHandleCookies }
+        set { super.httpShouldHandleCookies = newValue }
     }
 
     open override var httpShouldUsePipelining: Bool {
-        get {
-            return _httpShouldUsePipelining
-        }
-        set {
-            _httpShouldUsePipelining = newValue
-        }
+        get { return super.httpShouldUsePipelining }
+        set { super.httpShouldUsePipelining = newValue }
     }
 }
 

Foundation/NSURLSession/NSURLSessionTask.swift

@@ -211,10 +211,7 @@ open class URLSessionTask : NSObject, NSCopying {
      * The error, if any, delivered via -URLSession:task:didCompleteWithError:
      * This property will be nil in the event that no error occured.
      */
-    fileprivate var _error: NSError?
-    /*@NSCopying*/ open var error: NSError? {
-        return self._error
-    }
+    /*@NSCopying*/ open fileprivate(set) var error: NSError?
 
     /// Suspend the task.
     ///
@@ -868,7 +865,7 @@ extension URLSessionTask {
         }
     }
     func completeTask(withError error: NSError) {
-        self._error = error
+        self.error = error
 
         guard case .transferFailed = internalState else {
             fatalError("Trying to complete the task, but its transfer isn't complete / failed.")