diff --git a/samples/client/wordnik-api/objc/client/NIKApiTokenStatus.m b/samples/client/wordnik-api/objc/client/NIKApiTokenStatus.m index 990004314030..8a6b1ebe09e5 100644 --- a/samples/client/wordnik-api/objc/client/NIKApiTokenStatus.m +++ b/samples/client/wordnik-api/objc/client/NIKApiTokenStatus.m @@ -1,3 +1,4 @@ +#import "NIKDate.h" #import "NIKApiTokenStatus.h" @implementation NIKApiTokenStatus diff --git a/samples/client/wordnik-api/objc/client/NIKAudioFile.m b/samples/client/wordnik-api/objc/client/NIKAudioFile.m index e364f86deaa7..21ab8f405d6b 100644 --- a/samples/client/wordnik-api/objc/client/NIKAudioFile.m +++ b/samples/client/wordnik-api/objc/client/NIKAudioFile.m @@ -1,3 +1,4 @@ +#import "NIKDate.h" #import "NIKAudioFile.h" @implementation NIKAudioFile diff --git a/samples/client/wordnik-api/objc/client/NIKAuthenticationToken.m b/samples/client/wordnik-api/objc/client/NIKAuthenticationToken.m index 37315edc109a..51883c74ddbb 100644 --- a/samples/client/wordnik-api/objc/client/NIKAuthenticationToken.m +++ b/samples/client/wordnik-api/objc/client/NIKAuthenticationToken.m @@ -1,3 +1,4 @@ +#import "NIKDate.h" #import "NIKAuthenticationToken.h" @implementation NIKAuthenticationToken diff --git a/samples/client/wordnik-api/objc/client/NIKBigram.m b/samples/client/wordnik-api/objc/client/NIKBigram.m index ef67cf65086d..46b2ca38761e 100644 --- a/samples/client/wordnik-api/objc/client/NIKBigram.m +++ b/samples/client/wordnik-api/objc/client/NIKBigram.m @@ -1,3 +1,4 @@ +#import "NIKDate.h" #import "NIKBigram.h" @implementation NIKBigram diff --git a/samples/client/wordnik-api/objc/client/NIKCitation.m b/samples/client/wordnik-api/objc/client/NIKCitation.m index 8cce7ee5e786..2cd9c11153fe 100644 --- a/samples/client/wordnik-api/objc/client/NIKCitation.m +++ b/samples/client/wordnik-api/objc/client/NIKCitation.m @@ -1,3 +1,4 @@ +#import "NIKDate.h" #import "NIKCitation.h" @implementation NIKCitation diff --git a/samples/client/wordnik-api/objc/client/NIKContentProvider.m b/samples/client/wordnik-api/objc/client/NIKContentProvider.m index 1685e7932e17..2f93695596c6 100644 --- a/samples/client/wordnik-api/objc/client/NIKContentProvider.m +++ b/samples/client/wordnik-api/objc/client/NIKContentProvider.m @@ -1,3 +1,4 @@ +#import "NIKDate.h" #import "NIKContentProvider.h" @implementation NIKContentProvider diff --git a/samples/client/wordnik-api/objc/client/NIKDefinition.h b/samples/client/wordnik-api/objc/client/NIKDefinition.h index ad722c690a70..a9e152b30d8e 100644 --- a/samples/client/wordnik-api/objc/client/NIKDefinition.h +++ b/samples/client/wordnik-api/objc/client/NIKDefinition.h @@ -22,8 +22,8 @@ NSArray* _relatedWords; //Related NSString* _sequence; //NSString NSString* _word; //NSString - NSArray* _textProns; //TextPron NSArray* _notes; //Note + NSArray* _textProns; //TextPron NSString* _partOfSpeech; //NSString } @@ -42,8 +42,8 @@ @property(nonatomic) NSArray* relatedWords; @property(nonatomic) NSString* sequence; @property(nonatomic) NSString* word; -@property(nonatomic) NSArray* textProns; @property(nonatomic) NSArray* notes; +@property(nonatomic) NSArray* textProns; @property(nonatomic) NSString* partOfSpeech; - (id) extendedText: (NSString*) extendedText text: (NSString*) text @@ -58,8 +58,8 @@ relatedWords: (NSArray*) relatedWords sequence: (NSString*) sequence word: (NSString*) word - textProns: (NSArray*) textProns notes: (NSArray*) notes + textProns: (NSArray*) textProns partOfSpeech: (NSString*) partOfSpeech; - (id) initWithValues: (NSDictionary*)dict; diff --git a/samples/client/wordnik-api/objc/client/NIKDefinition.m b/samples/client/wordnik-api/objc/client/NIKDefinition.m index ce557065ebfe..c01e106d83e3 100644 --- a/samples/client/wordnik-api/objc/client/NIKDefinition.m +++ b/samples/client/wordnik-api/objc/client/NIKDefinition.m @@ -1,3 +1,4 @@ +#import "NIKDate.h" #import "NIKDefinition.h" @implementation NIKDefinition @@ -15,8 +16,8 @@ @synthesize relatedWords = _relatedWords; @synthesize sequence = _sequence; @synthesize word = _word; -@synthesize textProns = _textProns; @synthesize notes = _notes; +@synthesize textProns = _textProns; @synthesize partOfSpeech = _partOfSpeech; - (id) extendedText: (NSString*) extendedText text: (NSString*) text @@ -31,8 +32,8 @@ relatedWords: (NSArray*) relatedWords sequence: (NSString*) sequence word: (NSString*) word - textProns: (NSArray*) textProns notes: (NSArray*) notes + textProns: (NSArray*) textProns partOfSpeech: (NSString*) partOfSpeech { _extendedText = extendedText; @@ -48,8 +49,8 @@ _relatedWords = relatedWords; _sequence = sequence; _word = word; - _textProns = textProns; _notes = notes; + _textProns = textProns; _partOfSpeech = partOfSpeech; return self; } @@ -109,17 +110,6 @@ } _sequence = [dict objectForKey:@"sequence"]; _word = [dict objectForKey:@"word"]; - id textProns_dict = [dict objectForKey:@"textProns"]; - if([textProns_dict isKindOfClass:[NSArray class]]) { - if([(NSArray*)textProns_dict count] > 0) { - NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)textProns_dict count]]; - for (NSDictionary* dict in (NSArray*)textProns_dict) { - NIKTextPron* d = [[NIKTextPron alloc]initWithValues:dict]; - [objs addObject:d]; - } - _textProns = [[NSArray alloc] initWithArray:objs]; - } - } id notes_dict = [dict objectForKey:@"notes"]; if([notes_dict isKindOfClass:[NSArray class]]) { if([(NSArray*)notes_dict count] > 0) { @@ -131,6 +121,17 @@ _notes = [[NSArray alloc] initWithArray:objs]; } } + id textProns_dict = [dict objectForKey:@"textProns"]; + if([textProns_dict isKindOfClass:[NSArray class]]) { + if([(NSArray*)textProns_dict count] > 0) { + NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)textProns_dict count]]; + for (NSDictionary* dict in (NSArray*)textProns_dict) { + NIKTextPron* d = [[NIKTextPron alloc]initWithValues:dict]; + [objs addObject:d]; + } + _textProns = [[NSArray alloc] initWithArray:objs]; + } + } _partOfSpeech = [dict objectForKey:@"partOfSpeech"]; return self; } @@ -218,24 +219,6 @@ } if(_sequence != nil) [dict setObject:_sequence forKey:@"sequence"]; if(_word != nil) [dict setObject:_word forKey:@"word"]; - if(_textProns != nil){ - if([_textProns isKindOfClass:[NSArray class]]){ - NSMutableArray * array = [[NSMutableArray alloc] init]; - for( NIKTextPron * textProns in (NSArray*)_textProns) { - [array addObject:[(NIKSwaggerObject*)textProns asDictionary]]; - } - [dict setObject:array forKey:@"textProns"]; - } - else if(_textProns && [_textProns isKindOfClass:[NIKDate class]]) { - NSString * dateString = [(NIKDate*)_textProns toString]; - if(dateString){ - [dict setObject:dateString forKey:@"textProns"]; - } - } - } - else { - if(_textProns != nil) [dict setObject:[(NIKSwaggerObject*)_textProns asDictionary]forKey:@"textProns"]; - } if(_notes != nil){ if([_notes isKindOfClass:[NSArray class]]){ NSMutableArray * array = [[NSMutableArray alloc] init]; @@ -254,6 +237,24 @@ else { if(_notes != nil) [dict setObject:[(NIKSwaggerObject*)_notes asDictionary]forKey:@"notes"]; } + if(_textProns != nil){ + if([_textProns isKindOfClass:[NSArray class]]){ + NSMutableArray * array = [[NSMutableArray alloc] init]; + for( NIKTextPron * textProns in (NSArray*)_textProns) { + [array addObject:[(NIKSwaggerObject*)textProns asDictionary]]; + } + [dict setObject:array forKey:@"textProns"]; + } + else if(_textProns && [_textProns isKindOfClass:[NIKDate class]]) { + NSString * dateString = [(NIKDate*)_textProns toString]; + if(dateString){ + [dict setObject:dateString forKey:@"textProns"]; + } + } + } + else { + if(_textProns != nil) [dict setObject:[(NIKSwaggerObject*)_textProns asDictionary]forKey:@"textProns"]; + } if(_partOfSpeech != nil) [dict setObject:_partOfSpeech forKey:@"partOfSpeech"]; NSDictionary* output = [dict copy]; return output; diff --git a/samples/client/wordnik-api/objc/client/NIKDefinitionSearchResults.m b/samples/client/wordnik-api/objc/client/NIKDefinitionSearchResults.m index 7a277189b97f..02a011854e9b 100644 --- a/samples/client/wordnik-api/objc/client/NIKDefinitionSearchResults.m +++ b/samples/client/wordnik-api/objc/client/NIKDefinitionSearchResults.m @@ -1,3 +1,4 @@ +#import "NIKDate.h" #import "NIKDefinitionSearchResults.h" @implementation NIKDefinitionSearchResults diff --git a/samples/client/wordnik-api/objc/client/NIKExample.h b/samples/client/wordnik-api/objc/client/NIKExample.h index ed725fc08c9d..f60a83329a0a 100644 --- a/samples/client/wordnik-api/objc/client/NIKExample.h +++ b/samples/client/wordnik-api/objc/client/NIKExample.h @@ -7,45 +7,45 @@ @interface NIKExample : NIKSwaggerObject { @private NSNumber* __id; //NSNumber - NSString* _text; //NSString - NSString* _title; //NSString NSNumber* _exampleId; //NSNumber + NSString* _title; //NSString + NSString* _text; //NSString NIKScoredWord* _score; //ScoredWord NIKSentence* _sentence; //Sentence - NSNumber* _year; //NSNumber - NIKContentProvider* _provider; //ContentProvider NSString* _word; //NSString + NIKContentProvider* _provider; //ContentProvider + NSNumber* _year; //NSNumber NSNumber* _rating; //NSNumber - NSString* _url; //NSString NSNumber* _documentId; //NSNumber + NSString* _url; //NSString } @property(nonatomic) NSNumber* _id; -@property(nonatomic) NSString* text; -@property(nonatomic) NSString* title; @property(nonatomic) NSNumber* exampleId; +@property(nonatomic) NSString* title; +@property(nonatomic) NSString* text; @property(nonatomic) NIKScoredWord* score; @property(nonatomic) NIKSentence* sentence; -@property(nonatomic) NSNumber* year; -@property(nonatomic) NIKContentProvider* provider; @property(nonatomic) NSString* word; +@property(nonatomic) NIKContentProvider* provider; +@property(nonatomic) NSNumber* year; @property(nonatomic) NSNumber* rating; -@property(nonatomic) NSString* url; @property(nonatomic) NSNumber* documentId; +@property(nonatomic) NSString* url; - (id) _id: (NSNumber*) _id - text: (NSString*) text - title: (NSString*) title exampleId: (NSNumber*) exampleId + title: (NSString*) title + text: (NSString*) text score: (NIKScoredWord*) score sentence: (NIKSentence*) sentence - year: (NSNumber*) year - provider: (NIKContentProvider*) provider word: (NSString*) word + provider: (NIKContentProvider*) provider + year: (NSNumber*) year rating: (NSNumber*) rating - url: (NSString*) url - documentId: (NSNumber*) documentId; + documentId: (NSNumber*) documentId + url: (NSString*) url; - (id) initWithValues: (NSDictionary*)dict; - (NSDictionary*) asDictionary; diff --git a/samples/client/wordnik-api/objc/client/NIKExample.m b/samples/client/wordnik-api/objc/client/NIKExample.m index 328a182e1c79..820937bbe344 100644 --- a/samples/client/wordnik-api/objc/client/NIKExample.m +++ b/samples/client/wordnik-api/objc/client/NIKExample.m @@ -1,73 +1,74 @@ +#import "NIKDate.h" #import "NIKExample.h" @implementation NIKExample @synthesize _id = __id; -@synthesize text = _text; -@synthesize title = _title; @synthesize exampleId = _exampleId; +@synthesize title = _title; +@synthesize text = _text; @synthesize score = _score; @synthesize sentence = _sentence; -@synthesize year = _year; -@synthesize provider = _provider; @synthesize word = _word; +@synthesize provider = _provider; +@synthesize year = _year; @synthesize rating = _rating; -@synthesize url = _url; @synthesize documentId = _documentId; +@synthesize url = _url; - (id) _id: (NSNumber*) _id - text: (NSString*) text - title: (NSString*) title exampleId: (NSNumber*) exampleId + title: (NSString*) title + text: (NSString*) text score: (NIKScoredWord*) score sentence: (NIKSentence*) sentence - year: (NSNumber*) year - provider: (NIKContentProvider*) provider word: (NSString*) word + provider: (NIKContentProvider*) provider + year: (NSNumber*) year rating: (NSNumber*) rating - url: (NSString*) url documentId: (NSNumber*) documentId + url: (NSString*) url { __id = _id; - _text = text; - _title = title; _exampleId = exampleId; + _title = title; + _text = text; _score = score; _sentence = sentence; - _year = year; - _provider = provider; _word = word; + _provider = provider; + _year = year; _rating = rating; - _url = url; _documentId = documentId; + _url = url; return self; } - (id) initWithValues: (NSDictionary*)dict { __id = [dict objectForKey:@"id"]; - _text = [dict objectForKey:@"text"]; - _title = [dict objectForKey:@"title"]; _exampleId = [dict objectForKey:@"exampleId"]; + _title = [dict objectForKey:@"title"]; + _text = [dict objectForKey:@"text"]; id score_dict = [dict objectForKey:@"score"]; _score = [[NIKScoredWord alloc]initWithValues:score_dict]; id sentence_dict = [dict objectForKey:@"sentence"]; _sentence = [[NIKSentence alloc]initWithValues:sentence_dict]; - _year = [dict objectForKey:@"year"]; + _word = [dict objectForKey:@"word"]; id provider_dict = [dict objectForKey:@"provider"]; _provider = [[NIKContentProvider alloc]initWithValues:provider_dict]; - _word = [dict objectForKey:@"word"]; + _year = [dict objectForKey:@"year"]; _rating = [dict objectForKey:@"rating"]; - _url = [dict objectForKey:@"url"]; _documentId = [dict objectForKey:@"documentId"]; + _url = [dict objectForKey:@"url"]; return self; } -(NSDictionary*) asDictionary { NSMutableDictionary* dict = [[NSMutableDictionary alloc] init]; if(__id != nil) [dict setObject:__id forKey:@"id"]; - if(_text != nil) [dict setObject:_text forKey:@"text"]; - if(_title != nil) [dict setObject:_title forKey:@"title"]; if(_exampleId != nil) [dict setObject:_exampleId forKey:@"exampleId"]; + if(_title != nil) [dict setObject:_title forKey:@"title"]; + if(_text != nil) [dict setObject:_text forKey:@"text"]; if(_score != nil){ if([_score isKindOfClass:[NSArray class]]){ NSMutableArray * array = [[NSMutableArray alloc] init]; @@ -104,7 +105,7 @@ else { if(_sentence != nil) [dict setObject:[(NIKSwaggerObject*)_sentence asDictionary]forKey:@"sentence"]; } - if(_year != nil) [dict setObject:_year forKey:@"year"]; + if(_word != nil) [dict setObject:_word forKey:@"word"]; if(_provider != nil){ if([_provider isKindOfClass:[NSArray class]]){ NSMutableArray * array = [[NSMutableArray alloc] init]; @@ -123,10 +124,10 @@ else { if(_provider != nil) [dict setObject:[(NIKSwaggerObject*)_provider asDictionary]forKey:@"provider"]; } - if(_word != nil) [dict setObject:_word forKey:@"word"]; + if(_year != nil) [dict setObject:_year forKey:@"year"]; if(_rating != nil) [dict setObject:_rating forKey:@"rating"]; - if(_url != nil) [dict setObject:_url forKey:@"url"]; if(_documentId != nil) [dict setObject:_documentId forKey:@"documentId"]; + if(_url != nil) [dict setObject:_url forKey:@"url"]; NSDictionary* output = [dict copy]; return output; } diff --git a/samples/client/wordnik-api/objc/client/NIKExampleSearchResults.m b/samples/client/wordnik-api/objc/client/NIKExampleSearchResults.m index 454ed90fedcc..5d2a239a6870 100644 --- a/samples/client/wordnik-api/objc/client/NIKExampleSearchResults.m +++ b/samples/client/wordnik-api/objc/client/NIKExampleSearchResults.m @@ -1,3 +1,4 @@ +#import "NIKDate.h" #import "NIKExampleSearchResults.h" @implementation NIKExampleSearchResults diff --git a/samples/client/wordnik-api/objc/client/NIKExampleUsage.m b/samples/client/wordnik-api/objc/client/NIKExampleUsage.m index 46a065b3a689..d24cea211454 100644 --- a/samples/client/wordnik-api/objc/client/NIKExampleUsage.m +++ b/samples/client/wordnik-api/objc/client/NIKExampleUsage.m @@ -1,3 +1,4 @@ +#import "NIKDate.h" #import "NIKExampleUsage.h" @implementation NIKExampleUsage diff --git a/samples/client/wordnik-api/objc/client/NIKFacet.m b/samples/client/wordnik-api/objc/client/NIKFacet.m index 94ef0dd6d7a1..8d0b123f0b8c 100644 --- a/samples/client/wordnik-api/objc/client/NIKFacet.m +++ b/samples/client/wordnik-api/objc/client/NIKFacet.m @@ -1,3 +1,4 @@ +#import "NIKDate.h" #import "NIKFacet.h" @implementation NIKFacet diff --git a/samples/client/wordnik-api/objc/client/NIKFacetValue.m b/samples/client/wordnik-api/objc/client/NIKFacetValue.m index d48ab2a58271..902707ac89ac 100644 --- a/samples/client/wordnik-api/objc/client/NIKFacetValue.m +++ b/samples/client/wordnik-api/objc/client/NIKFacetValue.m @@ -1,3 +1,4 @@ +#import "NIKDate.h" #import "NIKFacetValue.h" @implementation NIKFacetValue diff --git a/samples/client/wordnik-api/objc/client/NIKFrequency.m b/samples/client/wordnik-api/objc/client/NIKFrequency.m index fe55d23657c8..6db1f78cd5b3 100644 --- a/samples/client/wordnik-api/objc/client/NIKFrequency.m +++ b/samples/client/wordnik-api/objc/client/NIKFrequency.m @@ -1,3 +1,4 @@ +#import "NIKDate.h" #import "NIKFrequency.h" @implementation NIKFrequency diff --git a/samples/client/wordnik-api/objc/client/NIKFrequencySummary.m b/samples/client/wordnik-api/objc/client/NIKFrequencySummary.m index bc6f5d5b73a0..baedb200d977 100644 --- a/samples/client/wordnik-api/objc/client/NIKFrequencySummary.m +++ b/samples/client/wordnik-api/objc/client/NIKFrequencySummary.m @@ -1,3 +1,4 @@ +#import "NIKDate.h" #import "NIKFrequencySummary.h" @implementation NIKFrequencySummary diff --git a/samples/client/wordnik-api/objc/client/NIKLabel.m b/samples/client/wordnik-api/objc/client/NIKLabel.m index 9afe99290f14..4369c5607cc5 100644 --- a/samples/client/wordnik-api/objc/client/NIKLabel.m +++ b/samples/client/wordnik-api/objc/client/NIKLabel.m @@ -1,3 +1,4 @@ +#import "NIKDate.h" #import "NIKLabel.h" @implementation NIKLabel diff --git a/samples/client/wordnik-api/objc/client/NIKNote.m b/samples/client/wordnik-api/objc/client/NIKNote.m index 3c5bb68842b7..b05925e18118 100644 --- a/samples/client/wordnik-api/objc/client/NIKNote.m +++ b/samples/client/wordnik-api/objc/client/NIKNote.m @@ -1,3 +1,4 @@ +#import "NIKDate.h" #import "NIKNote.h" @implementation NIKNote diff --git a/samples/client/wordnik-api/objc/client/NIKRelated.h b/samples/client/wordnik-api/objc/client/NIKRelated.h index 3b47ba6fbbab..393bce6a81b4 100644 --- a/samples/client/wordnik-api/objc/client/NIKRelated.h +++ b/samples/client/wordnik-api/objc/client/NIKRelated.h @@ -4,30 +4,30 @@ @interface NIKRelated : NIKSwaggerObject { @private NSString* _label1; //NSString - NSString* _label2; //NSString NSString* _relationshipType; //NSString + NSString* _label2; //NSString NSString* _label3; //NSString NSArray* _words; //NSString - NSString* _label4; //NSString NSString* _gram; //NSString + NSString* _label4; //NSString } @property(nonatomic) NSString* label1; -@property(nonatomic) NSString* label2; @property(nonatomic) NSString* relationshipType; +@property(nonatomic) NSString* label2; @property(nonatomic) NSString* label3; @property(nonatomic) NSArray* words; -@property(nonatomic) NSString* label4; @property(nonatomic) NSString* gram; +@property(nonatomic) NSString* label4; - (id) label1: (NSString*) label1 - label2: (NSString*) label2 relationshipType: (NSString*) relationshipType + label2: (NSString*) label2 label3: (NSString*) label3 words: (NSArray*) words - label4: (NSString*) label4 - gram: (NSString*) gram; + gram: (NSString*) gram + label4: (NSString*) label4; - (id) initWithValues: (NSDictionary*)dict; - (NSDictionary*) asDictionary; diff --git a/samples/client/wordnik-api/objc/client/NIKRelated.m b/samples/client/wordnik-api/objc/client/NIKRelated.m index ef3213056d4a..8757cbce94b0 100644 --- a/samples/client/wordnik-api/objc/client/NIKRelated.m +++ b/samples/client/wordnik-api/objc/client/NIKRelated.m @@ -1,53 +1,54 @@ +#import "NIKDate.h" #import "NIKRelated.h" @implementation NIKRelated @synthesize label1 = _label1; -@synthesize label2 = _label2; @synthesize relationshipType = _relationshipType; +@synthesize label2 = _label2; @synthesize label3 = _label3; @synthesize words = _words; -@synthesize label4 = _label4; @synthesize gram = _gram; +@synthesize label4 = _label4; - (id) label1: (NSString*) label1 - label2: (NSString*) label2 relationshipType: (NSString*) relationshipType + label2: (NSString*) label2 label3: (NSString*) label3 words: (NSArray*) words - label4: (NSString*) label4 gram: (NSString*) gram + label4: (NSString*) label4 { _label1 = label1; - _label2 = label2; _relationshipType = relationshipType; + _label2 = label2; _label3 = label3; _words = words; - _label4 = label4; _gram = gram; + _label4 = label4; return self; } - (id) initWithValues: (NSDictionary*)dict { _label1 = [dict objectForKey:@"label1"]; - _label2 = [dict objectForKey:@"label2"]; _relationshipType = [dict objectForKey:@"relationshipType"]; + _label2 = [dict objectForKey:@"label2"]; _label3 = [dict objectForKey:@"label3"]; _words = [dict objectForKey:@"words"]; - _label4 = [dict objectForKey:@"label4"]; _gram = [dict objectForKey:@"gram"]; + _label4 = [dict objectForKey:@"label4"]; return self; } -(NSDictionary*) asDictionary { NSMutableDictionary* dict = [[NSMutableDictionary alloc] init]; if(_label1 != nil) [dict setObject:_label1 forKey:@"label1"]; - if(_label2 != nil) [dict setObject:_label2 forKey:@"label2"]; if(_relationshipType != nil) [dict setObject:_relationshipType forKey:@"relationshipType"]; + if(_label2 != nil) [dict setObject:_label2 forKey:@"label2"]; if(_label3 != nil) [dict setObject:_label3 forKey:@"label3"]; if(_words != nil) [dict setObject:_words forKey:@"words"]; - if(_label4 != nil) [dict setObject:_label4 forKey:@"label4"]; if(_gram != nil) [dict setObject:_gram forKey:@"gram"]; + if(_label4 != nil) [dict setObject:_label4 forKey:@"label4"]; NSDictionary* output = [dict copy]; return output; } diff --git a/samples/client/wordnik-api/objc/client/NIKScoredWord.h b/samples/client/wordnik-api/objc/client/NIKScoredWord.h index 4f3ad2e534bb..3680d9ccec80 100644 --- a/samples/client/wordnik-api/objc/client/NIKScoredWord.h +++ b/samples/client/wordnik-api/objc/client/NIKScoredWord.h @@ -3,14 +3,14 @@ @interface NIKScoredWord : NIKSwaggerObject { @private - NSNumber* __id; //NSNumber NSNumber* _position; //NSNumber - NSString* _lemma; //NSString + NSNumber* __id; //NSNumber NSNumber* _docTermCount; //NSNumber + NSString* _lemma; //NSString NSString* _wordType; //NSString NSNumber* _score; //NSNumber - NSString* _word; //NSString NSNumber* _sentenceId; //NSNumber + NSString* _word; //NSString NSNumber* _stopword; //NSNumber NSNumber* _baseWordScore; //NSNumber NSString* _partOfSpeech; //NSString @@ -18,25 +18,25 @@ -@property(nonatomic) NSNumber* _id; @property(nonatomic) NSNumber* position; -@property(nonatomic) NSString* lemma; +@property(nonatomic) NSNumber* _id; @property(nonatomic) NSNumber* docTermCount; +@property(nonatomic) NSString* lemma; @property(nonatomic) NSString* wordType; @property(nonatomic) NSNumber* score; -@property(nonatomic) NSString* word; @property(nonatomic) NSNumber* sentenceId; +@property(nonatomic) NSString* word; @property(nonatomic) NSNumber* stopword; @property(nonatomic) NSNumber* baseWordScore; @property(nonatomic) NSString* partOfSpeech; -- (id) _id: (NSNumber*) _id - position: (NSNumber*) position - lemma: (NSString*) lemma +- (id) position: (NSNumber*) position + _id: (NSNumber*) _id docTermCount: (NSNumber*) docTermCount + lemma: (NSString*) lemma wordType: (NSString*) wordType score: (NSNumber*) score - word: (NSString*) word sentenceId: (NSNumber*) sentenceId + word: (NSString*) word stopword: (NSNumber*) stopword baseWordScore: (NSNumber*) baseWordScore partOfSpeech: (NSString*) partOfSpeech; diff --git a/samples/client/wordnik-api/objc/client/NIKScoredWord.m b/samples/client/wordnik-api/objc/client/NIKScoredWord.m index 48f1226fc135..dd1e7666424d 100644 --- a/samples/client/wordnik-api/objc/client/NIKScoredWord.m +++ b/samples/client/wordnik-api/objc/client/NIKScoredWord.m @@ -1,38 +1,39 @@ +#import "NIKDate.h" #import "NIKScoredWord.h" @implementation NIKScoredWord -@synthesize _id = __id; @synthesize position = _position; -@synthesize lemma = _lemma; +@synthesize _id = __id; @synthesize docTermCount = _docTermCount; +@synthesize lemma = _lemma; @synthesize wordType = _wordType; @synthesize score = _score; -@synthesize word = _word; @synthesize sentenceId = _sentenceId; +@synthesize word = _word; @synthesize stopword = _stopword; @synthesize baseWordScore = _baseWordScore; @synthesize partOfSpeech = _partOfSpeech; -- (id) _id: (NSNumber*) _id - position: (NSNumber*) position - lemma: (NSString*) lemma +- (id) position: (NSNumber*) position + _id: (NSNumber*) _id docTermCount: (NSNumber*) docTermCount + lemma: (NSString*) lemma wordType: (NSString*) wordType score: (NSNumber*) score - word: (NSString*) word sentenceId: (NSNumber*) sentenceId + word: (NSString*) word stopword: (NSNumber*) stopword baseWordScore: (NSNumber*) baseWordScore partOfSpeech: (NSString*) partOfSpeech { - __id = _id; _position = position; - _lemma = lemma; + __id = _id; _docTermCount = docTermCount; + _lemma = lemma; _wordType = wordType; _score = score; - _word = word; _sentenceId = sentenceId; + _word = word; _stopword = stopword; _baseWordScore = baseWordScore; _partOfSpeech = partOfSpeech; @@ -41,14 +42,14 @@ - (id) initWithValues: (NSDictionary*)dict { - __id = [dict objectForKey:@"id"]; _position = [dict objectForKey:@"position"]; - _lemma = [dict objectForKey:@"lemma"]; + __id = [dict objectForKey:@"id"]; _docTermCount = [dict objectForKey:@"docTermCount"]; + _lemma = [dict objectForKey:@"lemma"]; _wordType = [dict objectForKey:@"wordType"]; _score = [dict objectForKey:@"score"]; - _word = [dict objectForKey:@"word"]; _sentenceId = [dict objectForKey:@"sentenceId"]; + _word = [dict objectForKey:@"word"]; _stopword = [dict objectForKey:@"stopword"]; _baseWordScore = [dict objectForKey:@"baseWordScore"]; _partOfSpeech = [dict objectForKey:@"partOfSpeech"]; @@ -57,14 +58,14 @@ -(NSDictionary*) asDictionary { NSMutableDictionary* dict = [[NSMutableDictionary alloc] init]; - if(__id != nil) [dict setObject:__id forKey:@"id"]; if(_position != nil) [dict setObject:_position forKey:@"position"]; - if(_lemma != nil) [dict setObject:_lemma forKey:@"lemma"]; + if(__id != nil) [dict setObject:__id forKey:@"id"]; if(_docTermCount != nil) [dict setObject:_docTermCount forKey:@"docTermCount"]; + if(_lemma != nil) [dict setObject:_lemma forKey:@"lemma"]; if(_wordType != nil) [dict setObject:_wordType forKey:@"wordType"]; if(_score != nil) [dict setObject:_score forKey:@"score"]; - if(_word != nil) [dict setObject:_word forKey:@"word"]; if(_sentenceId != nil) [dict setObject:_sentenceId forKey:@"sentenceId"]; + if(_word != nil) [dict setObject:_word forKey:@"word"]; if(_stopword != nil) [dict setObject:_stopword forKey:@"stopword"]; if(_baseWordScore != nil) [dict setObject:_baseWordScore forKey:@"baseWordScore"]; if(_partOfSpeech != nil) [dict setObject:_partOfSpeech forKey:@"partOfSpeech"]; diff --git a/samples/client/wordnik-api/objc/client/NIKSentence.h b/samples/client/wordnik-api/objc/client/NIKSentence.h index 478bdd2f969c..70bcdc30731a 100644 --- a/samples/client/wordnik-api/objc/client/NIKSentence.h +++ b/samples/client/wordnik-api/objc/client/NIKSentence.h @@ -4,8 +4,8 @@ @interface NIKSentence : NIKSwaggerObject { @private - NSNumber* __id; //NSNumber NSNumber* _hasScoredWords; //NSNumber + NSNumber* __id; //NSNumber NSArray* _scoredWords; //ScoredWord NSString* _display; //NSString NSNumber* _rating; //NSNumber @@ -14,14 +14,14 @@ -@property(nonatomic) NSNumber* _id; @property(nonatomic) NSNumber* hasScoredWords; +@property(nonatomic) NSNumber* _id; @property(nonatomic) NSArray* scoredWords; @property(nonatomic) NSString* display; @property(nonatomic) NSNumber* rating; @property(nonatomic) NSNumber* documentMetadataId; -- (id) _id: (NSNumber*) _id - hasScoredWords: (NSNumber*) hasScoredWords +- (id) hasScoredWords: (NSNumber*) hasScoredWords + _id: (NSNumber*) _id scoredWords: (NSArray*) scoredWords display: (NSString*) display rating: (NSNumber*) rating diff --git a/samples/client/wordnik-api/objc/client/NIKSentence.m b/samples/client/wordnik-api/objc/client/NIKSentence.m index 1f83356949fa..e18c991e414e 100644 --- a/samples/client/wordnik-api/objc/client/NIKSentence.m +++ b/samples/client/wordnik-api/objc/client/NIKSentence.m @@ -1,22 +1,23 @@ +#import "NIKDate.h" #import "NIKSentence.h" @implementation NIKSentence -@synthesize _id = __id; @synthesize hasScoredWords = _hasScoredWords; +@synthesize _id = __id; @synthesize scoredWords = _scoredWords; @synthesize display = _display; @synthesize rating = _rating; @synthesize documentMetadataId = _documentMetadataId; -- (id) _id: (NSNumber*) _id - hasScoredWords: (NSNumber*) hasScoredWords +- (id) hasScoredWords: (NSNumber*) hasScoredWords + _id: (NSNumber*) _id scoredWords: (NSArray*) scoredWords display: (NSString*) display rating: (NSNumber*) rating documentMetadataId: (NSNumber*) documentMetadataId { - __id = _id; _hasScoredWords = hasScoredWords; + __id = _id; _scoredWords = scoredWords; _display = display; _rating = rating; @@ -26,8 +27,8 @@ - (id) initWithValues: (NSDictionary*)dict { - __id = [dict objectForKey:@"id"]; _hasScoredWords = [dict objectForKey:@"hasScoredWords"]; + __id = [dict objectForKey:@"id"]; id scoredWords_dict = [dict objectForKey:@"scoredWords"]; if([scoredWords_dict isKindOfClass:[NSArray class]]) { if([(NSArray*)scoredWords_dict count] > 0) { @@ -47,8 +48,8 @@ -(NSDictionary*) asDictionary { NSMutableDictionary* dict = [[NSMutableDictionary alloc] init]; - if(__id != nil) [dict setObject:__id forKey:@"id"]; if(_hasScoredWords != nil) [dict setObject:_hasScoredWords forKey:@"hasScoredWords"]; + if(__id != nil) [dict setObject:__id forKey:@"id"]; if(_scoredWords != nil){ if([_scoredWords isKindOfClass:[NSArray class]]){ NSMutableArray * array = [[NSMutableArray alloc] init]; diff --git a/samples/client/wordnik-api/objc/client/NIKSimpleDefinition.m b/samples/client/wordnik-api/objc/client/NIKSimpleDefinition.m index 79807221c5fe..5ca758158917 100644 --- a/samples/client/wordnik-api/objc/client/NIKSimpleDefinition.m +++ b/samples/client/wordnik-api/objc/client/NIKSimpleDefinition.m @@ -1,3 +1,4 @@ +#import "NIKDate.h" #import "NIKSimpleDefinition.h" @implementation NIKSimpleDefinition diff --git a/samples/client/wordnik-api/objc/client/NIKSimpleExample.h b/samples/client/wordnik-api/objc/client/NIKSimpleExample.h index f6338ff48b26..9fdfe9627b42 100644 --- a/samples/client/wordnik-api/objc/client/NIKSimpleExample.h +++ b/samples/client/wordnik-api/objc/client/NIKSimpleExample.h @@ -4,20 +4,20 @@ @interface NIKSimpleExample : NIKSwaggerObject { @private NSNumber* __id; //NSNumber - NSString* _text; //NSString NSString* _title; //NSString + NSString* _text; //NSString NSString* _url; //NSString } @property(nonatomic) NSNumber* _id; -@property(nonatomic) NSString* text; @property(nonatomic) NSString* title; +@property(nonatomic) NSString* text; @property(nonatomic) NSString* url; - (id) _id: (NSNumber*) _id - text: (NSString*) text title: (NSString*) title + text: (NSString*) text url: (NSString*) url; - (id) initWithValues: (NSDictionary*)dict; diff --git a/samples/client/wordnik-api/objc/client/NIKSimpleExample.m b/samples/client/wordnik-api/objc/client/NIKSimpleExample.m index c1aa71fed632..97c282869373 100644 --- a/samples/client/wordnik-api/objc/client/NIKSimpleExample.m +++ b/samples/client/wordnik-api/objc/client/NIKSimpleExample.m @@ -1,19 +1,20 @@ +#import "NIKDate.h" #import "NIKSimpleExample.h" @implementation NIKSimpleExample @synthesize _id = __id; -@synthesize text = _text; @synthesize title = _title; +@synthesize text = _text; @synthesize url = _url; - (id) _id: (NSNumber*) _id - text: (NSString*) text title: (NSString*) title + text: (NSString*) text url: (NSString*) url { __id = _id; - _text = text; _title = title; + _text = text; _url = url; return self; } @@ -21,8 +22,8 @@ - (id) initWithValues: (NSDictionary*)dict { __id = [dict objectForKey:@"id"]; - _text = [dict objectForKey:@"text"]; _title = [dict objectForKey:@"title"]; + _text = [dict objectForKey:@"text"]; _url = [dict objectForKey:@"url"]; return self; } @@ -30,8 +31,8 @@ -(NSDictionary*) asDictionary { NSMutableDictionary* dict = [[NSMutableDictionary alloc] init]; if(__id != nil) [dict setObject:__id forKey:@"id"]; - if(_text != nil) [dict setObject:_text forKey:@"text"]; if(_title != nil) [dict setObject:_title forKey:@"title"]; + if(_text != nil) [dict setObject:_text forKey:@"text"]; if(_url != nil) [dict setObject:_url forKey:@"url"]; NSDictionary* output = [dict copy]; return output; diff --git a/samples/client/wordnik-api/objc/client/NIKStringValue.m b/samples/client/wordnik-api/objc/client/NIKStringValue.m index 049115a380e6..c94417c0b138 100644 --- a/samples/client/wordnik-api/objc/client/NIKStringValue.m +++ b/samples/client/wordnik-api/objc/client/NIKStringValue.m @@ -1,3 +1,4 @@ +#import "NIKDate.h" #import "NIKStringValue.h" @implementation NIKStringValue diff --git a/samples/client/wordnik-api/objc/client/NIKSyllable.m b/samples/client/wordnik-api/objc/client/NIKSyllable.m index 7b10b2752140..9cf8194ac5fe 100644 --- a/samples/client/wordnik-api/objc/client/NIKSyllable.m +++ b/samples/client/wordnik-api/objc/client/NIKSyllable.m @@ -1,3 +1,4 @@ +#import "NIKDate.h" #import "NIKSyllable.h" @implementation NIKSyllable diff --git a/samples/client/wordnik-api/objc/client/NIKTextPron.m b/samples/client/wordnik-api/objc/client/NIKTextPron.m index 94fb3656147c..634cb43319fe 100644 --- a/samples/client/wordnik-api/objc/client/NIKTextPron.m +++ b/samples/client/wordnik-api/objc/client/NIKTextPron.m @@ -1,3 +1,4 @@ +#import "NIKDate.h" #import "NIKTextPron.h" @implementation NIKTextPron diff --git a/samples/client/wordnik-api/objc/client/NIKUser.h b/samples/client/wordnik-api/objc/client/NIKUser.h index daf5f2d830ee..a36532516cc9 100644 --- a/samples/client/wordnik-api/objc/client/NIKUser.h +++ b/samples/client/wordnik-api/objc/client/NIKUser.h @@ -5,8 +5,8 @@ @private NSNumber* __id; //NSNumber NSString* _username; //NSString - NSNumber* _status; //NSNumber NSString* _email; //NSString + NSNumber* _status; //NSNumber NSString* _faceBookId; //NSString NSString* _userName; //NSString NSString* _displayName; //NSString @@ -17,16 +17,16 @@ @property(nonatomic) NSNumber* _id; @property(nonatomic) NSString* username; -@property(nonatomic) NSNumber* status; @property(nonatomic) NSString* email; +@property(nonatomic) NSNumber* status; @property(nonatomic) NSString* faceBookId; @property(nonatomic) NSString* userName; @property(nonatomic) NSString* displayName; @property(nonatomic) NSString* password; - (id) _id: (NSNumber*) _id username: (NSString*) username - status: (NSNumber*) status email: (NSString*) email + status: (NSNumber*) status faceBookId: (NSString*) faceBookId userName: (NSString*) userName displayName: (NSString*) displayName diff --git a/samples/client/wordnik-api/objc/client/NIKUser.m b/samples/client/wordnik-api/objc/client/NIKUser.m index 755b70192f49..3b32b7fd7f54 100644 --- a/samples/client/wordnik-api/objc/client/NIKUser.m +++ b/samples/client/wordnik-api/objc/client/NIKUser.m @@ -1,19 +1,20 @@ +#import "NIKDate.h" #import "NIKUser.h" @implementation NIKUser @synthesize _id = __id; @synthesize username = _username; -@synthesize status = _status; @synthesize email = _email; +@synthesize status = _status; @synthesize faceBookId = _faceBookId; @synthesize userName = _userName; @synthesize displayName = _displayName; @synthesize password = _password; - (id) _id: (NSNumber*) _id username: (NSString*) username - status: (NSNumber*) status email: (NSString*) email + status: (NSNumber*) status faceBookId: (NSString*) faceBookId userName: (NSString*) userName displayName: (NSString*) displayName @@ -21,8 +22,8 @@ { __id = _id; _username = username; - _status = status; _email = email; + _status = status; _faceBookId = faceBookId; _userName = userName; _displayName = displayName; @@ -34,8 +35,8 @@ { __id = [dict objectForKey:@"id"]; _username = [dict objectForKey:@"username"]; - _status = [dict objectForKey:@"status"]; _email = [dict objectForKey:@"email"]; + _status = [dict objectForKey:@"status"]; _faceBookId = [dict objectForKey:@"faceBookId"]; _userName = [dict objectForKey:@"userName"]; _displayName = [dict objectForKey:@"displayName"]; @@ -47,8 +48,8 @@ NSMutableDictionary* dict = [[NSMutableDictionary alloc] init]; if(__id != nil) [dict setObject:__id forKey:@"id"]; if(_username != nil) [dict setObject:_username forKey:@"username"]; - if(_status != nil) [dict setObject:_status forKey:@"status"]; if(_email != nil) [dict setObject:_email forKey:@"email"]; + if(_status != nil) [dict setObject:_status forKey:@"status"]; if(_faceBookId != nil) [dict setObject:_faceBookId forKey:@"faceBookId"]; if(_userName != nil) [dict setObject:_userName forKey:@"userName"]; if(_displayName != nil) [dict setObject:_displayName forKey:@"displayName"]; diff --git a/samples/client/wordnik-api/objc/client/NIKWordList.h b/samples/client/wordnik-api/objc/client/NIKWordList.h index acc8423fe146..08e366d0ceae 100644 --- a/samples/client/wordnik-api/objc/client/NIKWordList.h +++ b/samples/client/wordnik-api/objc/client/NIKWordList.h @@ -4,41 +4,41 @@ @interface NIKWordList : NIKSwaggerObject { @private - NSNumber* __id; //NSNumber NIKDate* _updatedAt; //NIKDate + NSNumber* __id; //NSNumber NSString* _username; //NSString NSString* _permalink; //NSString - NSString* _description; //NSString - NIKDate* _createdAt; //NIKDate NIKDate* _lastActivityAt; //NIKDate - NSString* _name; //NSString + NIKDate* _createdAt; //NIKDate + NSString* _description; //NSString NSNumber* _userId; //NSNumber + NSString* _name; //NSString NSNumber* _numberWordsInList; //NSNumber NSString* _type; //NSString } -@property(nonatomic) NSNumber* _id; @property(nonatomic) NIKDate* updatedAt; +@property(nonatomic) NSNumber* _id; @property(nonatomic) NSString* username; @property(nonatomic) NSString* permalink; -@property(nonatomic) NSString* description; -@property(nonatomic) NIKDate* createdAt; @property(nonatomic) NIKDate* lastActivityAt; -@property(nonatomic) NSString* name; +@property(nonatomic) NIKDate* createdAt; +@property(nonatomic) NSString* description; @property(nonatomic) NSNumber* userId; +@property(nonatomic) NSString* name; @property(nonatomic) NSNumber* numberWordsInList; @property(nonatomic) NSString* type; -- (id) _id: (NSNumber*) _id - updatedAt: (NIKDate*) updatedAt +- (id) updatedAt: (NIKDate*) updatedAt + _id: (NSNumber*) _id username: (NSString*) username permalink: (NSString*) permalink - description: (NSString*) description - createdAt: (NIKDate*) createdAt lastActivityAt: (NIKDate*) lastActivityAt - name: (NSString*) name + createdAt: (NIKDate*) createdAt + description: (NSString*) description userId: (NSNumber*) userId + name: (NSString*) name numberWordsInList: (NSNumber*) numberWordsInList type: (NSString*) type; diff --git a/samples/client/wordnik-api/objc/client/NIKWordList.m b/samples/client/wordnik-api/objc/client/NIKWordList.m index 47b8f5d3fae7..f6f1eefc1ed9 100644 --- a/samples/client/wordnik-api/objc/client/NIKWordList.m +++ b/samples/client/wordnik-api/objc/client/NIKWordList.m @@ -1,39 +1,40 @@ +#import "NIKDate.h" #import "NIKWordList.h" @implementation NIKWordList -@synthesize _id = __id; @synthesize updatedAt = _updatedAt; +@synthesize _id = __id; @synthesize username = _username; @synthesize permalink = _permalink; -@synthesize description = _description; -@synthesize createdAt = _createdAt; @synthesize lastActivityAt = _lastActivityAt; -@synthesize name = _name; +@synthesize createdAt = _createdAt; +@synthesize description = _description; @synthesize userId = _userId; +@synthesize name = _name; @synthesize numberWordsInList = _numberWordsInList; @synthesize type = _type; -- (id) _id: (NSNumber*) _id - updatedAt: (NIKDate*) updatedAt +- (id) updatedAt: (NIKDate*) updatedAt + _id: (NSNumber*) _id username: (NSString*) username permalink: (NSString*) permalink - description: (NSString*) description - createdAt: (NIKDate*) createdAt lastActivityAt: (NIKDate*) lastActivityAt - name: (NSString*) name + createdAt: (NIKDate*) createdAt + description: (NSString*) description userId: (NSNumber*) userId + name: (NSString*) name numberWordsInList: (NSNumber*) numberWordsInList type: (NSString*) type { - __id = _id; _updatedAt = updatedAt; + __id = _id; _username = username; _permalink = permalink; - _description = description; - _createdAt = createdAt; _lastActivityAt = lastActivityAt; - _name = name; + _createdAt = createdAt; + _description = description; _userId = userId; + _name = name; _numberWordsInList = numberWordsInList; _type = type; return self; @@ -41,18 +42,18 @@ - (id) initWithValues: (NSDictionary*)dict { - __id = [dict objectForKey:@"id"]; id updatedAt_dict = [dict objectForKey:@"updatedAt"]; _updatedAt = [[NIKDate alloc]initWithValues:updatedAt_dict]; + __id = [dict objectForKey:@"id"]; _username = [dict objectForKey:@"username"]; _permalink = [dict objectForKey:@"permalink"]; - _description = [dict objectForKey:@"description"]; - id createdAt_dict = [dict objectForKey:@"createdAt"]; - _createdAt = [[NIKDate alloc]initWithValues:createdAt_dict]; id lastActivityAt_dict = [dict objectForKey:@"lastActivityAt"]; _lastActivityAt = [[NIKDate alloc]initWithValues:lastActivityAt_dict]; - _name = [dict objectForKey:@"name"]; + id createdAt_dict = [dict objectForKey:@"createdAt"]; + _createdAt = [[NIKDate alloc]initWithValues:createdAt_dict]; + _description = [dict objectForKey:@"description"]; _userId = [dict objectForKey:@"userId"]; + _name = [dict objectForKey:@"name"]; _numberWordsInList = [dict objectForKey:@"numberWordsInList"]; _type = [dict objectForKey:@"type"]; return self; @@ -60,7 +61,6 @@ -(NSDictionary*) asDictionary { NSMutableDictionary* dict = [[NSMutableDictionary alloc] init]; - if(__id != nil) [dict setObject:__id forKey:@"id"]; if(_updatedAt != nil){ if([_updatedAt isKindOfClass:[NSArray class]]){ NSMutableArray * array = [[NSMutableArray alloc] init]; @@ -79,27 +79,9 @@ else { if(_updatedAt != nil) [dict setObject:[(NIKSwaggerObject*)_updatedAt asDictionary]forKey:@"updatedAt"]; } + if(__id != nil) [dict setObject:__id forKey:@"id"]; if(_username != nil) [dict setObject:_username forKey:@"username"]; if(_permalink != nil) [dict setObject:_permalink forKey:@"permalink"]; - if(_description != nil) [dict setObject:_description forKey:@"description"]; - if(_createdAt != nil){ - if([_createdAt isKindOfClass:[NSArray class]]){ - NSMutableArray * array = [[NSMutableArray alloc] init]; - for( NIKDate * createdAt in (NSArray*)_createdAt) { - [array addObject:[(NIKSwaggerObject*)createdAt asDictionary]]; - } - [dict setObject:array forKey:@"createdAt"]; - } - else if(_createdAt && [_createdAt isKindOfClass:[NIKDate class]]) { - NSString * dateString = [(NIKDate*)_createdAt toString]; - if(dateString){ - [dict setObject:dateString forKey:@"createdAt"]; - } - } - } - else { - if(_createdAt != nil) [dict setObject:[(NIKSwaggerObject*)_createdAt asDictionary]forKey:@"createdAt"]; - } if(_lastActivityAt != nil){ if([_lastActivityAt isKindOfClass:[NSArray class]]){ NSMutableArray * array = [[NSMutableArray alloc] init]; @@ -118,8 +100,27 @@ else { if(_lastActivityAt != nil) [dict setObject:[(NIKSwaggerObject*)_lastActivityAt asDictionary]forKey:@"lastActivityAt"]; } - if(_name != nil) [dict setObject:_name forKey:@"name"]; + if(_createdAt != nil){ + if([_createdAt isKindOfClass:[NSArray class]]){ + NSMutableArray * array = [[NSMutableArray alloc] init]; + for( NIKDate * createdAt in (NSArray*)_createdAt) { + [array addObject:[(NIKSwaggerObject*)createdAt asDictionary]]; + } + [dict setObject:array forKey:@"createdAt"]; + } + else if(_createdAt && [_createdAt isKindOfClass:[NIKDate class]]) { + NSString * dateString = [(NIKDate*)_createdAt toString]; + if(dateString){ + [dict setObject:dateString forKey:@"createdAt"]; + } + } + } + else { + if(_createdAt != nil) [dict setObject:[(NIKSwaggerObject*)_createdAt asDictionary]forKey:@"createdAt"]; + } + if(_description != nil) [dict setObject:_description forKey:@"description"]; if(_userId != nil) [dict setObject:_userId forKey:@"userId"]; + if(_name != nil) [dict setObject:_name forKey:@"name"]; if(_numberWordsInList != nil) [dict setObject:_numberWordsInList forKey:@"numberWordsInList"]; if(_type != nil) [dict setObject:_type forKey:@"type"]; NSDictionary* output = [dict copy]; diff --git a/samples/client/wordnik-api/objc/client/NIKWordListWord.h b/samples/client/wordnik-api/objc/client/NIKWordListWord.h index 76446ab25033..2e6e8dcb9290 100644 --- a/samples/client/wordnik-api/objc/client/NIKWordListWord.h +++ b/samples/client/wordnik-api/objc/client/NIKWordListWord.h @@ -7,8 +7,8 @@ NSNumber* __id; //NSNumber NSString* _username; //NSString NIKDate* _createdAt; //NIKDate - NSNumber* _userId; //NSNumber NSNumber* _numberCommentsOnWord; //NSNumber + NSNumber* _userId; //NSNumber NSString* _word; //NSString NSNumber* _numberLists; //NSNumber } @@ -18,15 +18,15 @@ @property(nonatomic) NSNumber* _id; @property(nonatomic) NSString* username; @property(nonatomic) NIKDate* createdAt; -@property(nonatomic) NSNumber* userId; @property(nonatomic) NSNumber* numberCommentsOnWord; +@property(nonatomic) NSNumber* userId; @property(nonatomic) NSString* word; @property(nonatomic) NSNumber* numberLists; - (id) _id: (NSNumber*) _id username: (NSString*) username createdAt: (NIKDate*) createdAt - userId: (NSNumber*) userId numberCommentsOnWord: (NSNumber*) numberCommentsOnWord + userId: (NSNumber*) userId word: (NSString*) word numberLists: (NSNumber*) numberLists; diff --git a/samples/client/wordnik-api/objc/client/NIKWordListWord.m b/samples/client/wordnik-api/objc/client/NIKWordListWord.m index 20ab1fd67c8b..a5eed999fc27 100644 --- a/samples/client/wordnik-api/objc/client/NIKWordListWord.m +++ b/samples/client/wordnik-api/objc/client/NIKWordListWord.m @@ -1,3 +1,4 @@ +#import "NIKDate.h" #import "NIKWordListWord.h" @implementation NIKWordListWord @@ -5,23 +6,23 @@ @synthesize _id = __id; @synthesize username = _username; @synthesize createdAt = _createdAt; -@synthesize userId = _userId; @synthesize numberCommentsOnWord = _numberCommentsOnWord; +@synthesize userId = _userId; @synthesize word = _word; @synthesize numberLists = _numberLists; - (id) _id: (NSNumber*) _id username: (NSString*) username createdAt: (NIKDate*) createdAt - userId: (NSNumber*) userId numberCommentsOnWord: (NSNumber*) numberCommentsOnWord + userId: (NSNumber*) userId word: (NSString*) word numberLists: (NSNumber*) numberLists { __id = _id; _username = username; _createdAt = createdAt; - _userId = userId; _numberCommentsOnWord = numberCommentsOnWord; + _userId = userId; _word = word; _numberLists = numberLists; return self; @@ -33,8 +34,8 @@ _username = [dict objectForKey:@"username"]; id createdAt_dict = [dict objectForKey:@"createdAt"]; _createdAt = [[NIKDate alloc]initWithValues:createdAt_dict]; - _userId = [dict objectForKey:@"userId"]; _numberCommentsOnWord = [dict objectForKey:@"numberCommentsOnWord"]; + _userId = [dict objectForKey:@"userId"]; _word = [dict objectForKey:@"word"]; _numberLists = [dict objectForKey:@"numberLists"]; return self; @@ -62,8 +63,8 @@ else { if(_createdAt != nil) [dict setObject:[(NIKSwaggerObject*)_createdAt asDictionary]forKey:@"createdAt"]; } - if(_userId != nil) [dict setObject:_userId forKey:@"userId"]; if(_numberCommentsOnWord != nil) [dict setObject:_numberCommentsOnWord forKey:@"numberCommentsOnWord"]; + if(_userId != nil) [dict setObject:_userId forKey:@"userId"]; if(_word != nil) [dict setObject:_word forKey:@"word"]; if(_numberLists != nil) [dict setObject:_numberLists forKey:@"numberLists"]; NSDictionary* output = [dict copy]; diff --git a/samples/client/wordnik-api/objc/client/NIKWordObject.h b/samples/client/wordnik-api/objc/client/NIKWordObject.h index 8f81c0644bfa..e98c9d99bb52 100644 --- a/samples/client/wordnik-api/objc/client/NIKWordObject.h +++ b/samples/client/wordnik-api/objc/client/NIKWordObject.h @@ -4,8 +4,8 @@ @interface NIKWordObject : NIKSwaggerObject { @private NSNumber* __id; //NSNumber - NSString* _originalWord; //NSString NSString* _word; //NSString + NSString* _originalWord; //NSString NSArray* _suggestions; //NSString NSString* _canonicalForm; //NSString NSString* _vulgar; //NSString @@ -14,14 +14,14 @@ @property(nonatomic) NSNumber* _id; -@property(nonatomic) NSString* originalWord; @property(nonatomic) NSString* word; +@property(nonatomic) NSString* originalWord; @property(nonatomic) NSArray* suggestions; @property(nonatomic) NSString* canonicalForm; @property(nonatomic) NSString* vulgar; - (id) _id: (NSNumber*) _id - originalWord: (NSString*) originalWord word: (NSString*) word + originalWord: (NSString*) originalWord suggestions: (NSArray*) suggestions canonicalForm: (NSString*) canonicalForm vulgar: (NSString*) vulgar; diff --git a/samples/client/wordnik-api/objc/client/NIKWordObject.m b/samples/client/wordnik-api/objc/client/NIKWordObject.m index adc2cb26c4aa..5881989beb5f 100644 --- a/samples/client/wordnik-api/objc/client/NIKWordObject.m +++ b/samples/client/wordnik-api/objc/client/NIKWordObject.m @@ -1,23 +1,24 @@ +#import "NIKDate.h" #import "NIKWordObject.h" @implementation NIKWordObject @synthesize _id = __id; -@synthesize originalWord = _originalWord; @synthesize word = _word; +@synthesize originalWord = _originalWord; @synthesize suggestions = _suggestions; @synthesize canonicalForm = _canonicalForm; @synthesize vulgar = _vulgar; - (id) _id: (NSNumber*) _id - originalWord: (NSString*) originalWord word: (NSString*) word + originalWord: (NSString*) originalWord suggestions: (NSArray*) suggestions canonicalForm: (NSString*) canonicalForm vulgar: (NSString*) vulgar { __id = _id; - _originalWord = originalWord; _word = word; + _originalWord = originalWord; _suggestions = suggestions; _canonicalForm = canonicalForm; _vulgar = vulgar; @@ -27,8 +28,8 @@ - (id) initWithValues: (NSDictionary*)dict { __id = [dict objectForKey:@"id"]; - _originalWord = [dict objectForKey:@"originalWord"]; _word = [dict objectForKey:@"word"]; + _originalWord = [dict objectForKey:@"originalWord"]; _suggestions = [dict objectForKey:@"suggestions"]; _canonicalForm = [dict objectForKey:@"canonicalForm"]; _vulgar = [dict objectForKey:@"vulgar"]; @@ -38,8 +39,8 @@ -(NSDictionary*) asDictionary { NSMutableDictionary* dict = [[NSMutableDictionary alloc] init]; if(__id != nil) [dict setObject:__id forKey:@"id"]; - if(_originalWord != nil) [dict setObject:_originalWord forKey:@"originalWord"]; if(_word != nil) [dict setObject:_word forKey:@"word"]; + if(_originalWord != nil) [dict setObject:_originalWord forKey:@"originalWord"]; if(_suggestions != nil) [dict setObject:_suggestions forKey:@"suggestions"]; if(_canonicalForm != nil) [dict setObject:_canonicalForm forKey:@"canonicalForm"]; if(_vulgar != nil) [dict setObject:_vulgar forKey:@"vulgar"]; diff --git a/samples/client/wordnik-api/objc/client/NIKWordOfTheDay.h b/samples/client/wordnik-api/objc/client/NIKWordOfTheDay.h index 267ecf81feef..5e413ea79d6d 100644 --- a/samples/client/wordnik-api/objc/client/NIKWordOfTheDay.h +++ b/samples/client/wordnik-api/objc/client/NIKWordOfTheDay.h @@ -13,12 +13,12 @@ NSString* _createdBy; //NSString NIKDate* _createdAt; //NIKDate NIKContentProvider* _contentProvider; //ContentProvider - NSString* _word; //NSString NSString* _htmlExtra; //NSString + NSString* _word; //NSString NSArray* _definitions; //SimpleDefinition NSArray* _examples; //SimpleExample - NIKDate* _publishDate; //NIKDate NSString* _note; //NSString + NIKDate* _publishDate; //NIKDate } @@ -29,24 +29,24 @@ @property(nonatomic) NSString* createdBy; @property(nonatomic) NIKDate* createdAt; @property(nonatomic) NIKContentProvider* contentProvider; -@property(nonatomic) NSString* word; @property(nonatomic) NSString* htmlExtra; +@property(nonatomic) NSString* word; @property(nonatomic) NSArray* definitions; @property(nonatomic) NSArray* examples; -@property(nonatomic) NIKDate* publishDate; @property(nonatomic) NSString* note; +@property(nonatomic) NIKDate* publishDate; - (id) _id: (NSNumber*) _id parentId: (NSString*) parentId category: (NSString*) category createdBy: (NSString*) createdBy createdAt: (NIKDate*) createdAt contentProvider: (NIKContentProvider*) contentProvider - word: (NSString*) word htmlExtra: (NSString*) htmlExtra + word: (NSString*) word definitions: (NSArray*) definitions examples: (NSArray*) examples - publishDate: (NIKDate*) publishDate - note: (NSString*) note; + note: (NSString*) note + publishDate: (NIKDate*) publishDate; - (id) initWithValues: (NSDictionary*)dict; - (NSDictionary*) asDictionary; diff --git a/samples/client/wordnik-api/objc/client/NIKWordOfTheDay.m b/samples/client/wordnik-api/objc/client/NIKWordOfTheDay.m index 08921b2d07f4..88eb1c617b22 100644 --- a/samples/client/wordnik-api/objc/client/NIKWordOfTheDay.m +++ b/samples/client/wordnik-api/objc/client/NIKWordOfTheDay.m @@ -1,3 +1,4 @@ +#import "NIKDate.h" #import "NIKWordOfTheDay.h" @implementation NIKWordOfTheDay @@ -8,24 +9,24 @@ @synthesize createdBy = _createdBy; @synthesize createdAt = _createdAt; @synthesize contentProvider = _contentProvider; -@synthesize word = _word; @synthesize htmlExtra = _htmlExtra; +@synthesize word = _word; @synthesize definitions = _definitions; @synthesize examples = _examples; -@synthesize publishDate = _publishDate; @synthesize note = _note; +@synthesize publishDate = _publishDate; - (id) _id: (NSNumber*) _id parentId: (NSString*) parentId category: (NSString*) category createdBy: (NSString*) createdBy createdAt: (NIKDate*) createdAt contentProvider: (NIKContentProvider*) contentProvider - word: (NSString*) word htmlExtra: (NSString*) htmlExtra + word: (NSString*) word definitions: (NSArray*) definitions examples: (NSArray*) examples - publishDate: (NIKDate*) publishDate note: (NSString*) note + publishDate: (NIKDate*) publishDate { __id = _id; _parentId = parentId; @@ -33,12 +34,12 @@ _createdBy = createdBy; _createdAt = createdAt; _contentProvider = contentProvider; - _word = word; _htmlExtra = htmlExtra; + _word = word; _definitions = definitions; _examples = examples; - _publishDate = publishDate; _note = note; + _publishDate = publishDate; return self; } @@ -52,8 +53,8 @@ _createdAt = [[NIKDate alloc]initWithValues:createdAt_dict]; id contentProvider_dict = [dict objectForKey:@"contentProvider"]; _contentProvider = [[NIKContentProvider alloc]initWithValues:contentProvider_dict]; - _word = [dict objectForKey:@"word"]; _htmlExtra = [dict objectForKey:@"htmlExtra"]; + _word = [dict objectForKey:@"word"]; id definitions_dict = [dict objectForKey:@"definitions"]; if([definitions_dict isKindOfClass:[NSArray class]]) { if([(NSArray*)definitions_dict count] > 0) { @@ -76,9 +77,9 @@ _examples = [[NSArray alloc] initWithArray:objs]; } } + _note = [dict objectForKey:@"note"]; id publishDate_dict = [dict objectForKey:@"publishDate"]; _publishDate = [[NIKDate alloc]initWithValues:publishDate_dict]; - _note = [dict objectForKey:@"note"]; return self; } @@ -124,8 +125,8 @@ else { if(_contentProvider != nil) [dict setObject:[(NIKSwaggerObject*)_contentProvider asDictionary]forKey:@"contentProvider"]; } - if(_word != nil) [dict setObject:_word forKey:@"word"]; if(_htmlExtra != nil) [dict setObject:_htmlExtra forKey:@"htmlExtra"]; + if(_word != nil) [dict setObject:_word forKey:@"word"]; if(_definitions != nil){ if([_definitions isKindOfClass:[NSArray class]]){ NSMutableArray * array = [[NSMutableArray alloc] init]; @@ -162,6 +163,7 @@ else { if(_examples != nil) [dict setObject:[(NIKSwaggerObject*)_examples asDictionary]forKey:@"examples"]; } + if(_note != nil) [dict setObject:_note forKey:@"note"]; if(_publishDate != nil){ if([_publishDate isKindOfClass:[NSArray class]]){ NSMutableArray * array = [[NSMutableArray alloc] init]; @@ -180,7 +182,6 @@ else { if(_publishDate != nil) [dict setObject:[(NIKSwaggerObject*)_publishDate asDictionary]forKey:@"publishDate"]; } - if(_note != nil) [dict setObject:_note forKey:@"note"]; NSDictionary* output = [dict copy]; return output; } diff --git a/samples/client/wordnik-api/objc/client/NIKWordSearchResult.m b/samples/client/wordnik-api/objc/client/NIKWordSearchResult.m index 28135ce3dc08..135eaf45e35f 100644 --- a/samples/client/wordnik-api/objc/client/NIKWordSearchResult.m +++ b/samples/client/wordnik-api/objc/client/NIKWordSearchResult.m @@ -1,3 +1,4 @@ +#import "NIKDate.h" #import "NIKWordSearchResult.h" @implementation NIKWordSearchResult diff --git a/samples/client/wordnik-api/objc/client/NIKWordSearchResults.h b/samples/client/wordnik-api/objc/client/NIKWordSearchResults.h index f3cce1fd21cb..5919d74b8729 100644 --- a/samples/client/wordnik-api/objc/client/NIKWordSearchResults.h +++ b/samples/client/wordnik-api/objc/client/NIKWordSearchResults.h @@ -4,16 +4,16 @@ @interface NIKWordSearchResults : NIKSwaggerObject { @private - NSNumber* _totalResults; //NSNumber NSArray* _searchResults; //WordSearchResult + NSNumber* _totalResults; //NSNumber } -@property(nonatomic) NSNumber* totalResults; @property(nonatomic) NSArray* searchResults; -- (id) totalResults: (NSNumber*) totalResults - searchResults: (NSArray*) searchResults; +@property(nonatomic) NSNumber* totalResults; +- (id) searchResults: (NSArray*) searchResults + totalResults: (NSNumber*) totalResults; - (id) initWithValues: (NSDictionary*)dict; - (NSDictionary*) asDictionary; diff --git a/samples/client/wordnik-api/objc/client/NIKWordSearchResults.m b/samples/client/wordnik-api/objc/client/NIKWordSearchResults.m index 76a639d75858..1bdfb3f961ab 100644 --- a/samples/client/wordnik-api/objc/client/NIKWordSearchResults.m +++ b/samples/client/wordnik-api/objc/client/NIKWordSearchResults.m @@ -1,20 +1,20 @@ +#import "NIKDate.h" #import "NIKWordSearchResults.h" @implementation NIKWordSearchResults -@synthesize totalResults = _totalResults; @synthesize searchResults = _searchResults; -- (id) totalResults: (NSNumber*) totalResults - searchResults: (NSArray*) searchResults +@synthesize totalResults = _totalResults; +- (id) searchResults: (NSArray*) searchResults + totalResults: (NSNumber*) totalResults { - _totalResults = totalResults; _searchResults = searchResults; + _totalResults = totalResults; return self; } - (id) initWithValues: (NSDictionary*)dict { - _totalResults = [dict objectForKey:@"totalResults"]; id searchResults_dict = [dict objectForKey:@"searchResults"]; if([searchResults_dict isKindOfClass:[NSArray class]]) { if([(NSArray*)searchResults_dict count] > 0) { @@ -26,12 +26,12 @@ _searchResults = [[NSArray alloc] initWithArray:objs]; } } + _totalResults = [dict objectForKey:@"totalResults"]; return self; } -(NSDictionary*) asDictionary { NSMutableDictionary* dict = [[NSMutableDictionary alloc] init]; - if(_totalResults != nil) [dict setObject:_totalResults forKey:@"totalResults"]; if(_searchResults != nil){ if([_searchResults isKindOfClass:[NSArray class]]){ NSMutableArray * array = [[NSMutableArray alloc] init]; @@ -50,6 +50,7 @@ else { if(_searchResults != nil) [dict setObject:[(NIKSwaggerObject*)_searchResults asDictionary]forKey:@"searchResults"]; } + if(_totalResults != nil) [dict setObject:_totalResults forKey:@"totalResults"]; NSDictionary* output = [dict copy]; return output; }