Skip to content

Commit

Permalink
updated sample
Browse files Browse the repository at this point in the history
  • Loading branch information
@fehguy
fehguy committed May 21, 2012
1 parent 89740f4 commit 06dcd73
Show file tree
Hide file tree
Showing 8 changed files with 276 additions and 127 deletions.
4 changes: 2 additions & 2 deletions samples/objc/Category.m
View file
Expand Up @@ -21,8 +21,8 @@ - (id) initWithValues: (NSDictionary*)dict

-(NSDictionary*) asDictionary {
NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
[dict setObject:__id forKey:@"id"];
[dict setObject:_name forKey:@"name"];
if(__id != nil) [dict setObject:__id forKey:@"id"];
if(_name != nil) [dict setObject:_name forKey:@"name"];
NSDictionary* output = [[dict copy] autorelease];
return output;
}
Expand Down
10 changes: 5 additions & 5 deletions samples/objc/Order.m
View file
Expand Up @@ -49,10 +49,10 @@ - (id) initWithValues: (NSDictionary*)dict

-(NSDictionary*) asDictionary {
NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
[dict setObject:__id forKey:@"id"];
[dict setObject:_petId forKey:@"petId"];
[dict setObject:_status forKey:@"status"];
[dict setObject:_quantity forKey:@"quantity"];
if(__id != nil) [dict setObject:__id forKey:@"id"];
if(_petId != nil) [dict setObject:_petId forKey:@"petId"];
if(_status != nil) [dict setObject:_status forKey:@"status"];
if(_quantity != nil) [dict setObject:_quantity forKey:@"quantity"];
if(_shipDate != nil){
if([_shipDate isKindOfClass:[NSArray class]]){
NSMutableArray * array = [[NSMutableArray alloc] init];
Expand All @@ -63,7 +63,7 @@ -(NSDictionary*) asDictionary {
}
}
else {
[dict setObject:[_shipDate asDictionary]forKey:@"shipDate"];
if(_shipDate != nil) [dict setObject:[_shipDate asDictionary]forKey:@"shipDate"];
}
NSDictionary* output = [[dict copy] autorelease];
return output;
Expand Down
12 changes: 6 additions & 6 deletions samples/objc/Pet.m
View file
Expand Up @@ -69,7 +69,7 @@ - (id) initWithValues: (NSDictionary*)dict

-(NSDictionary*) asDictionary {
NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
[dict setObject:__id forKey:@"id"];
if(__id != nil) [dict setObject:__id forKey:@"id"];
if(_tags != nil){
if([_tags isKindOfClass:[NSArray class]]){
NSMutableArray * array = [[NSMutableArray alloc] init];
Expand All @@ -80,7 +80,7 @@ -(NSDictionary*) asDictionary {
}
}
else {
[dict setObject:[_tags asDictionary]forKey:@"tags"];
if(_tags != nil) [dict setObject:[_tags asDictionary]forKey:@"tags"];
}
if(_category != nil){
if([_category isKindOfClass:[NSArray class]]){
Expand All @@ -92,11 +92,11 @@ -(NSDictionary*) asDictionary {
}
}
else {
[dict setObject:[_category asDictionary]forKey:@"category"];
if(_category != nil) [dict setObject:[_category asDictionary]forKey:@"category"];
}
[dict setObject:_status forKey:@"status"];
[dict setObject:_name forKey:@"name"];
[dict setObject:_photoUrls forKey:@"photoUrls"];
if(_status != nil) [dict setObject:_status forKey:@"status"];
if(_name != nil) [dict setObject:_name forKey:@"name"];
if(_photoUrls != nil) [dict setObject:_photoUrls forKey:@"photoUrls"];
NSDictionary* output = [[dict copy] autorelease];
return output;
}
Expand Down
109 changes: 76 additions & 33 deletions samples/objc/PetApi.m
View file
Expand Up @@ -32,15 +32,16 @@ -(void) getPetByIdWithCompletionBlock :(NSString*) petId
[requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"petId", @"}"]] withString: [_api escapeString:petId]];
NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
if(petId == nil) {
NSDictionary* bodyDictionary = nil;
if(petId == nil) {
// error
}
[_api invokeWithCompletionBlock:requestUrl
method: @"GET"
queryParams: queryParams
body: nil
headerParams: headerParams
completionHandler: ^(NSDictionary *data, NSError *error) {
[_api invokeWithCompletionBlock: requestUrl
method: @"GET"
queryParams: queryParams
body: bodyDictionary
headerParams: headerParams
completionHandler: ^(NSDictionary *data, NSError *error) {
if (error) {
completionBlock(nil, error);return;
}
Expand Down Expand Up @@ -90,15 +91,35 @@ -(void) addPetWithCompletionBlock :(Pet*) body
[requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
NSDictionary* bodyDictionary = nil;
if(body != nil && [body isKindOfClass:[NSArray class]]){
NSMutableArray * objs = [[NSMutableArray alloc] init];
for (id dict in body) {
if([dict respondsToSelector:@selector(asDictionary:)]) {
[objs addObject:[dict asDictionary]];
}
else{
[objs addObject:dict];
}
}
bodyDictionary = objs;
}
else if([body respondsToSelector:@selector(asDictionary)]) {
bodyDictionary = [body asDictionary];
}
else{
NSLog(@"don't know what to do with %@", body);
}

if(body == nil) {
// error
}
[_api invokeWithCompletionBlock:requestUrl
method: @"GET"
queryParams: queryParams
body: nil
headerParams: headerParams
completionHandler: ^(NSDictionary *data, NSError *error) {
[_api invokeWithCompletionBlock: requestUrl
method: @"POST"
queryParams: queryParams
body: bodyDictionary
headerParams: headerParams
completionHandler: ^(NSDictionary *data, NSError *error) {
if (error) {
completionBlock(error);return;
}
Expand Down Expand Up @@ -143,15 +164,35 @@ -(void) updatePetWithCompletionBlock :(Pet*) body
[requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
NSDictionary* bodyDictionary = nil;
if(body != nil && [body isKindOfClass:[NSArray class]]){
NSMutableArray * objs = [[NSMutableArray alloc] init];
for (id dict in body) {
if([dict respondsToSelector:@selector(asDictionary:)]) {
[objs addObject:[dict asDictionary]];
}
else{
[objs addObject:dict];
}
}
bodyDictionary = objs;
}
else if([body respondsToSelector:@selector(asDictionary)]) {
bodyDictionary = [body asDictionary];
}
else{
NSLog(@"don't know what to do with %@", body);
}

if(body == nil) {
// error
}
[_api invokeWithCompletionBlock:requestUrl
method: @"GET"
queryParams: queryParams
body: nil
headerParams: headerParams
completionHandler: ^(NSDictionary *data, NSError *error) {
[_api invokeWithCompletionBlock: requestUrl
method: @"PUT"
queryParams: queryParams
body: bodyDictionary
headerParams: headerParams
completionHandler: ^(NSDictionary *data, NSError *error) {
if (error) {
completionBlock(error);return;
}
Expand Down Expand Up @@ -198,15 +239,16 @@ -(void) findPetsByStatusWithCompletionBlock :(NSString*) status
if(status != nil)
[queryParams setValue:status forKey:@"status"];
NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
if(status == nil) {
NSDictionary* bodyDictionary = nil;
if(status == nil) {
// error
}
[_api invokeWithCompletionBlock:requestUrl
method: @"GET"
queryParams: queryParams
body: nil
headerParams: headerParams
completionHandler: ^(NSDictionary *data, NSError *error) {
[_api invokeWithCompletionBlock: requestUrl
method: @"GET"
queryParams: queryParams
body: bodyDictionary
headerParams: headerParams
completionHandler: ^(NSDictionary *data, NSError *error) {
if (error) {
completionBlock(nil, error);return;
}
Expand Down Expand Up @@ -273,15 +315,16 @@ -(void) findPetsByTagsWithCompletionBlock :(NSString*) tags
if(tags != nil)
[queryParams setValue:tags forKey:@"tags"];
NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
if(tags == nil) {
NSDictionary* bodyDictionary = nil;
if(tags == nil) {
// error
}
[_api invokeWithCompletionBlock:requestUrl
method: @"GET"
queryParams: queryParams
body: nil
headerParams: headerParams
completionHandler: ^(NSDictionary *data, NSError *error) {
[_api invokeWithCompletionBlock: requestUrl
method: @"GET"
queryParams: queryParams
body: bodyDictionary
headerParams: headerParams
completionHandler: ^(NSDictionary *data, NSError *error) {
if (error) {
completionBlock(nil, error);return;
}
Expand Down
62 changes: 42 additions & 20 deletions samples/objc/StoreApi.m
View file
Expand Up @@ -32,15 +32,16 @@ -(void) getOrderByIdWithCompletionBlock :(NSString*) orderId
[requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"orderId", @"}"]] withString: [_api escapeString:orderId]];
NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
if(orderId == nil) {
NSDictionary* bodyDictionary = nil;
if(orderId == nil) {
// error
}
[_api invokeWithCompletionBlock:requestUrl
method: @"GET"
queryParams: queryParams
body: nil
headerParams: headerParams
completionHandler: ^(NSDictionary *data, NSError *error) {
[_api invokeWithCompletionBlock: requestUrl
method: @"GET"
queryParams: queryParams
body: bodyDictionary
headerParams: headerParams
completionHandler: ^(NSDictionary *data, NSError *error) {
if (error) {
completionBlock(nil, error);return;
}
Expand Down Expand Up @@ -91,15 +92,16 @@ -(void) deleteOrderWithCompletionBlock :(NSString*) orderId
[requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"orderId", @"}"]] withString: [_api escapeString:orderId]];
NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
if(orderId == nil) {
NSDictionary* bodyDictionary = nil;
if(orderId == nil) {
// error
}
[_api invokeWithCompletionBlock:requestUrl
method: @"GET"
queryParams: queryParams
body: nil
headerParams: headerParams
completionHandler: ^(NSDictionary *data, NSError *error) {
[_api invokeWithCompletionBlock: requestUrl
method: @"DELETE"
queryParams: queryParams
body: bodyDictionary
headerParams: headerParams
completionHandler: ^(NSDictionary *data, NSError *error) {
if (error) {
completionBlock(error);return;
}
Expand Down Expand Up @@ -145,15 +147,35 @@ -(void) placeOrderWithCompletionBlock :(Order*) body
[requestUrl replaceCharactersInRange: [requestUrl rangeOfString:@".{format}"] withString:@".json"];
NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
NSDictionary* bodyDictionary = nil;
if(body != nil && [body isKindOfClass:[NSArray class]]){
NSMutableArray * objs = [[NSMutableArray alloc] init];
for (id dict in body) {
if([dict respondsToSelector:@selector(asDictionary:)]) {
[objs addObject:[dict asDictionary]];
}
else{
[objs addObject:dict];
}
}
bodyDictionary = objs;
}
else if([body respondsToSelector:@selector(asDictionary)]) {
bodyDictionary = [body asDictionary];
}
else{
NSLog(@"don't know what to do with %@", body);
}

if(body == nil) {
// error
}
[_api invokeWithCompletionBlock:requestUrl
method: @"GET"
queryParams: queryParams
body: nil
headerParams: headerParams
completionHandler: ^(NSDictionary *data, NSError *error) {
[_api invokeWithCompletionBlock: requestUrl
method: @"POST"
queryParams: queryParams
body: bodyDictionary
headerParams: headerParams
completionHandler: ^(NSDictionary *data, NSError *error) {
if (error) {
completionBlock(error);return;
}
Expand Down
4 changes: 2 additions & 2 deletions samples/objc/Tag.m
View file
Expand Up @@ -21,8 +21,8 @@ - (id) initWithValues: (NSDictionary*)dict

-(NSDictionary*) asDictionary {
NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
[dict setObject:__id forKey:@"id"];
[dict setObject:_name forKey:@"name"];
if(__id != nil) [dict setObject:__id forKey:@"id"];
if(_name != nil) [dict setObject:_name forKey:@"name"];
NSDictionary* output = [[dict copy] autorelease];
return output;
}
Expand Down
16 changes: 8 additions & 8 deletions samples/objc/User.m
View file
Expand Up @@ -45,14 +45,14 @@ - (id) initWithValues: (NSDictionary*)dict

-(NSDictionary*) asDictionary {
NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
[dict setObject:__id forKey:@"id"];
[dict setObject:_lastName forKey:@"lastName"];
[dict setObject:_username forKey:@"username"];
[dict setObject:_phone forKey:@"phone"];
[dict setObject:_email forKey:@"email"];
[dict setObject:_userStatus forKey:@"userStatus"];
[dict setObject:_firstName forKey:@"firstName"];
[dict setObject:_password forKey:@"password"];
if(__id != nil) [dict setObject:__id forKey:@"id"];
if(_lastName != nil) [dict setObject:_lastName forKey:@"lastName"];
if(_username != nil) [dict setObject:_username forKey:@"username"];
if(_phone != nil) [dict setObject:_phone forKey:@"phone"];
if(_email != nil) [dict setObject:_email forKey:@"email"];
if(_userStatus != nil) [dict setObject:_userStatus forKey:@"userStatus"];
if(_firstName != nil) [dict setObject:_firstName forKey:@"firstName"];
if(_password != nil) [dict setObject:_password forKey:@"password"];
NSDictionary* output = [[dict copy] autorelease];
return output;
}
Expand Down

0 comments on commit 06dcd73

Please sign in to comment.