Merge pull request #2540 from wing328/bug/fix_issue2523

[ObjC] fix spec with no model for ObjC API client

Author: wing328

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java

@@ -95,7 +95,7 @@ public ObjcClientCodegen() {
         //TODO binary should be mapped to byte array
         // mapped to String as a workaround
         typeMapping.put("binary", "NSString");
-
+        typeMapping.put("ByteArray", "NSString");
 
         // ref: http://www.tutorialspoint.com/objective_c/objective_c_basic_syntax.htm
         setReservedWordsLowerCase(

modules/swagger-codegen/src/main/resources/objc/ApiClient-header.mustache

@@ -14,6 +14,7 @@
 
 {{#models}}{{#model}}#import "{{classname}}.h"
 {{/model}}{{/models}}
+{{^models}}#import "{{classPrefix}}Object.h"{{/models}}
 
 @class {{classPrefix}}Configuration;
 

modules/swagger-codegen/src/main/resources/objc/api-body.mustache

@@ -40,7 +40,6 @@ static {{classname}}* singletonAPI = nil;
 #pragma mark -
 
 +({{classname}}*) apiWithHeader:(NSString*)headerValue key:(NSString*)key {
-
     if (singletonAPI == nil) {
         singletonAPI = [[{{classname}} alloc] init];
         [singletonAPI addHeader:headerValue forKey:key];
@@ -49,7 +48,6 @@ static {{classname}}* singletonAPI = nil;
 }
 
 +({{classname}}*) sharedAPI {
-
     if (singletonAPI == nil) {
         singletonAPI = [[{{classname}} alloc] init];
     }
@@ -82,14 +80,15 @@ static {{classname}}* singletonAPI = nil;
 -(NSNumber*) {{#vendorExtensions.x-objc-operationId}}{{vendorExtensions.x-objc-operationId}}{{/vendorExtensions.x-objc-operationId}}{{^vendorExtensions.x-objc-operationId}}{{nickname}}{{#hasParams}}With{{vendorExtensions.firstParamAltName}}{{/hasParams}}{{^hasParams}}WithCompletionHandler: {{/hasParams}}{{/vendorExtensions.x-objc-operationId}}{{#allParams}}{{#secondaryParam}}
     {{paramName}}{{/secondaryParam}}: ({{{dataType}}}) {{paramName}}{{/allParams}}
     {{#hasParams}}completionHandler: {{/hasParams}}(void (^)({{#returnBaseType}}{{{returnType}}} output, {{/returnBaseType}}NSError* error)) handler {
-
-    {{#allParams}}{{#required}}
+    {{#allParams}}
+    {{#required}}
     // verify the required parameter '{{paramName}}' is set
     if ({{paramName}} == nil) {
         [NSException raise:@"Invalid parameter" format:@"Missing the required parameter `{{paramName}}` when calling `{{nickname}}`"];
     }
-    {{/required}}{{/allParams}}
 
+    {{/required}}
+    {{/allParams}}
     NSMutableString* resourcePath = [NSMutableString stringWithFormat:@"{{path}}"];
 
     // remove format in URL if needed
@@ -98,26 +97,29 @@ static {{classname}}* singletonAPI = nil;
     }
 
     NSMutableDictionary *pathParams = [[NSMutableDictionary alloc] init];
-    {{#pathParams}}if ({{paramName}} != nil) {
+    {{#pathParams}}
+    if ({{paramName}} != nil) {
         pathParams[@"{{baseName}}"] = {{paramName}};
     }
     {{/pathParams}}
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    {{#queryParams}}if ({{paramName}} != nil) {
+    {{#queryParams}}
+    if ({{paramName}} != nil) {
         {{#collectionFormat}}
         queryParams[@"{{baseName}}"] = [[{{classPrefix}}QueryParamCollection alloc] initWithValuesAndFormat: {{baseName}} format: @"{{collectionFormat}}"];
         {{/collectionFormat}}
         {{^collectionFormat}}queryParams[@"{{baseName}}"] = {{paramName}};{{/collectionFormat}}
     }
     {{/queryParams}}
     NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
-
-    {{#headerParams}}if ({{paramName}} != nil) {
+    {{#headerParams}}
+    
+    if ({{paramName}} != nil) {
         headerParams[@"{{baseName}}"] = {{paramName}};
     }
-    {{/headerParams}}
 
+    {{/headerParams}}
     // HTTP header `Accept`
     headerParams[@"Accept"] = [{{classPrefix}}ApiClient selectHeaderAccept:@[{{#produces}}@"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}}]];
     if ([headerParams[@"Accept"] length] == 0) {
@@ -144,25 +146,20 @@ static {{classname}}* singletonAPI = nil;
     NSMutableDictionary *localVarFiles = [[NSMutableDictionary alloc] init];
     {{#bodyParam}}
     bodyParam = {{paramName}};
-    {{/bodyParam}}{{^bodyParam}}
+    {{/bodyParam}}
+    {{^bodyParam}}
     {{#formParams}}
     {{#notFile}}
     if ({{paramName}}) {
         formParams[@"{{baseName}}"] = {{paramName}};
     }
-    {{/notFile}}{{#isFile}}
+    {{/notFile}}
+    {{#isFile}}
     localVarFiles[@"{{paramName}}"] = {{paramName}};
     {{/isFile}}
     {{/formParams}}
     {{/bodyParam}}
 
-    {{#requiredParamCount}}
-    {{#requiredParams}}
-    if ({{paramName}} == nil) {
-        // error
-    }
-    {{/requiredParams}}
-    {{/requiredParamCount}}
     return [self.apiClient requestWithPath: resourcePath
                                     method: @"{{httpMethod}}"
                                 pathParams: pathParams

samples/client/petstore/objc/README.md

@@ -6,7 +6,7 @@ This ObjC package is automatically generated by the [Swagger Codegen](https://gi
 
 - API version: 1.0.0
 - Package version: 
-- Build date: 2016-04-05T23:29:02.396+08:00
+- Build date: 2016-04-10T18:34:45.604+08:00
 - Build package: class io.swagger.codegen.languages.ObjcClientCodegen
 
 ## Requirements
@@ -46,6 +46,7 @@ Import the following:
 #import <SwaggerClient/SWGCat.h>
 #import <SwaggerClient/SWGCategory.h>
 #import <SwaggerClient/SWGDog.h>
+#import <SwaggerClient/SWGFormatTest.h>
 #import <SwaggerClient/SWGInlineResponse200.h>
 #import <SwaggerClient/SWGName.h>
 #import <SwaggerClient/SWGOrder.h>
@@ -106,20 +107,20 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
 *SWGPetApi* | [**addPet**](docs/SWGPetApi.md#addpet) | **POST** /pet | Add a new pet to the store
-*SWGPetApi* | [**addPetUsingByteArray**](docs/SWGPetApi.md#addpetusingbytearray) | **POST** /pet?testing_byte_array=true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
+*SWGPetApi* | [**addPetUsingByteArray**](docs/SWGPetApi.md#addpetusingbytearray) | **POST** /pet?testing_byte_array&#x3D;true | Fake endpoint to test byte array in body parameter for adding a new pet to the store
 *SWGPetApi* | [**deletePet**](docs/SWGPetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet
 *SWGPetApi* | [**findPetsByStatus**](docs/SWGPetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status
 *SWGPetApi* | [**findPetsByTags**](docs/SWGPetApi.md#findpetsbytags) | **GET** /pet/findByTags | Finds Pets by tags
 *SWGPetApi* | [**getPetById**](docs/SWGPetApi.md#getpetbyid) | **GET** /pet/{petId} | Find pet by ID
-*SWGPetApi* | [**getPetByIdInObject**](docs/SWGPetApi.md#getpetbyidinobject) | **GET** /pet/{petId}?response=inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
-*SWGPetApi* | [**petPetIdtestingByteArraytrueGet**](docs/SWGPetApi.md#petpetidtestingbytearraytrueget) | **GET** /pet/{petId}?testing_byte_array=true | Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+*SWGPetApi* | [**getPetByIdInObject**](docs/SWGPetApi.md#getpetbyidinobject) | **GET** /pet/{petId}?response&#x3D;inline_arbitrary_object | Fake endpoint to test inline arbitrary object return by &#39;Find pet by ID&#39;
+*SWGPetApi* | [**petPetIdtestingByteArraytrueGet**](docs/SWGPetApi.md#petpetidtestingbytearraytrueget) | **GET** /pet/{petId}?testing_byte_array&#x3D;true | Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
 *SWGPetApi* | [**updatePet**](docs/SWGPetApi.md#updatepet) | **PUT** /pet | Update an existing pet
 *SWGPetApi* | [**updatePetWithForm**](docs/SWGPetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *SWGPetApi* | [**uploadFile**](docs/SWGPetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image
 *SWGStoreApi* | [**deleteOrder**](docs/SWGStoreApi.md#deleteorder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
 *SWGStoreApi* | [**findOrdersByStatus**](docs/SWGStoreApi.md#findordersbystatus) | **GET** /store/findByStatus | Finds orders by status
 *SWGStoreApi* | [**getInventory**](docs/SWGStoreApi.md#getinventory) | **GET** /store/inventory | Returns pet inventories by status
-*SWGStoreApi* | [**getInventoryInObject**](docs/SWGStoreApi.md#getinventoryinobject) | **GET** /store/inventory?response=arbitrary_object | Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
+*SWGStoreApi* | [**getInventoryInObject**](docs/SWGStoreApi.md#getinventoryinobject) | **GET** /store/inventory?response&#x3D;arbitrary_object | Fake endpoint to test arbitrary object return by &#39;Get inventory&#39;
 *SWGStoreApi* | [**getOrderById**](docs/SWGStoreApi.md#getorderbyid) | **GET** /store/order/{orderId} | Find purchase order by ID
 *SWGStoreApi* | [**placeOrder**](docs/SWGStoreApi.md#placeorder) | **POST** /store/order | Place an order for a pet
 *SWGUserApi* | [**createUser**](docs/SWGUserApi.md#createuser) | **POST** /user | Create user
@@ -139,6 +140,7 @@ Class | Method | HTTP request | Description
  - [SWGCat](docs/SWGCat.md)
  - [SWGCategory](docs/SWGCategory.md)
  - [SWGDog](docs/SWGDog.md)
+ - [SWGFormatTest](docs/SWGFormatTest.md)
  - [SWGInlineResponse200](docs/SWGInlineResponse200.md)
  - [SWGName](docs/SWGName.md)
  - [SWGOrder](docs/SWGOrder.md)

samples/client/petstore/objc/SwaggerClient.podspec

@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
 
     s.summary          = "Swagger Petstore"
     s.description      = <<-DESC
-                         This is a sample server Petstore server.  You can find out more about Swagger at &lt;a href=\&quot;http://swagger.io\&quot;&gt;http://swagger.io&lt;/a&gt; or on irc.freenode.net, #swagger.  For this sample, you can use the api key \&quot;special-key\&quot; to test the authorization filters
+                         This is a sample server Petstore server.  You can find out more about Swagger at &lt;a href&#x3D;\&quot;http://swagger.io\&quot;&gt;http://swagger.io&lt;/a&gt; or on irc.freenode.net, #swagger.  For this sample, you can use the api key \&quot;special-key\&quot; to test the authorization filters
                          DESC
 
     s.platform     = :ios, '7.0'

samples/client/petstore/objc/SwaggerClient/SWGApiClient.h

@@ -17,6 +17,7 @@
 #import "SWGCat.h"
 #import "SWGCategory.h"
 #import "SWGDog.h"
+#import "SWGFormatTest.h"
 #import "SWGInlineResponse200.h"
 #import "SWGName.h"
 #import "SWGOrder.h"
@@ -27,6 +28,7 @@
 #import "SWGUser.h"
 
 
+
 @class SWGConfiguration;
 
 /**

samples/client/petstore/objc/SwaggerClient/SWGName.m

@@ -30,7 +30,7 @@ + (JSONKeyMapper *)keyMapper
  */
 + (BOOL)propertyIsOptional:(NSString *)propertyName
 {
-  NSArray *optionalProperties = @[@"name", @"snakeCase"];
+  NSArray *optionalProperties = @[@"snakeCase"];
 
   if ([optionalProperties containsObject:propertyName]) {
     return YES;