keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'michaelkirk/requestIdProtos'

Browse Source
pull/1/head
Matthew Chen 7 years ago
parent a5fd119c1e 966b1ac84b
commit b5c290afd1
4 changed files with 88 additions and 88 deletions
Show Stats Download Patch File Download Diff File

4
SignalServiceKit/protobuf/WebSocketResources.proto
Unescape Escape View File

@ -19,12 +19,12 @@ message WebSocketRequestMessage
optional string path = 2; optional string path = 2;
optional bytes body = 3; optional bytes body = 3;
repeated string headers = 5; repeated string headers = 5;
optional uint64 id = 4; optional uint64 requestId = 4;
} }
message WebSocketResponseMessage message WebSocketResponseMessage
{ {
optional uint64 id = 1; optional uint64 requestId = 1;
optional uint32 status = 2; optional uint32 status = 2;
optional string message = 3; optional string message = 3;
repeated string headers = 5; repeated string headers = 5;

8
SignalServiceKit/src/Network/WebSockets/TSSocketManager.m
Unescape Escape View File

@ -475,7 +475,7 @@ NSString *const kNSNotification_SocketManagerStateDidChange = @"kNSNotification_
WebSocketResourcesWebSocketRequestMessageBuilder *requestBuilder = WebSocketResourcesWebSocketRequestMessageBuilder *requestBuilder =
[WebSocketResourcesWebSocketRequestMessageBuilder new]; [WebSocketResourcesWebSocketRequestMessageBuilder new];
requestBuilder.id = socketMessage.requestId; [requestBuilder setRequestId:socketMessage.requestId];
[requestBuilder setVerb:request.HTTPMethod]; [requestBuilder setVerb:request.HTTPMethod];
[requestBuilder setPath:requestPath]; [requestBuilder setPath:requestPath];
if (jsonData) { if (jsonData) {
@ -542,7 +542,7 @@ NSString *const kNSNotification_SocketManagerStateDidChange = @"kNSNotification_
DDLogInfo(@"%@ received WebSocket response.", self.logTag); DDLogInfo(@"%@ received WebSocket response.", self.logTag);
if (![message hasId]) { if (![message hasRequestId]) {
DDLogError(@"%@ received incomplete WebSocket response.", self.logTag); DDLogError(@"%@ received incomplete WebSocket response.", self.logTag);
return; return;
} }
@ -551,7 +551,7 @@ NSString *const kNSNotification_SocketManagerStateDidChange = @"kNSNotification_
[self requestSocketAliveForAtLeastSeconds:kMakeRequestKeepSocketAliveDurationSeconds]; [self requestSocketAliveForAtLeastSeconds:kMakeRequestKeepSocketAliveDurationSeconds];
}); });
UInt64 requestId = message.id; UInt64 requestId = message.requestId;
UInt32 responseStatus = 0; UInt32 responseStatus = 0;
if (message.hasStatus) { if (message.hasStatus) {
responseStatus = message.status; responseStatus = message.status;
@ -752,7 +752,7 @@ NSString *const kNSNotification_SocketManagerStateDidChange = @"kNSNotification_
WebSocketResourcesWebSocketResponseMessageBuilder *response = [WebSocketResourcesWebSocketResponseMessage builder]; WebSocketResourcesWebSocketResponseMessageBuilder *response = [WebSocketResourcesWebSocketResponseMessage builder];
[response setStatus:200]; [response setStatus:200];
[response setMessage:@"OK"]; [response setMessage:@"OK"];
[response setId:request.id]; [response setRequestId:request.requestId];
WebSocketResourcesWebSocketMessageBuilder *message = [WebSocketResourcesWebSocketMessage builder]; WebSocketResourcesWebSocketMessageBuilder *message = [WebSocketResourcesWebSocketMessage builder];
[message setResponse:response.build]; [message setResponse:response.build];

36
SignalServiceKit/src/Network/WebSockets/WebSocketResources.pb.h
Unescape Escape View File

@ -76,14 +76,14 @@ NSString *NSStringFromWebSocketResourcesWebSocketMessageType(WebSocketResourcesW
#define WebSocketRequestMessage_path @"path" #define WebSocketRequestMessage_path @"path"
#define WebSocketRequestMessage_body @"body" #define WebSocketRequestMessage_body @"body"
#define WebSocketRequestMessage_headers @"headers" #define WebSocketRequestMessage_headers @"headers"
#define WebSocketRequestMessage_id @"id" #define WebSocketRequestMessage_requestId @"requestId"
@interface WebSocketResourcesWebSocketRequestMessage : PBGeneratedMessage<GeneratedMessageProtocol> { @interface WebSocketResourcesWebSocketRequestMessage : PBGeneratedMessage<GeneratedMessageProtocol> {
@private @private
BOOL hasId_:1; BOOL hasRequestId_:1;
BOOL hasVerb_:1; BOOL hasVerb_:1;
BOOL hasPath_:1; BOOL hasPath_:1;
BOOL hasBody_:1; BOOL hasBody_:1;
UInt64 id; UInt64 requestId;
NSString* verb; NSString* verb;
NSString* path; NSString* path;
NSData* body; NSData* body;
@ -92,12 +92,12 @@ NSString *NSStringFromWebSocketResourcesWebSocketMessageType(WebSocketResourcesW
- (BOOL) hasVerb; - (BOOL) hasVerb;
- (BOOL) hasPath; - (BOOL) hasPath;
- (BOOL) hasBody; - (BOOL) hasBody;
- (BOOL) hasId; - (BOOL) hasRequestId;
@property (readonly, strong) NSString* verb; @property (readonly, strong) NSString* verb;
@property (readonly, strong) NSString* path; @property (readonly, strong) NSString* path;
@property (readonly, strong) NSData* body; @property (readonly, strong) NSData* body;
@property (readonly, strong) NSArray * headers; @property (readonly, strong) NSArray * headers;
@property (readonly) UInt64 id; @property (readonly) UInt64 requestId;
- (NSString*)headersAtIndex:(NSUInteger)index; - (NSString*)headersAtIndex:(NSUInteger)index;
+ (instancetype) defaultInstance; + (instancetype) defaultInstance;
@ -156,34 +156,34 @@ NSString *NSStringFromWebSocketResourcesWebSocketMessageType(WebSocketResourcesW
- (WebSocketResourcesWebSocketRequestMessageBuilder *)setHeadersArray:(NSArray *)array; - (WebSocketResourcesWebSocketRequestMessageBuilder *)setHeadersArray:(NSArray *)array;
- (WebSocketResourcesWebSocketRequestMessageBuilder *)clearHeaders; - (WebSocketResourcesWebSocketRequestMessageBuilder *)clearHeaders;
- (BOOL) hasId; - (BOOL) hasRequestId;
- (UInt64) id; - (UInt64) requestId;
- (WebSocketResourcesWebSocketRequestMessageBuilder*) setId:(UInt64) value; - (WebSocketResourcesWebSocketRequestMessageBuilder*) setRequestId:(UInt64) value;
- (WebSocketResourcesWebSocketRequestMessageBuilder*) clearId; - (WebSocketResourcesWebSocketRequestMessageBuilder*) clearRequestId;
@end @end
#define WebSocketResponseMessage_id @"id" #define WebSocketResponseMessage_requestId @"requestId"
#define WebSocketResponseMessage_status @"status" #define WebSocketResponseMessage_status @"status"
#define WebSocketResponseMessage_message @"message" #define WebSocketResponseMessage_message @"message"
#define WebSocketResponseMessage_headers @"headers" #define WebSocketResponseMessage_headers @"headers"
#define WebSocketResponseMessage_body @"body" #define WebSocketResponseMessage_body @"body"
@interface WebSocketResourcesWebSocketResponseMessage : PBGeneratedMessage<GeneratedMessageProtocol> { @interface WebSocketResourcesWebSocketResponseMessage : PBGeneratedMessage<GeneratedMessageProtocol> {
@private @private
BOOL hasId_:1; BOOL hasRequestId_:1;
BOOL hasMessage_:1; BOOL hasMessage_:1;
BOOL hasBody_:1; BOOL hasBody_:1;
BOOL hasStatus_:1; BOOL hasStatus_:1;
UInt64 id; UInt64 requestId;
NSString* message; NSString* message;
NSData* body; NSData* body;
UInt32 status; UInt32 status;
NSMutableArray * headersArray; NSMutableArray * headersArray;
} }
- (BOOL) hasId; - (BOOL) hasRequestId;
- (BOOL) hasStatus; - (BOOL) hasStatus;
- (BOOL) hasMessage; - (BOOL) hasMessage;
- (BOOL) hasBody; - (BOOL) hasBody;
@property (readonly) UInt64 id; @property (readonly) UInt64 requestId;
@property (readonly) UInt32 status; @property (readonly) UInt32 status;
@property (readonly, strong) NSString* message; @property (readonly, strong) NSString* message;
@property (readonly, strong) NSArray * headers; @property (readonly, strong) NSArray * headers;
@ -225,10 +225,10 @@ NSString *NSStringFromWebSocketResourcesWebSocketMessageType(WebSocketResourcesW
- (WebSocketResourcesWebSocketResponseMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input; - (WebSocketResourcesWebSocketResponseMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input;
- (WebSocketResourcesWebSocketResponseMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry; - (WebSocketResourcesWebSocketResponseMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
- (BOOL) hasId; - (BOOL) hasRequestId;
- (UInt64) id; - (UInt64) requestId;
- (WebSocketResourcesWebSocketResponseMessageBuilder*) setId:(UInt64) value; - (WebSocketResourcesWebSocketResponseMessageBuilder*) setRequestId:(UInt64) value;
- (WebSocketResourcesWebSocketResponseMessageBuilder*) clearId; - (WebSocketResourcesWebSocketResponseMessageBuilder*) clearRequestId;
- (BOOL) hasStatus; - (BOOL) hasStatus;
- (UInt32) status; - (UInt32) status;

128
SignalServiceKit/src/Network/WebSockets/WebSocketResources.pb.m
Unescape Escape View File

@ -26,7 +26,7 @@ static PBExtensionRegistry* extensionRegistry = nil;
@property (strong) NSString* path; @property (strong) NSString* path;
@property (strong) NSData* body; @property (strong) NSData* body;
@property (strong) NSMutableArray * headersArray; @property (strong) NSMutableArray * headersArray;
@property UInt64 id; @property UInt64 requestId;
@end @end
@implementation WebSocketResourcesWebSocketRequestMessage @implementation WebSocketResourcesWebSocketRequestMessage
@ -54,19 +54,19 @@ static PBExtensionRegistry* extensionRegistry = nil;
@synthesize body; @synthesize body;
@synthesize headersArray; @synthesize headersArray;
@dynamic headers; @dynamic headers;
- (BOOL) hasId { - (BOOL) hasRequestId {
return !!hasId_; return !!hasRequestId_;
} }
- (void) setHasId:(BOOL) _value_ { - (void) setHasRequestId:(BOOL) _value_ {
hasId_ = !!_value_; hasRequestId_ = !!_value_;
} }
@synthesize id; @synthesize requestId;
- (instancetype) init { - (instancetype) init {
if ((self = [super init])) { if ((self = [super init])) {
self.verb = @""; self.verb = @"";
self.path = @""; self.path = @"";
self.body = [NSData data]; self.body = [NSData data];
self.id = 0L; self.requestId = 0L;
} }
return self; return self;
} }
@ -101,8 +101,8 @@ static WebSocketResourcesWebSocketRequestMessage* defaultWebSocketResourcesWebSo
if (self.hasBody) { if (self.hasBody) {
[output writeData:3 value:self.body]; [output writeData:3 value:self.body];
} }
if (self.hasId) { if (self.hasRequestId) {
[output writeUInt64:4 value:self.id]; [output writeUInt64:4 value:self.requestId];
} }
[self.headersArray enumerateObjectsUsingBlock:^(NSString *element, NSUInteger idx, BOOL *stop) { [self.headersArray enumerateObjectsUsingBlock:^(NSString *element, NSUInteger idx, BOOL *stop) {
[output writeString:5 value:element]; [output writeString:5 value:element];
@ -125,8 +125,8 @@ static WebSocketResourcesWebSocketRequestMessage* defaultWebSocketResourcesWebSo
if (self.hasBody) { if (self.hasBody) {
size_ += computeDataSize(3, self.body); size_ += computeDataSize(3, self.body);
} }
if (self.hasId) { if (self.hasRequestId) {
size_ += computeUInt64Size(4, self.id); size_ += computeUInt64Size(4, self.requestId);
} }
{ {
__block SInt32 dataSize = 0; __block SInt32 dataSize = 0;
@ -181,8 +181,8 @@ static WebSocketResourcesWebSocketRequestMessage* defaultWebSocketResourcesWebSo
if (self.hasBody) { if (self.hasBody) {
[output appendFormat:@"%@%@: %@\n", indent, @"body", self.body]; [output appendFormat:@"%@%@: %@\n", indent, @"body", self.body];
} }
if (self.hasId) { if (self.hasRequestId) {
[output appendFormat:@"%@%@: %@\n", indent, @"id", [NSNumber numberWithLongLong:self.id]]; [output appendFormat:@"%@%@: %@\n", indent, @"requestId", [NSNumber numberWithLongLong:self.requestId]];
} }
[self.headersArray enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) { [self.headersArray enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
[output appendFormat:@"%@%@: %@\n", indent, @"headers", obj]; [output appendFormat:@"%@%@: %@\n", indent, @"headers", obj];
@ -199,8 +199,8 @@ static WebSocketResourcesWebSocketRequestMessage* defaultWebSocketResourcesWebSo
if (self.hasBody) { if (self.hasBody) {
[dictionary setObject: self.body forKey: @"body"]; [dictionary setObject: self.body forKey: @"body"];
} }
if (self.hasId) { if (self.hasRequestId) {
[dictionary setObject: [NSNumber numberWithLongLong:self.id] forKey: @"id"]; [dictionary setObject: [NSNumber numberWithLongLong:self.requestId] forKey: @"requestId"];
} }
[dictionary setObject:self.headers forKey: @"headers"]; [dictionary setObject:self.headers forKey: @"headers"];
[self.unknownFields storeInDictionary:dictionary]; [self.unknownFields storeInDictionary:dictionary];
@ -220,8 +220,8 @@ static WebSocketResourcesWebSocketRequestMessage* defaultWebSocketResourcesWebSo
(!self.hasPath || [self.path isEqual:otherMessage.path]) && (!self.hasPath || [self.path isEqual:otherMessage.path]) &&
self.hasBody == otherMessage.hasBody && self.hasBody == otherMessage.hasBody &&
(!self.hasBody || [self.body isEqual:otherMessage.body]) && (!self.hasBody || [self.body isEqual:otherMessage.body]) &&
self.hasId == otherMessage.hasId && self.hasRequestId == otherMessage.hasRequestId &&
(!self.hasId || self.id == otherMessage.id) && (!self.hasRequestId || self.requestId == otherMessage.requestId) &&
[self.headersArray isEqualToArray:otherMessage.headersArray] && [self.headersArray isEqualToArray:otherMessage.headersArray] &&
(self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields])); (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields]));
} }
@ -236,8 +236,8 @@ static WebSocketResourcesWebSocketRequestMessage* defaultWebSocketResourcesWebSo
if (self.hasBody) { if (self.hasBody) {
hashCode = hashCode * 31 + [self.body hash]; hashCode = hashCode * 31 + [self.body hash];
} }
if (self.hasId) { if (self.hasRequestId) {
hashCode = hashCode * 31 + [[NSNumber numberWithLongLong:self.id] hash]; hashCode = hashCode * 31 + [[NSNumber numberWithLongLong:self.requestId] hash];
} }
[self.headersArray enumerateObjectsUsingBlock:^(NSString *element, NSUInteger idx, BOOL *stop) { [self.headersArray enumerateObjectsUsingBlock:^(NSString *element, NSUInteger idx, BOOL *stop) {
hashCode = hashCode * 31 + [element hash]; hashCode = hashCode * 31 + [element hash];
@ -301,8 +301,8 @@ static WebSocketResourcesWebSocketRequestMessage* defaultWebSocketResourcesWebSo
[resultWebSocketRequestMessage.headersArray addObjectsFromArray:other.headersArray]; [resultWebSocketRequestMessage.headersArray addObjectsFromArray:other.headersArray];
} }
} }
if (other.hasId) { if (other.hasRequestId) {
[self setId:other.id]; [self setRequestId:other.requestId];
} }
[self mergeUnknownFields:other.unknownFields]; [self mergeUnknownFields:other.unknownFields];
return self; return self;
@ -338,7 +338,7 @@ static WebSocketResourcesWebSocketRequestMessage* defaultWebSocketResourcesWebSo
break; break;
} }
case 32: { case 32: {
[self setId:[input readUInt64]]; [self setRequestId:[input readUInt64]];
break; break;
} }
case 42: { case 42: {
@ -417,26 +417,26 @@ static WebSocketResourcesWebSocketRequestMessage* defaultWebSocketResourcesWebSo
resultWebSocketRequestMessage.headersArray = nil; resultWebSocketRequestMessage.headersArray = nil;
return self; return self;
} }
- (BOOL) hasId { - (BOOL) hasRequestId {
return resultWebSocketRequestMessage.hasId; return resultWebSocketRequestMessage.hasRequestId;
} }
- (UInt64) id { - (UInt64) requestId {
return resultWebSocketRequestMessage.id; return resultWebSocketRequestMessage.requestId;
} }
- (WebSocketResourcesWebSocketRequestMessageBuilder*) setId:(UInt64) value { - (WebSocketResourcesWebSocketRequestMessageBuilder*) setRequestId:(UInt64) value {
resultWebSocketRequestMessage.hasId = YES; resultWebSocketRequestMessage.hasRequestId = YES;
resultWebSocketRequestMessage.id = value; resultWebSocketRequestMessage.requestId = value;
return self; return self;
} }
- (WebSocketResourcesWebSocketRequestMessageBuilder*) clearId { - (WebSocketResourcesWebSocketRequestMessageBuilder*) clearRequestId {
resultWebSocketRequestMessage.hasId = NO; resultWebSocketRequestMessage.hasRequestId = NO;
resultWebSocketRequestMessage.id = 0L; resultWebSocketRequestMessage.requestId = 0L;
return self; return self;
} }
@end @end
@interface WebSocketResourcesWebSocketResponseMessage () @interface WebSocketResourcesWebSocketResponseMessage ()
@property UInt64 id; @property UInt64 requestId;
@property UInt32 status; @property UInt32 status;
@property (strong) NSString* message; @property (strong) NSString* message;
@property (strong) NSMutableArray * headersArray; @property (strong) NSMutableArray * headersArray;
@ -445,13 +445,13 @@ static WebSocketResourcesWebSocketRequestMessage* defaultWebSocketResourcesWebSo
@implementation WebSocketResourcesWebSocketResponseMessage @implementation WebSocketResourcesWebSocketResponseMessage
- (BOOL) hasId { - (BOOL) hasRequestId {
return !!hasId_; return !!hasRequestId_;
} }
- (void) setHasId:(BOOL) _value_ { - (void) setHasRequestId:(BOOL) _value_ {
hasId_ = !!_value_; hasRequestId_ = !!_value_;
} }
@synthesize id; @synthesize requestId;
- (BOOL) hasStatus { - (BOOL) hasStatus {
return !!hasStatus_; return !!hasStatus_;
} }
@ -477,7 +477,7 @@ static WebSocketResourcesWebSocketRequestMessage* defaultWebSocketResourcesWebSo
@synthesize body; @synthesize body;
- (instancetype) init { - (instancetype) init {
if ((self = [super init])) { if ((self = [super init])) {
self.id = 0L; self.requestId = 0L;
self.status = 0; self.status = 0;
self.message = @""; self.message = @"";
self.body = [NSData data]; self.body = [NSData data];
@ -506,8 +506,8 @@ static WebSocketResourcesWebSocketResponseMessage* defaultWebSocketResourcesWebS
return YES; return YES;
} }
- (void) writeToCodedOutputStream:(PBCodedOutputStream*) output { - (void) writeToCodedOutputStream:(PBCodedOutputStream*) output {
if (self.hasId) { if (self.hasRequestId) {
[output writeUInt64:1 value:self.id]; [output writeUInt64:1 value:self.requestId];
} }
if (self.hasStatus) { if (self.hasStatus) {
[output writeUInt32:2 value:self.status]; [output writeUInt32:2 value:self.status];
@ -530,8 +530,8 @@ static WebSocketResourcesWebSocketResponseMessage* defaultWebSocketResourcesWebS
} }
size_ = 0; size_ = 0;
if (self.hasId) { if (self.hasRequestId) {
size_ += computeUInt64Size(1, self.id); size_ += computeUInt64Size(1, self.requestId);
} }
if (self.hasStatus) { if (self.hasStatus) {
size_ += computeUInt32Size(2, self.status); size_ += computeUInt32Size(2, self.status);
@ -586,8 +586,8 @@ static WebSocketResourcesWebSocketResponseMessage* defaultWebSocketResourcesWebS
return [WebSocketResourcesWebSocketResponseMessage builderWithPrototype:self]; return [WebSocketResourcesWebSocketResponseMessage builderWithPrototype:self];
} }
- (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent { - (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent {
if (self.hasId) { if (self.hasRequestId) {
[output appendFormat:@"%@%@: %@\n", indent, @"id", [NSNumber numberWithLongLong:self.id]]; [output appendFormat:@"%@%@: %@\n", indent, @"requestId", [NSNumber numberWithLongLong:self.requestId]];
} }
if (self.hasStatus) { if (self.hasStatus) {
[output appendFormat:@"%@%@: %@\n", indent, @"status", [NSNumber numberWithInteger:self.status]]; [output appendFormat:@"%@%@: %@\n", indent, @"status", [NSNumber numberWithInteger:self.status]];
@ -604,8 +604,8 @@ static WebSocketResourcesWebSocketResponseMessage* defaultWebSocketResourcesWebS
[self.unknownFields writeDescriptionTo:output withIndent:indent]; [self.unknownFields writeDescriptionTo:output withIndent:indent];
} }
- (void) storeInDictionary:(NSMutableDictionary *)dictionary { - (void) storeInDictionary:(NSMutableDictionary *)dictionary {
if (self.hasId) { if (self.hasRequestId) {
[dictionary setObject: [NSNumber numberWithLongLong:self.id] forKey: @"id"]; [dictionary setObject: [NSNumber numberWithLongLong:self.requestId] forKey: @"requestId"];
} }
if (self.hasStatus) { if (self.hasStatus) {
[dictionary setObject: [NSNumber numberWithInteger:self.status] forKey: @"status"]; [dictionary setObject: [NSNumber numberWithInteger:self.status] forKey: @"status"];
@ -628,8 +628,8 @@ static WebSocketResourcesWebSocketResponseMessage* defaultWebSocketResourcesWebS
} }
WebSocketResourcesWebSocketResponseMessage *otherMessage = other; WebSocketResourcesWebSocketResponseMessage *otherMessage = other;
return return
self.hasId == otherMessage.hasId && self.hasRequestId == otherMessage.hasRequestId &&
(!self.hasId || self.id == otherMessage.id) && (!self.hasRequestId || self.requestId == otherMessage.requestId) &&
self.hasStatus == otherMessage.hasStatus && self.hasStatus == otherMessage.hasStatus &&
(!self.hasStatus || self.status == otherMessage.status) && (!self.hasStatus || self.status == otherMessage.status) &&
self.hasMessage == otherMessage.hasMessage && self.hasMessage == otherMessage.hasMessage &&
@ -641,8 +641,8 @@ static WebSocketResourcesWebSocketResponseMessage* defaultWebSocketResourcesWebS
} }
- (NSUInteger) hash { - (NSUInteger) hash {
__block NSUInteger hashCode = 7; __block NSUInteger hashCode = 7;
if (self.hasId) { if (self.hasRequestId) {
hashCode = hashCode * 31 + [[NSNumber numberWithLongLong:self.id] hash]; hashCode = hashCode * 31 + [[NSNumber numberWithLongLong:self.requestId] hash];
} }
if (self.hasStatus) { if (self.hasStatus) {
hashCode = hashCode * 31 + [[NSNumber numberWithInteger:self.status] hash]; hashCode = hashCode * 31 + [[NSNumber numberWithInteger:self.status] hash];
@ -699,8 +699,8 @@ static WebSocketResourcesWebSocketResponseMessage* defaultWebSocketResourcesWebS
if (other == [WebSocketResourcesWebSocketResponseMessage defaultInstance]) { if (other == [WebSocketResourcesWebSocketResponseMessage defaultInstance]) {
return self; return self;
} }
if (other.hasId) { if (other.hasRequestId) {
[self setId:other.id]; [self setRequestId:other.requestId];
} }
if (other.hasStatus) { if (other.hasStatus) {
[self setStatus:other.status]; [self setStatus:other.status];
@ -740,7 +740,7 @@ static WebSocketResourcesWebSocketResponseMessage* defaultWebSocketResourcesWebS
break; break;
} }
case 8: { case 8: {
[self setId:[input readUInt64]]; [self setRequestId:[input readUInt64]];
break; break;
} }
case 16: { case 16: {
@ -762,20 +762,20 @@ static WebSocketResourcesWebSocketResponseMessage* defaultWebSocketResourcesWebS
} }
} }
} }
- (BOOL) hasId { - (BOOL) hasRequestId {
return resultWebSocketResponseMessage.hasId; return resultWebSocketResponseMessage.hasRequestId;
} }
- (UInt64) id { - (UInt64) requestId {
return resultWebSocketResponseMessage.id; return resultWebSocketResponseMessage.requestId;
} }
- (WebSocketResourcesWebSocketResponseMessageBuilder*) setId:(UInt64) value { - (WebSocketResourcesWebSocketResponseMessageBuilder*) setRequestId:(UInt64) value {
resultWebSocketResponseMessage.hasId = YES; resultWebSocketResponseMessage.hasRequestId = YES;
resultWebSocketResponseMessage.id = value; resultWebSocketResponseMessage.requestId = value;
return self; return self;
} }
- (WebSocketResourcesWebSocketResponseMessageBuilder*) clearId { - (WebSocketResourcesWebSocketResponseMessageBuilder*) clearRequestId {
resultWebSocketResponseMessage.hasId = NO; resultWebSocketResponseMessage.hasRequestId = NO;
resultWebSocketResponseMessage.id = 0L; resultWebSocketResponseMessage.requestId = 0L;
return self; return self;
} }
- (BOOL) hasStatus { - (BOOL) hasStatus {

Write Preview
Loading…
Cancel
Save