Skip to content

Commit 49bdca8

Browse files
flovilmartflovilmart
committed
Review nits
1 parent 8ca43a3 commit 49bdca8

File tree

5 files changed

+27
-36
lines changed

5 files changed

+27
-36
lines changed

‎Parse/Parse/Internal/Commands/PFRESTCommand.m

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -235,17 +235,13 @@ - (BOOL)forEachLocalId:(BOOL(^)(PFObject *pointer, BOOL *modified, NSError **err
235235
return YES;
236236
}
237237
BOOL modified = NO;
238-
BOOL success = [[self class] forEachLocalIdIn:data doBlock:block modified:&modified error:error];
239-
if (!success) {
240-
return NO;
241-
}
242-
if (success) {
238+
if ([[self class] forEachLocalIdIn:data doBlock:block modified:&modified error:error]) {
243239
self.parameters = [[PFPointerOrLocalIdObjectEncoder objectEncoder] encodeObject:data error:error];
244-
if (!self.parameters && error && *error) {
245-
return NO;
240+
if (self.parameters && !(error && *error)) {
241+
return YES;
246242
}
247243
}
248-
return YES;
244+
return NO;
249245
}
250246

251247
- (BOOL)resolveLocalIds:(NSError * __autoreleasing *)error {

‎Parse/Parse/Internal/Commands/PFRESTQueryCommand.m

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ + (nullable NSDictionary *)findCommandParametersWithOrder:(NSString *)order
143143
parameters[key] = obj;
144144
}];
145145

146-
__block BOOL encodingHasErrored = NO;
146+
__block BOOL encodingFailed = NO;
147147
__block NSError *encodingError;
148148
if (conditions.count > 0) {
149149
NSMutableDictionary *whereData = [[NSMutableDictionary alloc] init];
@@ -170,7 +170,7 @@ + (nullable NSDictionary *)findCommandParametersWithOrder:(NSString *)order
170170
error:&encodingError];
171171
if (!queryDict && encodingError) {
172172
*stop = true;
173-
encodingHasErrored = true;
173+
encodingFailed = true;
174174
return;
175175
}
176176

@@ -186,13 +186,13 @@ + (nullable NSDictionary *)findCommandParametersWithOrder:(NSString *)order
186186
id object = [self _encodeSubqueryIfNeeded:obj error:&encodingError];
187187
if (!object && encodingError) {
188188
*stop = true;
189-
encodingHasErrored = true;
189+
encodingFailed = true;
190190
return;
191191
}
192192
id pointer = [[PFPointerObjectEncoder objectEncoder] encodeObject:object error:&encodingError];
193193
if (!pointer && encodingError) {
194194
*stop = true;
195-
encodingHasErrored = true;
195+
encodingFailed = true;
196196
return;
197197
}
198198
whereData[key] = pointer;
@@ -201,7 +201,7 @@ + (nullable NSDictionary *)findCommandParametersWithOrder:(NSString *)order
201201

202202
parameters[@"where"] = whereData;
203203
}
204-
if (encodingHasErrored && encodingError) {
204+
if (encodingFailed && encodingError) {
205205
*error = encodingError;
206206
return nil;
207207
}
@@ -215,8 +215,8 @@ + (nullable id)_encodeSubqueryIfNeeded:(id)object error:(NSError * __autoreleasi
215215
}
216216

217217
NSMutableDictionary *parameters = [NSMutableDictionary dictionaryWithCapacity:[object count]];
218-
__block BOOL hadFailed = NO;
219-
__block NSError *commandEncodingError = nil;
218+
__block BOOL encodingFailed = NO;
219+
__block NSError *encodingError = nil;
220220
[object enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
221221
if ([obj isKindOfClass:[PFQuery class]]) {
222222
PFQuery *subquery = (PFQuery *)obj;
@@ -228,27 +228,29 @@ + (nullable id)_encodeSubqueryIfNeeded:(id)object error:(NSError * __autoreleasi
228228
skip:subquery.state.skip
229229
extraOptions:subquery.state.extraOptions
230230
tracingEnabled:NO
231-
error:&commandEncodingError];
232-
if (!command && commandEncodingError) {
233-
hadFailed = YES;
231+
error:&encodingError];
232+
if (!command && encodingError) {
233+
encodingFailed = YES;
234234
*stop = YES;
235235
return;
236236
}
237237
NSMutableDictionary *subqueryParameters = [command mutableCopy];
238238
subqueryParameters[@"className"] = subquery.parseClassName;
239239
obj = subqueryParameters;
240240
} else if ([obj isKindOfClass:[NSDictionary class]]) {
241-
obj = [self _encodeSubqueryIfNeeded:obj error:&commandEncodingError];
242-
if (!obj && commandEncodingError) {
243-
hadFailed = YES;
241+
obj = [self _encodeSubqueryIfNeeded:obj error:&encodingError];
242+
if (!obj && encodingError) {
243+
encodingFailed = YES;
244244
*stop = YES;
245245
return;
246246
}
247247
}
248248
parameters[key] = obj;
249249
}];
250-
if (hadFailed && commandEncodingError) {
251-
*error = commandEncodingError;
250+
if (encodingFailed) {
251+
if (error && encodingError) {
252+
*error = encodingError;
253+
}
252254
return nil;
253255
}
254256
return parameters;

‎Parse/Parse/Internal/FieldOperation/PFFieldOperation.m

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,7 @@ - (NSString *)description {
193193

194194
- (id)encodeWithObjectEncoder:(PFEncoder *)objectEncoder error:(NSError **)error {
195195
NSMutableArray *encodedObjects = [objectEncoder encodeObject:self.objects error: error];
196-
if (!encodedObjects && error && *error) {
197-
return nil;
198-
}
196+
PFPreconditionBailOnError(encodedObjects, error, nil);
199197
return @{ @"__op" : @"Add",
200198
@"objects" : encodedObjects };
201199
}
@@ -256,9 +254,7 @@ - (NSString *)description {
256254

257255
- (id)encodeWithObjectEncoder:(PFEncoder *)objectEncoder error:(NSError **)error {
258256
NSMutableArray *encodedObjects = [objectEncoder encodeObject:self.objects error:error];
259-
if (!encodedObjects && error && *error) {
260-
return nil;
261-
}
257+
PFPreconditionBailOnError(encodedObjects, error, nil);
262258
return @{ @"__op" : @"AddUnique",
263259
@"objects" : encodedObjects };
264260
}
@@ -334,9 +330,7 @@ - (NSString *)description {
334330

335331
- (id)encodeWithObjectEncoder:(PFEncoder *)objectEncoder error:(NSError **)error {
336332
NSMutableArray *encodedObjects = [objectEncoder encodeObject:self.objects error:error];
337-
if (!encodedObjects && error && *error) {
338-
return nil;
339-
}
333+
PFPreconditionBailOnError(encodedObjects, error, nil);
340334
return @{ @"__op" : @"Remove",
341335
@"objects" : encodedObjects };
342336
}

‎Parse/Parse/Internal/PFAssert.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ do {\
114114
format:description, ##__VA_ARGS__]; \
115115
} while(0)
116116

117-
118117
/**
119118
Always raises `NSInternalInconsistencyException` with details
120119
about the method used and class that received the message

‎Parse/Parse/PFEncoder.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,18 +95,18 @@ - (id)encodeObject:(id)object error:(NSError * __autoreleasing *) error {
9595

9696
} else if ([object isKindOfClass:[NSDictionary class]]) {
9797
NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithCapacity:[object count]];
98-
__block BOOL hasErrored = NO;
98+
__block BOOL encodingFailed = NO;
9999
__block NSError *encodingError = nil;
100100
[object enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
101101
id result = [self encodeObject:obj error:&encodingError];
102102
if (!result && encodingError) {
103-
hasErrored = YES;
103+
encodingFailed = YES;
104104
*stop = YES;
105105
} else {
106106
dict[key] = result;
107107
}
108108
}];
109-
if (hasErrored) {
109+
if (encodingFailed) {
110110
*error = encodingError;
111111
return nil;
112112
}

0 commit comments

Comments
 (0)