Refactor EndpointInfo in Swift #3195
Merged
+243
−381
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bernardnormier
commented
Nov 26, 2024
| @@ -15,10 +15,12 @@ class CommunicatorI: LocalObject<ICECommunicator>, Communicator { | |||
| self.initData = initData | |||
| do { | |||
| classGraphDepthMax = try initData.properties!.getIcePropertyAsInt("Ice.ClassGraphDepthMax") | |||
| precondition(classGraphDepthMax >= 1 && classGraphDepthMax <= 0x7FFF_FFFF, "Ice.ClassGraphDepthMax must be >= 0 and <= 0x7FFF_FFFF") | |||
| precondition( | |||
There was a problem hiding this comment.
We need to Swift format more often.
| @@ -2,77 +2,155 @@ | |||
|
|
|||
| import Foundation | |||
|
|
|||
| /// The user-level interface to an endpoint. | |||
| public protocol Endpoint: AnyObject, CustomStringConvertible { | |||
There was a problem hiding this comment.
Moved at the top of Endpoint.swift. Didn't change this protocol.
| /// | ||
| /// - returns: `String` - The string representation of the endpoint. | ||
| func toString() -> String | ||
| public init(underlying: EndpointInfo) { |
There was a problem hiding this comment.
Logically "protected", but this is not available in Swift.
swift/src/IceImpl/Endpoint.mm
Outdated
| } | ||
|
|
||
| #if TARGET_OS_IPHONE | ||
| #if TARGET_OS_IPHONE // TODO: remove conditional |
There was a problem hiding this comment.
The IceIAP::EndpointInfo and ConnectionInfo classes are tiny classes that don't need be conditional.
| rawBytes:rawBytes]; | ||
| } | ||
|
|
||
| // TODO: we should never return null from this factory function. |
There was a problem hiding this comment.
Returning null will result in a crash.
|
|
||
| @interface ICEEndpointInfo () | ||
| @property(nonatomic, readonly) std::shared_ptr<Ice::EndpointInfo> info; | ||
| + (id)createEndpointInfo:(std::shared_ptr<Ice::EndpointInfo>)infoPtr NS_RETURNS_RETAINED; |
There was a problem hiding this comment.
I am not sure about this signature, in particular the NS_RETURNS_RETAINED. Is this correct?
The object we return is a Swift object. It does not (but could) derive from NSObject.
pepone
approved these changes
Nov 26, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR converts the Swift EndpointInfo into classes like in C++ and C#.