Skip to content

Commit 63fae85

Browse files
fehguyfehguy
committed
updated sample
1 parent 510254e commit 63fae85

File tree

23 files changed

+187
-600
lines changed

23 files changed

+187
-600
lines changed

‎samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.pbxproj‎

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@
1818
EA6699B01811D2FA00A70D03 /* Main_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EA6699AE1811D2FA00A70D03 /* Main_iPad.storyboard */; };
1919
EA6699B31811D2FA00A70D03 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = EA6699B21811D2FA00A70D03 /* ViewController.m */; };
2020
EA6699B51811D2FA00A70D03 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EA6699B41811D2FA00A70D03 /* Images.xcassets */; };
21-
EA6699BC1811D2FB00A70D03 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA6699BB1811D2FB00A70D03 /* XCTest.framework */; };
2221
EA6699BD1811D2FB00A70D03 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA6699991811D2FA00A70D03 /* Foundation.framework */; };
2322
EA6699BE1811D2FB00A70D03 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA66999D1811D2FA00A70D03 /* UIKit.framework */; };
2423
EA6699C61811D2FB00A70D03 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = EA6699C41811D2FB00A70D03 /* InfoPlist.strings */; };
25-
EA6699C81811D2FB00A70D03 /* PetApiTest.m in Sources */ = {isa = PBXBuildFile; fileRef = EA6699C71811D2FB00A70D03 /* PetApiTest.m */; };
2624
EA8B8AA41AC6683700638FBB /* SWGQueryParamCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = EA8B8AA31AC6683700638FBB /* SWGQueryParamCollection.m */; };
2725
EA8CD3ED1AC2763600C47D0B /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA8CD3EC1AC2763600C47D0B /* SenTestingKit.framework */; };
26+
EAB26B091AC8DE24002F5C7A /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EAB26B081AC8DE24002F5C7A /* libPods.a */; };
27+
EAB26B0C1AC8DF78002F5C7A /* PetApiTest.h in Sources */ = {isa = PBXBuildFile; fileRef = EA8CD3EB1AC274BE00C47D0B /* PetApiTest.h */; };
28+
EAB26B0D1AC8DF78002F5C7A /* PetApiTest.m in Sources */ = {isa = PBXBuildFile; fileRef = EA6699C71811D2FB00A70D03 /* PetApiTest.m */; };
2829
EAEA85E41811D3AE00F06E69 /* SWGApiClient.m in Sources */ = {isa = PBXBuildFile; fileRef = EAEA85CD1811D3AE00F06E69 /* SWGApiClient.m */; };
2930
EAEA85E51811D3AE00F06E69 /* SWGCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = EAEA85CF1811D3AE00F06E69 /* SWGCategory.m */; };
3031
EAEA85E61811D3AE00F06E69 /* SWGDate.m in Sources */ = {isa = PBXBuildFile; fileRef = EAEA85D11811D3AE00F06E69 /* SWGDate.m */; };
@@ -37,7 +38,6 @@
3738
EAEA85ED1811D3AE00F06E69 /* SWGTag.m in Sources */ = {isa = PBXBuildFile; fileRef = EAEA85DF1811D3AE00F06E69 /* SWGTag.m */; };
3839
EAEA85EE1811D3AE00F06E69 /* SWGUser.m in Sources */ = {isa = PBXBuildFile; fileRef = EAEA85E11811D3AE00F06E69 /* SWGUser.m */; };
3940
EAEA85EF1811D3AE00F06E69 /* SWGUserApi.m in Sources */ = {isa = PBXBuildFile; fileRef = EAEA85E31811D3AE00F06E69 /* SWGUserApi.m */; };
40-
EAEA85F11811D8F100F06E69 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EAEA85F01811D8F100F06E69 /* libPods.a */; };
4141
EAFBEABB1A925B8500A27431 /* test-1.png in Resources */ = {isa = PBXBuildFile; fileRef = EAFBEABA1A925B8500A27431 /* test-1.png */; };
4242
EAFBEABE1A92C42700A27431 /* SWGApiResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = EAFBEABD1A92C42700A27431 /* SWGApiResponse.m */; };
4343
/* End PBXBuildFile section */
@@ -72,14 +72,15 @@
7272
EA6699B21811D2FA00A70D03 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
7373
EA6699B41811D2FA00A70D03 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
7474
EA6699BA1811D2FB00A70D03 /* PetstoreClientTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PetstoreClientTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
75-
EA6699BB1811D2FB00A70D03 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
7675
EA6699C31811D2FB00A70D03 /* PetstoreClientTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PetstoreClientTests-Info.plist"; sourceTree = "<group>"; };
7776
EA6699C51811D2FB00A70D03 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
7877
EA6699C71811D2FB00A70D03 /* PetApiTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PetApiTest.m; sourceTree = "<group>"; };
7978
EA8B8AA21AC6683700638FBB /* SWGQueryParamCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGQueryParamCollection.h; sourceTree = "<group>"; };
8079
EA8B8AA31AC6683700638FBB /* SWGQueryParamCollection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGQueryParamCollection.m; sourceTree = "<group>"; };
8180
EA8CD3EB1AC274BE00C47D0B /* PetApiTest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PetApiTest.h; sourceTree = "<group>"; };
8281
EA8CD3EC1AC2763600C47D0B /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
82+
EAB26B081AC8DE24002F5C7A /* libPods.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libPods.a; path = "/Users/tony/dev/projects/swagger-api/swagger-codegen/samples/client/petstore/objc/Pods/../build/Debug-iphoneos/libPods.a"; sourceTree = "<absolute>"; };
83+
EAB26B0E1AC8E692002F5C7A /* SWGPet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGPet.h; sourceTree = "<group>"; };
8384
EAEA85CC1811D3AE00F06E69 /* SWGApiClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGApiClient.h; sourceTree = "<group>"; };
8485
EAEA85CD1811D3AE00F06E69 /* SWGApiClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGApiClient.m; sourceTree = "<group>"; };
8586
EAEA85CE1811D3AE00F06E69 /* SWGCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGCategory.h; sourceTree = "<group>"; };
@@ -92,7 +93,6 @@
9293
EAEA85D51811D3AE00F06E69 /* SWGObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGObject.m; sourceTree = "<group>"; };
9394
EAEA85D61811D3AE00F06E69 /* SWGOrder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGOrder.h; sourceTree = "<group>"; };
9495
EAEA85D71811D3AE00F06E69 /* SWGOrder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGOrder.m; sourceTree = "<group>"; };
95-
EAEA85D81811D3AE00F06E69 /* SWGPet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGPet.h; sourceTree = "<group>"; };
9696
EAEA85D91811D3AE00F06E69 /* SWGPet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGPet.m; sourceTree = "<group>"; };
9797
EAEA85DA1811D3AE00F06E69 /* SWGPetApi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGPetApi.h; sourceTree = "<group>"; };
9898
EAEA85DB1811D3AE00F06E69 /* SWGPetApi.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGPetApi.m; sourceTree = "<group>"; };
@@ -104,7 +104,6 @@
104104
EAEA85E11811D3AE00F06E69 /* SWGUser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGUser.m; sourceTree = "<group>"; };
105105
EAEA85E21811D3AE00F06E69 /* SWGUserApi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGUserApi.h; sourceTree = "<group>"; };
106106
EAEA85E31811D3AE00F06E69 /* SWGUserApi.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGUserApi.m; sourceTree = "<group>"; };
107-
EAEA85F01811D8F100F06E69 /* libPods.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libPods.a; path = "../Pods/build/Debug-iphoneos/libPods.a"; sourceTree = "<group>"; };
108107
EAFBEABA1A925B8500A27431 /* test-1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "test-1.png"; sourceTree = "<group>"; };
109108
EAFBEABC1A92C42700A27431 /* SWGApiResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGApiResponse.h; sourceTree = "<group>"; };
110109
EAFBEABD1A92C42700A27431 /* SWGApiResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGApiResponse.m; sourceTree = "<group>"; };
@@ -127,10 +126,9 @@
127126
buildActionMask = 2147483647;
128127
files = (
129128
EA8CD3ED1AC2763600C47D0B /* SenTestingKit.framework in Frameworks */,
130-
EAEA85F11811D8F100F06E69 /* libPods.a in Frameworks */,
131-
EA6699BC1811D2FB00A70D03 /* XCTest.framework in Frameworks */,
132129
EA6699BE1811D2FB00A70D03 /* UIKit.framework in Frameworks */,
133130
EA6699BD1811D2FB00A70D03 /* Foundation.framework in Frameworks */,
131+
EAB26B091AC8DE24002F5C7A /* libPods.a in Frameworks */,
134132
);
135133
runOnlyForDeploymentPostprocessing = 0;
136134
};
@@ -170,12 +168,11 @@
170168
EA6699981811D2FA00A70D03 /* Frameworks */ = {
171169
isa = PBXGroup;
172170
children = (
171+
EAB26B081AC8DE24002F5C7A /* libPods.a */,
173172
EA8CD3EC1AC2763600C47D0B /* SenTestingKit.framework */,
174-
EAEA85F01811D8F100F06E69 /* libPods.a */,
175173
EA6699991811D2FA00A70D03 /* Foundation.framework */,
176174
EA66999B1811D2FA00A70D03 /* CoreGraphics.framework */,
177175
EA66999D1811D2FA00A70D03 /* UIKit.framework */,
178-
EA6699BB1811D2FB00A70D03 /* XCTest.framework */,
179176
73DA4F1067C343C3962F1542 /* libPods.a */,
180177
);
181178
name = Frameworks;
@@ -246,7 +243,7 @@
246243
EAEA85D51811D3AE00F06E69 /* SWGObject.m */,
247244
EAEA85D61811D3AE00F06E69 /* SWGOrder.h */,
248245
EAEA85D71811D3AE00F06E69 /* SWGOrder.m */,
249-
EAEA85D81811D3AE00F06E69 /* SWGPet.h */,
246+
EAB26B0E1AC8E692002F5C7A /* SWGPet.h */,
250247
EAEA85D91811D3AE00F06E69 /* SWGPet.m */,
251248
EAEA85DA1811D3AE00F06E69 /* SWGPetApi.h */,
252249
EAEA85DB1811D3AE00F06E69 /* SWGPetApi.m */,
@@ -273,8 +270,8 @@
273270
04DAA264FD78471BBAD25173 /* Check Pods Manifest.lock */,
274271
EA6699921811D2FA00A70D03 /* Sources */,
275272
EA6699931811D2FA00A70D03 /* Frameworks */,
276-
EA6699941811D2FA00A70D03 /* Resources */,
277273
3692D11BB04F489DAA7C0B6A /* Copy Pods Resources */,
274+
EA6699941811D2FA00A70D03 /* Resources */,
278275
);
279276
buildRules = (
280277
);
@@ -309,6 +306,7 @@
309306
EA66998E1811D2FA00A70D03 /* Project object */ = {
310307
isa = PBXProject;
311308
attributes = {
309+
LastTestingUpgradeCheck = 0620;
312310
LastUpgradeCheck = 0500;
313311
ORGANIZATIONNAME = Reverb;
314312
TargetAttributes = {
@@ -421,7 +419,8 @@
421419
isa = PBXSourcesBuildPhase;
422420
buildActionMask = 2147483647;
423421
files = (
424-
EA6699C81811D2FB00A70D03 /* PetApiTest.m in Sources */,
422+
EAB26B0C1AC8DF78002F5C7A /* PetApiTest.h in Sources */,
423+
EAB26B0D1AC8DF78002F5C7A /* PetApiTest.m in Sources */,
425424
);
426425
runOnlyForDeploymentPostprocessing = 0;
427426
};
@@ -554,6 +553,10 @@
554553
GCC_PRECOMPILE_PREFIX_HEADER = YES;
555554
GCC_PREFIX_HEADER = "PetstoreClient/PetstoreClient-Prefix.pch";
556555
INFOPLIST_FILE = "PetstoreClient/PetstoreClient-Info.plist";
556+
LIBRARY_SEARCH_PATHS = (
557+
"$(inherited)",
558+
"/Users/tony/dev/projects/swagger-api/swagger-codegen/samples/client/petstore/objc/Pods/../build/Debug-iphoneos",
559+
);
557560
PRODUCT_NAME = "$(TARGET_NAME)";
558561
WRAPPER_EXTENSION = app;
559562
};
@@ -568,13 +571,18 @@
568571
GCC_PRECOMPILE_PREFIX_HEADER = YES;
569572
GCC_PREFIX_HEADER = "PetstoreClient/PetstoreClient-Prefix.pch";
570573
INFOPLIST_FILE = "PetstoreClient/PetstoreClient-Info.plist";
574+
LIBRARY_SEARCH_PATHS = (
575+
"$(inherited)",
576+
"/Users/tony/dev/projects/swagger-api/swagger-codegen/samples/client/petstore/objc/Pods/../build/Debug-iphoneos",
577+
);
571578
PRODUCT_NAME = "$(TARGET_NAME)";
572579
WRAPPER_EXTENSION = app;
573580
};
574581
name = Release;
575582
};
576583
EA6699CF1811D2FB00A70D03 /* Debug */ = {
577584
isa = XCBuildConfiguration;
585+
baseConfigurationReference = E2B6DA00BE52336E23783686 /* Pods.debug.xcconfig */;
578586
buildSettings = {
579587
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
580588
BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/PetstoreClient.app/PetstoreClient";
@@ -590,6 +598,10 @@
590598
"$(inherited)",
591599
);
592600
INFOPLIST_FILE = "PetstoreClientTests/PetstoreClientTests-Info.plist";
601+
LIBRARY_SEARCH_PATHS = (
602+
"$(inherited)",
603+
"/Users/tony/dev/projects/swagger-api/swagger-codegen/samples/client/petstore/objc/Pods/../build/Debug-iphoneos",
604+
);
593605
PRODUCT_NAME = "$(TARGET_NAME)";
594606
TEST_HOST = "$(BUNDLE_LOADER)";
595607
WRAPPER_EXTENSION = xctest;
@@ -598,6 +610,7 @@
598610
};
599611
EA6699D01811D2FB00A70D03 /* Release */ = {
600612
isa = XCBuildConfiguration;
613+
baseConfigurationReference = A425648B5C0A4849C7668069 /* Pods.release.xcconfig */;
601614
buildSettings = {
602615
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
603616
BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/PetstoreClient.app/PetstoreClient";
@@ -609,6 +622,10 @@
609622
GCC_PRECOMPILE_PREFIX_HEADER = YES;
610623
GCC_PREFIX_HEADER = "PetstoreClient/PetstoreClient-Prefix.pch";
611624
INFOPLIST_FILE = "PetstoreClientTests/PetstoreClientTests-Info.plist";
625+
LIBRARY_SEARCH_PATHS = (
626+
"$(inherited)",
627+
"/Users/tony/dev/projects/swagger-api/swagger-codegen/samples/client/petstore/objc/Pods/../build/Debug-iphoneos",
628+
);
612629
PRODUCT_NAME = "$(TARGET_NAME)";
613630
TEST_HOST = "$(BUNDLE_LOADER)";
614631
WRAPPER_EXTENSION = xctest;

‎samples/client/petstore/objc/PetstoreClient/PetstoreClient/ViewController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ - (void)viewDidLoad
2020
[super viewDidLoad];
2121
// Do any additional setup after loading the view, typically from a nib.
2222

23+
/*
2324
SWGPetApi * api = [[SWGPetApi alloc] init];
24-
/*
2525
[api getPetByIdWithCompletionBlock:@10 completionHandler:^(SWGPet *output, NSError *error) {
2626
NSLog(@"%@", [output asDictionary]);
2727
[output set_id:@101];

‎samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/PetApiTest.m‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ - (void)testGetPetByTags {
122122
SWGPet* pet = [self createPet];
123123
SWGTag* tag = [[SWGTag alloc] init];
124124
tag.name = @"tony";
125+
NSLog(@"%@", pet._id);
125126
pet.tags = [[NSArray alloc] initWithObjects:tag, nil];
126127

127128
[api addPetWithCompletionBlock:pet completionHandler:^(NSError *error) {
@@ -141,9 +142,9 @@ - (void)testGetPetByTags {
141142
if(fetched._id == pet._id && [[tag name] isEqualToString:@"tony"])
142143
hasTag = true;
143144
}
144-
if(!hasTag)
145-
XCTFail(@"failed to find tag in pet");
146145
}
146+
if(!hasTag)
147+
XCTFail(@"failed to find tag in pet");
147148
if(hasTag)
148149
[expectation fulfill];
149150
}

‎samples/client/petstore/objc/Podfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
platform :ios, '6.0'
22
xcodeproj 'PetstoreClient/PetstoreClient.xcodeproj'
33
pod 'AFNetworking', '~> 2.1'
4+
pod 'JSONModel', '~> 1.0'

‎samples/client/petstore/objc/Podfile.lock‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,14 @@ PODS:
2020
- AFNetworking/UIKit (2.5.1):
2121
- AFNetworking/NSURLConnection
2222
- AFNetworking/NSURLSession
23+
- JSONModel (1.0.2)
2324

2425
DEPENDENCIES:
2526
- AFNetworking (~> 2.1)
27+
- JSONModel (~> 1.0)
2628

2729
SPEC CHECKSUMS:
28-
AFNetworking: 8bee59492a6ff15d69130efa4d0dc67e0094a52a
30+
AFNetworking: 10e85a00bb0f475124e4ff2677bf15693b2c1523
31+
JSONModel: 6ffcb4ffa3659c9e9a2e5d45d6c7705bab187c03
2932

3033
COCOAPODS: 0.36.0

‎samples/client/petstore/objc/client/SWGCategory.h‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22
#import "SWGObject.h"
33

44

5+
@protocol SWGCategory
6+
@end
7+
58
@interface SWGCategory : SWGObject
69

7-
@property(nonatomic) NSNumber* _id;
8-
@property(nonatomic) NSString* name;
9-
- (id) _id: (NSNumber*) _id
10-
name: (NSString*) name;
11-
1210

13-
- (id) initWithValues: (NSDictionary*)dict;
14-
- (NSDictionary*) asDictionary;
11+
@property(nonatomic) NSNumber<Optional>* _id;
12+
13+
@property(nonatomic) NSString<Optional>* name;
1514

1615
@end

‎samples/client/petstore/objc/client/SWGCategory.m‎

Lines changed: 3 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,10 @@
1-
#import "SWGDate.h"
21
#import "SWGCategory.h"
32

43
@implementation SWGCategory
5-
6-
-(id)_id: (NSNumber*) _id
7-
name: (NSString*) name
8-
9-
{
10-
__id = _id;
11-
_name = name;
12-
13-
14-
return self;
15-
}
16-
17-
-(id) initWithValues:(NSDictionary*)dict
4+
5+
+ (JSONKeyMapper *)keyMapper
186
{
19-
self = [super init];
20-
if(self) {
21-
__id = dict[@"id"];
22-
23-
_name = dict[@"name"];
24-
25-
26-
}
27-
return self;
28-
}
29-
30-
-(NSDictionary*) asDictionary {
31-
NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
32-
33-
34-
if(__id != nil) dict[@"id"] = __id ;
35-
36-
37-
38-
if(_name != nil) dict[@"name"] = _name ;
39-
40-
41-
42-
NSDictionary* output = [dict copy];
43-
return output;
7+
return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"name": @"name" }];
448
}
459

4610
@end

‎samples/client/petstore/objc/client/SWGObject.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#import <Foundation/Foundation.h>
2+
#import "JSONModel.h"
23

3-
@interface SWGObject : NSObject
4-
- (id) initWithValues:(NSDictionary*)dict;
5-
- (NSDictionary*) asDictionary;
4+
@interface SWGObject : JSONModel
65
@end

‎samples/client/petstore/objc/client/SWGObject.m‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,4 @@
11
#import "SWGObject.h"
22

33
@implementation SWGObject
4-
5-
- (id) initWithValues:(NSDictionary*)dict {
6-
return self;
7-
}
8-
9-
- (NSDictionary*) asDictionary{
10-
return [NSDictionary init];
11-
}
12-
13-
- (NSString*)description {
14-
return [NSString stringWithFormat:@"%@ %@", [super description], [self asDictionary]];
15-
}
16-
174
@end

‎samples/client/petstore/objc/client/SWGOrder.h‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
11
#import <Foundation/Foundation.h>
22
#import "SWGObject.h"
3-
#import "SWGDate.h"
43

54

5+
@protocol SWGOrder
6+
@end
7+
68
@interface SWGOrder : SWGObject
79

8-
@property(nonatomic) NSNumber* _id;
9-
@property(nonatomic) NSNumber* petId;
10-
@property(nonatomic) NSNumber* quantity;
11-
@property(nonatomic) SWGDate* shipDate;
12-
@property(nonatomic) NSString* status; /* Order Status */
13-
@property(nonatomic) NSNumber* complete;
14-
- (id) _id: (NSNumber*) _id
15-
petId: (NSNumber*) petId
16-
quantity: (NSNumber*) quantity
17-
shipDate: (SWGDate*) shipDate
18-
status: (NSString*) status
19-
complete: (NSNumber*) complete;
20-
21-
22-
- (id) initWithValues: (NSDictionary*)dict;
23-
- (NSDictionary*) asDictionary;
10+
11+
@property(nonatomic) NSNumber<Optional>* _id;
12+
13+
@property(nonatomic) NSNumber<Optional>* petId;
14+
15+
@property(nonatomic) NSNumber<Optional>* quantity;
16+
17+
@property(nonatomic) NSDate<Optional>* shipDate;
18+
/* Order Status [optional]
19+
*/
20+
@property(nonatomic) NSString<Optional>* status;
21+
22+
@property(nonatomic) NSNumber<Optional>* complete;
2423

2524
@end

0 commit comments

Comments
 (0)