Adding shortcircuit for _AFNETWORKING_PREFER_NSJSONSERIALIZATION_
This commit is contained in:
parent
54194a3cb6
commit
aaa5858546
1 changed files with 41 additions and 24 deletions
|
|
@ -32,6 +32,12 @@ static NSData * AFJSONEncode(id object, NSError **error) {
|
||||||
id _NSJSONSerializationClass = NSClassFromString(@"NSJSONSerialization");
|
id _NSJSONSerializationClass = NSClassFromString(@"NSJSONSerialization");
|
||||||
SEL _NSJSONSerializationSelector = NSSelectorFromString(@"dataWithJSONObject:options:error:");
|
SEL _NSJSONSerializationSelector = NSSelectorFromString(@"dataWithJSONObject:options:error:");
|
||||||
|
|
||||||
|
#ifdef _AFNETWORKING_PREFER_NSJSONSERIALIZATION_
|
||||||
|
if (_NSJSONSerializationClass && [_NSJSONSerializationClass respondsToSelector:_NSJSONSerializationSelector]) {
|
||||||
|
goto _af_nsjson_encode;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
if (_JSONKitSelector && [object respondsToSelector:_JSONKitSelector]) {
|
if (_JSONKitSelector && [object respondsToSelector:_JSONKitSelector]) {
|
||||||
NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[object methodSignatureForSelector:_JSONKitSelector]];
|
NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[object methodSignatureForSelector:_JSONKitSelector]];
|
||||||
invocation.target = object;
|
invocation.target = object;
|
||||||
|
|
@ -68,18 +74,20 @@ static NSData * AFJSONEncode(id object, NSError **error) {
|
||||||
@catch (NSException *exception) {
|
@catch (NSException *exception) {
|
||||||
*error = [[[NSError alloc] initWithDomain:NSStringFromClass([exception class]) code:0 userInfo:[exception userInfo]] autorelease];
|
*error = [[[NSError alloc] initWithDomain:NSStringFromClass([exception class]) code:0 userInfo:[exception userInfo]] autorelease];
|
||||||
}
|
}
|
||||||
} else if (_NSJSONSerializationClass && [_NSJSONSerializationClass respondsToSelector:_NSJSONSerializationSelector]) {
|
} else if (_NSJSONSerializationClass && [_NSJSONSerializationClass respondsToSelector:_NSJSONSerializationSelector]) {
|
||||||
NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[_NSJSONSerializationClass methodSignatureForSelector:_NSJSONSerializationSelector]];
|
_af_nsjson_encode: {
|
||||||
invocation.target = _NSJSONSerializationClass;
|
NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[_NSJSONSerializationClass methodSignatureForSelector:_NSJSONSerializationSelector]];
|
||||||
invocation.selector = _NSJSONSerializationSelector;
|
invocation.target = _NSJSONSerializationClass;
|
||||||
|
invocation.selector = _NSJSONSerializationSelector;
|
||||||
[invocation setArgument:&object atIndex:2]; // arguments 0 and 1 are self and _cmd respectively, automatically set by NSInvocation
|
|
||||||
NSUInteger writeOptions = 0;
|
[invocation setArgument:&object atIndex:2]; // arguments 0 and 1 are self and _cmd respectively, automatically set by NSInvocation
|
||||||
[invocation setArgument:&writeOptions atIndex:3];
|
NSUInteger writeOptions = 0;
|
||||||
[invocation setArgument:error atIndex:4];
|
[invocation setArgument:&writeOptions atIndex:3];
|
||||||
|
[invocation setArgument:error atIndex:4];
|
||||||
[invocation invoke];
|
|
||||||
[invocation getReturnValue:&data];
|
[invocation invoke];
|
||||||
|
[invocation getReturnValue:&data];
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
NSDictionary *userInfo = [NSDictionary dictionaryWithObject:NSLocalizedString(@"Please either target a platform that supports NSJSONSerialization or add one of the following libraries to your project: JSONKit, SBJSON, or YAJL", nil) forKey:NSLocalizedRecoverySuggestionErrorKey];
|
NSDictionary *userInfo = [NSDictionary dictionaryWithObject:NSLocalizedString(@"Please either target a platform that supports NSJSONSerialization or add one of the following libraries to your project: JSONKit, SBJSON, or YAJL", nil) forKey:NSLocalizedRecoverySuggestionErrorKey];
|
||||||
[[NSException exceptionWithName:NSInternalInconsistencyException reason:NSLocalizedString(@"No JSON generation functionality available", nil) userInfo:userInfo] raise];
|
[[NSException exceptionWithName:NSInternalInconsistencyException reason:NSLocalizedString(@"No JSON generation functionality available", nil) userInfo:userInfo] raise];
|
||||||
|
|
@ -97,6 +105,13 @@ static id AFJSONDecode(NSData *data, NSError **error) {
|
||||||
|
|
||||||
id _NSJSONSerializationClass = NSClassFromString(@"NSJSONSerialization");
|
id _NSJSONSerializationClass = NSClassFromString(@"NSJSONSerialization");
|
||||||
SEL _NSJSONSerializationSelector = NSSelectorFromString(@"JSONObjectWithData:options:error:");
|
SEL _NSJSONSerializationSelector = NSSelectorFromString(@"JSONObjectWithData:options:error:");
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef _AFNETWORKING_PREFER_NSJSONSERIALIZATION_
|
||||||
|
if (_NSJSONSerializationClass && [_NSJSONSerializationClass respondsToSelector:_NSJSONSerializationSelector]) {
|
||||||
|
goto _af_nsjson_decode;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
if (_JSONKitSelector && [data respondsToSelector:_JSONKitSelector]) {
|
if (_JSONKitSelector && [data respondsToSelector:_JSONKitSelector]) {
|
||||||
NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[data methodSignatureForSelector:_JSONKitSelector]];
|
NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[data methodSignatureForSelector:_JSONKitSelector]];
|
||||||
|
|
@ -129,18 +144,20 @@ static id AFJSONDecode(NSData *data, NSError **error) {
|
||||||
|
|
||||||
[invocation invoke];
|
[invocation invoke];
|
||||||
[invocation getReturnValue:&JSON];
|
[invocation getReturnValue:&JSON];
|
||||||
} else if (_NSJSONSerializationClass && [_NSJSONSerializationClass respondsToSelector:_NSJSONSerializationSelector]) {
|
} else if (_NSJSONSerializationClass && [_NSJSONSerializationClass respondsToSelector:_NSJSONSerializationSelector]) {
|
||||||
NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[_NSJSONSerializationClass methodSignatureForSelector:_NSJSONSerializationSelector]];
|
_af_nsjson_decode: {
|
||||||
invocation.target = _NSJSONSerializationClass;
|
NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[_NSJSONSerializationClass methodSignatureForSelector:_NSJSONSerializationSelector]];
|
||||||
invocation.selector = _NSJSONSerializationSelector;
|
invocation.target = _NSJSONSerializationClass;
|
||||||
|
invocation.selector = _NSJSONSerializationSelector;
|
||||||
[invocation setArgument:&data atIndex:2]; // arguments 0 and 1 are self and _cmd respectively, automatically set by NSInvocation
|
|
||||||
NSUInteger readOptions = 0;
|
[invocation setArgument:&data atIndex:2]; // arguments 0 and 1 are self and _cmd respectively, automatically set by NSInvocation
|
||||||
[invocation setArgument:&readOptions atIndex:3];
|
NSUInteger readOptions = 0;
|
||||||
[invocation setArgument:error atIndex:4];
|
[invocation setArgument:&readOptions atIndex:3];
|
||||||
|
[invocation setArgument:error atIndex:4];
|
||||||
[invocation invoke];
|
|
||||||
[invocation getReturnValue:&JSON];
|
[invocation invoke];
|
||||||
|
[invocation getReturnValue:&JSON];
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
NSDictionary *userInfo = [NSDictionary dictionaryWithObject:NSLocalizedString(@"Please either target a platform that supports NSJSONSerialization or add one of the following libraries to your project: JSONKit, SBJSON, or YAJL", nil) forKey:NSLocalizedRecoverySuggestionErrorKey];
|
NSDictionary *userInfo = [NSDictionary dictionaryWithObject:NSLocalizedString(@"Please either target a platform that supports NSJSONSerialization or add one of the following libraries to your project: JSONKit, SBJSON, or YAJL", nil) forKey:NSLocalizedRecoverySuggestionErrorKey];
|
||||||
[[NSException exceptionWithName:NSInternalInconsistencyException reason:NSLocalizedString(@"No JSON parsing functionality available", nil) userInfo:userInfo] raise];
|
[[NSException exceptionWithName:NSInternalInconsistencyException reason:NSLocalizedString(@"No JSON parsing functionality available", nil) userInfo:userInfo] raise];
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue