diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java index c8e0ad45283..6f51374c536 100644 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java @@ -838,7 +838,8 @@ public class DefaultCodegen { // op.cookieParams = cookieParams; op.formParams = addHasMore(formParams); // legacy support - op.nickname = operationId; + op.nickname = op.operationId; + if(op.allParams.size() > 0) op.hasParams = true; diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AndroidClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AndroidClientCodegen.java index b161814152c..e97cd02c523 100644 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AndroidClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AndroidClientCodegen.java @@ -162,5 +162,14 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi return toModelName(name); } + @Override + public String toOperationId(String operationId) { + // method name cannot use reserved keyword, e.g. return + if(reservedWords.contains(operationId)) + throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); + + return camelize(operationId, true); + } + } diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/CSharpClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/CSharpClientCodegen.java index 43a54f5478e..d815ade0915 100644 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/CSharpClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/CSharpClientCodegen.java @@ -163,4 +163,14 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig type = swaggerType; return type; } + + @Override + public String toOperationId(String operationId) { + // method name cannot use reserved keyword, e.g. return + if(reservedWords.contains(operationId)) + throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); + + return camelize(operationId); + } + } diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java index 832f0a92329..39ed9dfe540 100644 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java @@ -160,4 +160,15 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { type = swaggerType; return toModelName(type); } + + @Override + public String toOperationId(String operationId) { + // method name cannot use reserved keyword, e.g. return + if(reservedWords.contains(operationId)) + throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); + + return camelize(operationId, true); + } + + } diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ObjcClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ObjcClientCodegen.java index 3d9b756c007..54fa020922f 100644 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ObjcClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ObjcClientCodegen.java @@ -276,4 +276,14 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig { public String escapeReservedWord(String name) { return "_" + name; } + + @Override + public String toOperationId(String operationId) { + // method name cannot use reserved keyword, e.g. return + if(reservedWords.contains(operationId)) + throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); + + return camelize(operationId, true); + } + } diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/Python3ClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/Python3ClientCodegen.java index 2e1a3ee165a..81ba21ebe72 100755 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/Python3ClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/Python3ClientCodegen.java @@ -186,4 +186,13 @@ public class Python3ClientCodegen extends DefaultCodegen implements CodegenConfi return underscore(name) + "_api"; } + @Override + public String toOperationId(String operationId) { + // method name cannot use reserved keyword, e.g. return + if(reservedWords.contains(operationId)) + throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); + + return underscore(operationId); + } + } diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PythonClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PythonClientCodegen.java index b28c0ccf750..bbb07b1592a 100755 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PythonClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PythonClientCodegen.java @@ -196,4 +196,13 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig return underscore(name) + "_api"; } + @Override + public String toOperationId(String operationId) { + // method name cannot use reserved keyword, e.g. return + if(reservedWords.contains(operationId)) + throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); + + return underscore(operationId); + } + } diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/RubyClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/RubyClientCodegen.java index 5decf61d2c0..0c472a2b75d 100644 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/RubyClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/RubyClientCodegen.java @@ -189,4 +189,14 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig { return camelize(name) + "Api"; } + @Override + public String toOperationId(String operationId) { + // method name cannot use reserved keyword, e.g. return + if(reservedWords.contains(operationId)) + throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); + + return underscore(operationId); + } + + } diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalaClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalaClientCodegen.java index 36114982419..4695cc3d065 100644 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalaClientCodegen.java @@ -189,4 +189,15 @@ public class ScalaClientCodegen extends DefaultCodegen implements CodegenConfig else return "null"; } -} \ No newline at end of file + + + @Override + public String toOperationId(String operationId) { + // method name cannot use reserved keyword, e.g. return + if(reservedWords.contains(operationId)) + throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); + + return camelize(operationId, true); + } + +} diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/TizenClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/TizenClientCodegen.java index 007a978d36b..ab9fa033f1c 100644 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/TizenClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/TizenClientCodegen.java @@ -244,4 +244,15 @@ public class TizenClientCodegen extends DefaultCodegen implements CodegenConfig public String escapeReservedWord(String name) { return "_" + name; } + + @Override + public String toOperationId(String operationId) { + // method name cannot use reserved keyword, e.g. return$ + if(reservedWords.contains(operationId)) + throw new RuntimeException(operationId + " (reserved word) cannot be used as method name"); + + // add_pet_by_id => addPetById + return camelize(operationId, true); + } + } diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java index 8c3f271a13e..dec0db43f66 100644 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java +++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java @@ -16,6 +16,7 @@ import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.*; import org.apache.http.impl.conn.*; +import org.apache.http.impl.conn.tsccm.*; import org.apache.http.params.*; import org.apache.http.util.EntityUtils; @@ -381,7 +382,7 @@ public class ApiInvoker { schemeRegistry.register(httpsScheme); schemeRegistry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80)); - ignoreSSLConnectionManager = new SingleClientConnManager(new BasicHttpParams(), schemeRegistry); + ignoreSSLConnectionManager = new ThreadSafeClientConnManager(new BasicHttpParams(), schemeRegistry); } catch (NoSuchAlgorithmException e) { // This will only be thrown if SSL isn't available for some reason. } catch (KeyManagementException e) { diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/PetApi.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/PetApi.cs index 3750f302faa..4f20c0cba45 100644 --- a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/PetApi.cs +++ b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/PetApi.cs @@ -36,7 +36,7 @@ namespace io.swagger.Api { /// Pet object that needs to be added to the store /// - public void updatePet (Pet Body) { + public void UpdatePet (Pet Body) { // create path and map variables var path = "/pet".Replace("{format}","json"); @@ -84,7 +84,7 @@ namespace io.swagger.Api { /// Pet object that needs to be added to the store /// - public void addPet (Pet Body) { + public void AddPet (Pet Body) { // create path and map variables var path = "/pet".Replace("{format}","json"); @@ -132,7 +132,7 @@ namespace io.swagger.Api { /// Status values that need to be considered for filter /// - public List findPetsByStatus (List Status) { + public List FindPetsByStatus (List Status) { // create path and map variables var path = "/pet/findByStatus".Replace("{format}","json"); @@ -188,7 +188,7 @@ namespace io.swagger.Api { /// Tags to filter by /// - public List findPetsByTags (List Tags) { + public List FindPetsByTags (List Tags) { // create path and map variables var path = "/pet/findByTags".Replace("{format}","json"); @@ -244,7 +244,7 @@ namespace io.swagger.Api { /// ID of pet that needs to be fetched /// - public Pet getPetById (long? PetId) { + public Pet GetPetById (long? PetId) { // create path and map variables var path = "/pet/{petId}".Replace("{format}","json").Replace("{" + "petId" + "}", apiInvoker.ParameterToString(PetId)); @@ -299,7 +299,7 @@ namespace io.swagger.Api { /// Updated status of the pet /// - public void updatePetWithForm (string PetId, string Name, string Status) { + public void UpdatePetWithForm (string PetId, string Name, string Status) { // create path and map variables var path = "/pet/{petId}".Replace("{format}","json").Replace("{" + "petId" + "}", apiInvoker.ParameterToString(PetId)); @@ -362,7 +362,7 @@ namespace io.swagger.Api { /// Pet id to delete /// - public void deletePet (string ApiKey, long? PetId) { + public void DeletePet (string ApiKey, long? PetId) { // create path and map variables var path = "/pet/{petId}".Replace("{format}","json").Replace("{" + "petId" + "}", apiInvoker.ParameterToString(PetId)); @@ -413,7 +413,7 @@ namespace io.swagger.Api { /// file to upload /// - public void uploadFile (long? PetId, string AdditionalMetadata, byte[] File) { + public void UploadFile (long? PetId, string AdditionalMetadata, byte[] File) { // create path and map variables var path = "/pet/{petId}/uploadImage".Replace("{format}","json").Replace("{" + "petId" + "}", apiInvoker.ParameterToString(PetId)); diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/StoreApi.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/StoreApi.cs index 6ab79f87976..2514539e298 100644 --- a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/StoreApi.cs @@ -35,7 +35,7 @@ namespace io.swagger.Api { /// /// - public Dictionary getInventory () { + public Dictionary GetInventory () { // create path and map variables var path = "/store/inventory".Replace("{format}","json"); @@ -88,7 +88,7 @@ namespace io.swagger.Api { /// order placed for purchasing the pet /// - public Order placeOrder (Order Body) { + public Order PlaceOrder (Order Body) { // create path and map variables var path = "/store/order".Replace("{format}","json"); @@ -141,7 +141,7 @@ namespace io.swagger.Api { /// ID of pet that needs to be fetched /// - public Order getOrderById (string OrderId) { + public Order GetOrderById (string OrderId) { // create path and map variables var path = "/store/order/{orderId}".Replace("{format}","json").Replace("{" + "orderId" + "}", apiInvoker.ParameterToString(OrderId)); @@ -194,7 +194,7 @@ namespace io.swagger.Api { /// ID of the order that needs to be deleted /// - public void deleteOrder (string OrderId) { + public void DeleteOrder (string OrderId) { // create path and map variables var path = "/store/order/{orderId}".Replace("{format}","json").Replace("{" + "orderId" + "}", apiInvoker.ParameterToString(OrderId)); diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/UserApi.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/UserApi.cs index c262cbd38cb..4f1f4a1bf19 100644 --- a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/UserApi.cs +++ b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/UserApi.cs @@ -36,7 +36,7 @@ namespace io.swagger.Api { /// Created user object /// - public void createUser (User Body) { + public void CreateUser (User Body) { // create path and map variables var path = "/user".Replace("{format}","json"); @@ -84,7 +84,7 @@ namespace io.swagger.Api { /// List of user object /// - public void createUsersWithArrayInput (List Body) { + public void CreateUsersWithArrayInput (List Body) { // create path and map variables var path = "/user/createWithArray".Replace("{format}","json"); @@ -132,7 +132,7 @@ namespace io.swagger.Api { /// List of user object /// - public void createUsersWithListInput (List Body) { + public void CreateUsersWithListInput (List Body) { // create path and map variables var path = "/user/createWithList".Replace("{format}","json"); @@ -181,7 +181,7 @@ namespace io.swagger.Api { /// The password for login in clear text /// - public string loginUser (string Username, string Password) { + public string LoginUser (string Username, string Password) { // create path and map variables var path = "/user/login".Replace("{format}","json"); @@ -239,7 +239,7 @@ namespace io.swagger.Api { /// /// - public void logoutUser () { + public void LogoutUser () { // create path and map variables var path = "/user/logout".Replace("{format}","json"); @@ -287,7 +287,7 @@ namespace io.swagger.Api { /// The name that needs to be fetched. Use user1 for testing. /// - public User getUserByName (string Username) { + public User GetUserByName (string Username) { // create path and map variables var path = "/user/{username}".Replace("{format}","json").Replace("{" + "username" + "}", apiInvoker.ParameterToString(Username)); @@ -341,7 +341,7 @@ namespace io.swagger.Api { /// Updated user object /// - public void updateUser (string Username, User Body) { + public void UpdateUser (string Username, User Body) { // create path and map variables var path = "/user/{username}".Replace("{format}","json").Replace("{" + "username" + "}", apiInvoker.ParameterToString(Username)); @@ -389,7 +389,7 @@ namespace io.swagger.Api { /// The name that needs to be deleted /// - public void deleteUser (string Username) { + public void DeleteUser (string Username) { // create path and map variables var path = "/user/{username}".Replace("{format}","json").Replace("{" + "username" + "}", apiInvoker.ParameterToString(Username)); diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/ApiInvoker.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/ApiInvoker.cs index c14d1af7d6c..ee2c5b1d889 100644 --- a/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/ApiInvoker.cs +++ b/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/ApiInvoker.cs @@ -15,10 +15,21 @@ return _instance; } + /// + /// Add default header + /// + /// Header field name + /// Header field value + /// public void addDefaultHeader(string key, string value) { defaultHeaderMap.Add(key, value); } + /// + /// escape string (url-encoded) + /// + /// String to be escaped + /// Escaped string public string escapeString(string str) { return str; } @@ -27,12 +38,18 @@ /// if parameter is DateTime, output in ISO8601 format, otherwise just return the string /// /// The parameter (header, path, query, form) - /// + /// Formatted string public string ParameterToString(object obj) { return (obj is DateTime) ? ((DateTime)obj).ToString ("u") : Convert.ToString (obj); } + /// + /// Deserialize the JSON string into a proper object + /// + /// JSON string + /// Object type + /// Object representation of the JSON string public static object deserialize(string json, Type type) { try { @@ -109,6 +126,7 @@ case "GET": break; case "POST": + case "PATCH": case "PUT": case "DELETE": using (Stream requestStream = client.GetRequestStream()) diff --git a/samples/client/petstore/php/SwaggerPetstore-php/README.md b/samples/client/petstore/php/SwaggerClient-php/README.md similarity index 100% rename from samples/client/petstore/php/SwaggerPetstore-php/README.md rename to samples/client/petstore/php/SwaggerClient-php/README.md diff --git a/samples/client/petstore/php/SwaggerPetstore-php/SwaggerPetstore.php b/samples/client/petstore/php/SwaggerClient-php/SwaggerClient.php similarity index 100% rename from samples/client/petstore/php/SwaggerPetstore-php/SwaggerPetstore.php rename to samples/client/petstore/php/SwaggerClient-php/SwaggerClient.php diff --git a/samples/client/petstore/php/SwaggerPetstore-php/composer.json b/samples/client/petstore/php/SwaggerClient-php/composer.json similarity index 85% rename from samples/client/petstore/php/SwaggerPetstore-php/composer.json rename to samples/client/petstore/php/SwaggerClient-php/composer.json index 7109d7a8790..13fc1b62690 100644 --- a/samples/client/petstore/php/SwaggerPetstore-php/composer.json +++ b/samples/client/petstore/php/SwaggerClient-php/composer.json @@ -1,5 +1,5 @@ { - "name": "SwaggerPetstore/SwaggerPetstore-php", + "name": "SwaggerClient/SwaggerClient-php", "description": "", "keywords": [ "swagger", @@ -27,6 +27,6 @@ "squizlabs/php_codesniffer": "~2.0" }, "autoload": { - "psr-4": { "SwaggerPetstore\\" : "lib/" } + "psr-4": { "SwaggerClient\\" : "lib/" } } } diff --git a/samples/client/petstore/php/SwaggerPetstore-php/lib/APIClient.php b/samples/client/petstore/php/SwaggerClient-php/lib/APIClient.php similarity index 96% rename from samples/client/petstore/php/SwaggerPetstore-php/lib/APIClient.php rename to samples/client/petstore/php/SwaggerClient-php/lib/APIClient.php index 681bb8cee3c..f69675c1e9b 100644 --- a/samples/client/petstore/php/SwaggerPetstore-php/lib/APIClient.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/APIClient.php @@ -15,7 +15,7 @@ * limitations under the License. */ -namespace SwaggerPetstore; +namespace SwaggerClient; class APIClient { @@ -94,7 +94,7 @@ class APIClient { $headers[] = $this->headerName . ": " . $this->headerValue; } - if ((isset($headers['Content-Type']) and strpos($headers['Content-Type'], "multipart/form-data") < 0) and (is_object($postData) or is_array($postData))) { + if ((isset($headerName['Content-Type']) and strpos($headerName['Content-Type'], "multipart/form-data") === FALSE) and (is_object($postData) or is_array($postData))) { $postData = json_encode($this->sanitizeForSerialization($postData)); } @@ -286,11 +286,11 @@ class APIClient { settype($data, $class); $deserialized = $data; } else { - $class = "SwaggerPetstore\\models\\".$class; + $class = "SwaggerClient\\models\\".$class; $instance = new $class(); foreach ($instance::$swaggerTypes as $property => $type) { - if (isset($data->$property)) { - $original_property_name = $instance::$attributeMap[$property]; + $original_property_name = $instance::$attributeMap[$property]; + if (isset($original_property_name)) { $instance->$property = self::deserialize($data->$original_property_name, $type); } } diff --git a/samples/client/petstore/php/SwaggerPetstore-php/lib/APIClientException.php b/samples/client/petstore/php/SwaggerClient-php/lib/APIClientException.php similarity index 97% rename from samples/client/petstore/php/SwaggerPetstore-php/lib/APIClientException.php rename to samples/client/petstore/php/SwaggerClient-php/lib/APIClientException.php index 8f083caf6f9..8d83da0186e 100644 --- a/samples/client/petstore/php/SwaggerPetstore-php/lib/APIClientException.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/APIClientException.php @@ -15,7 +15,7 @@ * limitations under the License. */ -namespace SwaggerPetstore; +namespace SwaggerClient; use \Exception; diff --git a/samples/client/petstore/php/SwaggerPetstore-php/lib/PetApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/PetApi.php similarity index 91% rename from samples/client/petstore/php/SwaggerPetstore-php/lib/PetApi.php rename to samples/client/petstore/php/SwaggerClient-php/lib/PetApi.php index 1b31db8915d..80d9c040d1e 100644 --- a/samples/client/petstore/php/SwaggerPetstore-php/lib/PetApi.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/PetApi.php @@ -20,7 +20,7 @@ * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. */ -namespace SwaggerPetstore; +namespace SwaggerClient; class PetApi { @@ -59,18 +59,18 @@ class PetApi { // body params - $body = null; + $_tempBody = null; if (isset($body)) { - $body = $body; + $_tempBody = $body; } // for model (json/xml) - if (isset($body)) { - $httpBody = $body; // $body is the method argument, if present + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present } // for HTTP post (form) - if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) { + if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) { $httpBody = http_build_query($formParams); } @@ -112,18 +112,18 @@ class PetApi { // body params - $body = null; + $_tempBody = null; if (isset($body)) { - $body = $body; + $_tempBody = $body; } // for model (json/xml) - if (isset($body)) { - $httpBody = $body; // $body is the method argument, if present + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present } // for HTTP post (form) - if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) { + if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) { $httpBody = http_build_query($formParams); } @@ -170,12 +170,12 @@ class PetApi { // for model (json/xml) - if (isset($body)) { - $httpBody = $body; // $body is the method argument, if present + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present } // for HTTP post (form) - if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) { + if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) { $httpBody = http_build_query($formParams); } @@ -228,12 +228,12 @@ class PetApi { // for model (json/xml) - if (isset($body)) { - $httpBody = $body; // $body is the method argument, if present + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present } // for HTTP post (form) - if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) { + if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) { $httpBody = http_build_query($formParams); } @@ -287,12 +287,12 @@ class PetApi { // for model (json/xml) - if (isset($body)) { - $httpBody = $body; // $body is the method argument, if present + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present } // for HTTP post (form) - if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) { + if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) { $httpBody = http_build_query($formParams); } @@ -354,12 +354,12 @@ class PetApi { // for model (json/xml) - if (isset($body)) { - $httpBody = $body; // $body is the method argument, if present + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present } // for HTTP post (form) - if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) { + if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) { $httpBody = http_build_query($formParams); } @@ -411,12 +411,12 @@ class PetApi { // for model (json/xml) - if (isset($body)) { - $httpBody = $body; // $body is the method argument, if present + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present } // for HTTP post (form) - if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) { + if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) { $httpBody = http_build_query($formParams); } @@ -472,12 +472,12 @@ class PetApi { // for model (json/xml) - if (isset($body)) { - $httpBody = $body; // $body is the method argument, if present + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present } // for HTTP post (form) - if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) { + if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) { $httpBody = http_build_query($formParams); } diff --git a/samples/client/petstore/php/SwaggerPetstore-php/lib/StoreApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/StoreApi.php similarity index 91% rename from samples/client/petstore/php/SwaggerPetstore-php/lib/StoreApi.php rename to samples/client/petstore/php/SwaggerClient-php/lib/StoreApi.php index 83a3f0520fa..4e40ed983b9 100644 --- a/samples/client/petstore/php/SwaggerPetstore-php/lib/StoreApi.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/StoreApi.php @@ -20,7 +20,7 @@ * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. */ -namespace SwaggerPetstore; +namespace SwaggerClient; class StoreApi { @@ -60,12 +60,12 @@ class StoreApi { // for model (json/xml) - if (isset($body)) { - $httpBody = $body; // $body is the method argument, if present + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present } // for HTTP post (form) - if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) { + if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) { $httpBody = http_build_query($formParams); } @@ -113,18 +113,18 @@ class StoreApi { // body params - $body = null; + $_tempBody = null; if (isset($body)) { - $body = $body; + $_tempBody = $body; } // for model (json/xml) - if (isset($body)) { - $httpBody = $body; // $body is the method argument, if present + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present } // for HTTP post (form) - if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) { + if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) { $httpBody = http_build_query($formParams); } @@ -178,12 +178,12 @@ class StoreApi { // for model (json/xml) - if (isset($body)) { - $httpBody = $body; // $body is the method argument, if present + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present } // for HTTP post (form) - if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) { + if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) { $httpBody = http_build_query($formParams); } @@ -237,12 +237,12 @@ class StoreApi { // for model (json/xml) - if (isset($body)) { - $httpBody = $body; // $body is the method argument, if present + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present } // for HTTP post (form) - if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) { + if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) { $httpBody = http_build_query($formParams); } diff --git a/samples/client/petstore/php/SwaggerPetstore-php/lib/UserApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/UserApi.php similarity index 89% rename from samples/client/petstore/php/SwaggerPetstore-php/lib/UserApi.php rename to samples/client/petstore/php/SwaggerClient-php/lib/UserApi.php index d55b430d7a1..f3e9e7f4cc6 100644 --- a/samples/client/petstore/php/SwaggerPetstore-php/lib/UserApi.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/UserApi.php @@ -20,7 +20,7 @@ * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. */ -namespace SwaggerPetstore; +namespace SwaggerClient; class UserApi { @@ -59,18 +59,18 @@ class UserApi { // body params - $body = null; + $_tempBody = null; if (isset($body)) { - $body = $body; + $_tempBody = $body; } // for model (json/xml) - if (isset($body)) { - $httpBody = $body; // $body is the method argument, if present + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present } // for HTTP post (form) - if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) { + if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) { $httpBody = http_build_query($formParams); } @@ -112,18 +112,18 @@ class UserApi { // body params - $body = null; + $_tempBody = null; if (isset($body)) { - $body = $body; + $_tempBody = $body; } // for model (json/xml) - if (isset($body)) { - $httpBody = $body; // $body is the method argument, if present + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present } // for HTTP post (form) - if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) { + if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) { $httpBody = http_build_query($formParams); } @@ -165,18 +165,18 @@ class UserApi { // body params - $body = null; + $_tempBody = null; if (isset($body)) { - $body = $body; + $_tempBody = $body; } // for model (json/xml) - if (isset($body)) { - $httpBody = $body; // $body is the method argument, if present + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present } // for HTTP post (form) - if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) { + if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) { $httpBody = http_build_query($formParams); } @@ -227,12 +227,12 @@ class UserApi { // for model (json/xml) - if (isset($body)) { - $httpBody = $body; // $body is the method argument, if present + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present } // for HTTP post (form) - if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) { + if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) { $httpBody = http_build_query($formParams); } @@ -281,12 +281,12 @@ class UserApi { // for model (json/xml) - if (isset($body)) { - $httpBody = $body; // $body is the method argument, if present + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present } // for HTTP post (form) - if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) { + if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) { $httpBody = http_build_query($formParams); } @@ -334,12 +334,12 @@ class UserApi { // for model (json/xml) - if (isset($body)) { - $httpBody = $body; // $body is the method argument, if present + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present } // for HTTP post (form) - if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) { + if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) { $httpBody = http_build_query($formParams); } @@ -392,18 +392,18 @@ class UserApi { } // body params - $body = null; + $_tempBody = null; if (isset($body)) { - $body = $body; + $_tempBody = $body; } // for model (json/xml) - if (isset($body)) { - $httpBody = $body; // $body is the method argument, if present + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present } // for HTTP post (form) - if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) { + if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) { $httpBody = http_build_query($formParams); } @@ -451,12 +451,12 @@ class UserApi { // for model (json/xml) - if (isset($body)) { - $httpBody = $body; // $body is the method argument, if present + if (isset($_tempBody)) { + $httpBody = $_tempBody; // $_tempBody is the method argument, if present } // for HTTP post (form) - if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) { + if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) { $httpBody = http_build_query($formParams); } diff --git a/samples/client/petstore/php/SwaggerPetstore-php/lib/models/Category.php b/samples/client/petstore/php/SwaggerClient-php/lib/models/Category.php similarity index 97% rename from samples/client/petstore/php/SwaggerPetstore-php/lib/models/Category.php rename to samples/client/petstore/php/SwaggerClient-php/lib/models/Category.php index 101222b4503..9c2a6542301 100644 --- a/samples/client/petstore/php/SwaggerPetstore-php/lib/models/Category.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/models/Category.php @@ -22,7 +22,7 @@ * */ -namespace SwaggerPetstore\models; +namespace SwaggerClient\models; use \ArrayAccess; diff --git a/samples/client/petstore/php/SwaggerPetstore-php/lib/models/Order.php b/samples/client/petstore/php/SwaggerClient-php/lib/models/Order.php similarity index 98% rename from samples/client/petstore/php/SwaggerPetstore-php/lib/models/Order.php rename to samples/client/petstore/php/SwaggerClient-php/lib/models/Order.php index 87e8c812eb7..c6a909b29ef 100644 --- a/samples/client/petstore/php/SwaggerPetstore-php/lib/models/Order.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/models/Order.php @@ -22,7 +22,7 @@ * */ -namespace SwaggerPetstore\models; +namespace SwaggerClient\models; use \ArrayAccess; diff --git a/samples/client/petstore/php/SwaggerPetstore-php/lib/models/Pet.php b/samples/client/petstore/php/SwaggerClient-php/lib/models/Pet.php similarity index 98% rename from samples/client/petstore/php/SwaggerPetstore-php/lib/models/Pet.php rename to samples/client/petstore/php/SwaggerClient-php/lib/models/Pet.php index eb67904bf13..d2014f3fa34 100644 --- a/samples/client/petstore/php/SwaggerPetstore-php/lib/models/Pet.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/models/Pet.php @@ -22,7 +22,7 @@ * */ -namespace SwaggerPetstore\models; +namespace SwaggerClient\models; use \ArrayAccess; diff --git a/samples/client/petstore/php/SwaggerPetstore-php/lib/models/Tag.php b/samples/client/petstore/php/SwaggerClient-php/lib/models/Tag.php similarity index 97% rename from samples/client/petstore/php/SwaggerPetstore-php/lib/models/Tag.php rename to samples/client/petstore/php/SwaggerClient-php/lib/models/Tag.php index a9982317ece..4a87c0626f1 100644 --- a/samples/client/petstore/php/SwaggerPetstore-php/lib/models/Tag.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/models/Tag.php @@ -22,7 +22,7 @@ * */ -namespace SwaggerPetstore\models; +namespace SwaggerClient\models; use \ArrayAccess; diff --git a/samples/client/petstore/php/SwaggerPetstore-php/lib/models/User.php b/samples/client/petstore/php/SwaggerClient-php/lib/models/User.php similarity index 98% rename from samples/client/petstore/php/SwaggerPetstore-php/lib/models/User.php rename to samples/client/petstore/php/SwaggerClient-php/lib/models/User.php index 8662f937bc8..ab8b4a60fc4 100644 --- a/samples/client/petstore/php/SwaggerPetstore-php/lib/models/User.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/models/User.php @@ -22,7 +22,7 @@ * */ -namespace SwaggerPetstore\models; +namespace SwaggerClient\models; use \ArrayAccess; diff --git a/samples/client/petstore/php/SwaggerPetstore-php/tests/PetApiTest.php b/samples/client/petstore/php/SwaggerClient-php/tests/PetApiTest.php similarity index 52% rename from samples/client/petstore/php/SwaggerPetstore-php/tests/PetApiTest.php rename to samples/client/petstore/php/SwaggerClient-php/tests/PetApiTest.php index 77413fd30d8..3286208ec56 100644 --- a/samples/client/petstore/php/SwaggerPetstore-php/tests/PetApiTest.php +++ b/samples/client/petstore/php/SwaggerClient-php/tests/PetApiTest.php @@ -1,19 +1,16 @@ getPetById($petId); $this->assertSame($response->id, $petId); } } - ?> diff --git a/samples/client/petstore/php/test.php b/samples/client/petstore/php/test.php index df10876feb5..7cbbfce3cbb 100644 --- a/samples/client/petstore/php/test.php +++ b/samples/client/petstore/php/test.php @@ -1,12 +1,12 @@ getPetById($petId); var_dump($response); diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/pet_api.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/pet_api.py index 5a96b4b6494..298ef2bedd8 100644 --- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/pet_api.py +++ b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/pet_api.py @@ -33,7 +33,7 @@ class PetApi(object): - def updatePet(self, **kwargs): + def update_pet(self, **kwargs): """Update an existing pet Args: @@ -50,7 +50,7 @@ class PetApi(object): params = locals() for (key, val) in params['kwargs'].iteritems(): if key not in allParams: - raise TypeError("Got an unexpected keyword argument '%s' to method updatePet" % key) + raise TypeError("Got an unexpected keyword argument '%s' to method update_pet" % key) params[key] = val del params['kwargs'] @@ -92,7 +92,7 @@ class PetApi(object): - def addPet(self, **kwargs): + def add_pet(self, **kwargs): """Add a new pet to the store Args: @@ -109,7 +109,7 @@ class PetApi(object): params = locals() for (key, val) in params['kwargs'].iteritems(): if key not in allParams: - raise TypeError("Got an unexpected keyword argument '%s' to method addPet" % key) + raise TypeError("Got an unexpected keyword argument '%s' to method add_pet" % key) params[key] = val del params['kwargs'] @@ -151,7 +151,7 @@ class PetApi(object): - def findPetsByStatus(self, **kwargs): + def find_pets_by_status(self, **kwargs): """Finds Pets by status Args: @@ -168,7 +168,7 @@ class PetApi(object): params = locals() for (key, val) in params['kwargs'].iteritems(): if key not in allParams: - raise TypeError("Got an unexpected keyword argument '%s' to method findPetsByStatus" % key) + raise TypeError("Got an unexpected keyword argument '%s' to method find_pets_by_status" % key) params[key] = val del params['kwargs'] @@ -216,7 +216,7 @@ class PetApi(object): - def findPetsByTags(self, **kwargs): + def find_pets_by_tags(self, **kwargs): """Finds Pets by tags Args: @@ -233,7 +233,7 @@ class PetApi(object): params = locals() for (key, val) in params['kwargs'].iteritems(): if key not in allParams: - raise TypeError("Got an unexpected keyword argument '%s' to method findPetsByTags" % key) + raise TypeError("Got an unexpected keyword argument '%s' to method find_pets_by_tags" % key) params[key] = val del params['kwargs'] @@ -281,7 +281,7 @@ class PetApi(object): - def getPetById(self, **kwargs): + def get_pet_by_id(self, **kwargs): """Find pet by ID Args: @@ -298,7 +298,7 @@ class PetApi(object): params = locals() for (key, val) in params['kwargs'].iteritems(): if key not in allParams: - raise TypeError("Got an unexpected keyword argument '%s' to method getPetById" % key) + raise TypeError("Got an unexpected keyword argument '%s' to method get_pet_by_id" % key) params[key] = val del params['kwargs'] @@ -349,7 +349,7 @@ class PetApi(object): - def updatePetWithForm(self, **kwargs): + def update_pet_with_form(self, **kwargs): """Updates a pet in the store with form data Args: @@ -372,7 +372,7 @@ class PetApi(object): params = locals() for (key, val) in params['kwargs'].iteritems(): if key not in allParams: - raise TypeError("Got an unexpected keyword argument '%s' to method updatePetWithForm" % key) + raise TypeError("Got an unexpected keyword argument '%s' to method update_pet_with_form" % key) params[key] = val del params['kwargs'] @@ -423,7 +423,7 @@ class PetApi(object): - def deletePet(self, **kwargs): + def delete_pet(self, **kwargs): """Deletes a pet Args: @@ -443,7 +443,7 @@ class PetApi(object): params = locals() for (key, val) in params['kwargs'].iteritems(): if key not in allParams: - raise TypeError("Got an unexpected keyword argument '%s' to method deletePet" % key) + raise TypeError("Got an unexpected keyword argument '%s' to method delete_pet" % key) params[key] = val del params['kwargs'] @@ -491,7 +491,7 @@ class PetApi(object): - def uploadFile(self, **kwargs): + def upload_file(self, **kwargs): """uploads an image Args: @@ -514,7 +514,7 @@ class PetApi(object): params = locals() for (key, val) in params['kwargs'].iteritems(): if key not in allParams: - raise TypeError("Got an unexpected keyword argument '%s' to method uploadFile" % key) + raise TypeError("Got an unexpected keyword argument '%s' to method upload_file" % key) params[key] = val del params['kwargs'] diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/store_api.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/store_api.py index 49010daf1ab..53f6db8ff54 100644 --- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/store_api.py +++ b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/store_api.py @@ -33,7 +33,7 @@ class StoreApi(object): - def getInventory(self, **kwargs): + def get_inventory(self, **kwargs): """Returns pet inventories by status Args: @@ -47,7 +47,7 @@ class StoreApi(object): params = locals() for (key, val) in params['kwargs'].iteritems(): if key not in allParams: - raise TypeError("Got an unexpected keyword argument '%s' to method getInventory" % key) + raise TypeError("Got an unexpected keyword argument '%s' to method get_inventory" % key) params[key] = val del params['kwargs'] @@ -92,7 +92,7 @@ class StoreApi(object): - def placeOrder(self, **kwargs): + def place_order(self, **kwargs): """Place an order for a pet Args: @@ -109,7 +109,7 @@ class StoreApi(object): params = locals() for (key, val) in params['kwargs'].iteritems(): if key not in allParams: - raise TypeError("Got an unexpected keyword argument '%s' to method placeOrder" % key) + raise TypeError("Got an unexpected keyword argument '%s' to method place_order" % key) params[key] = val del params['kwargs'] @@ -157,7 +157,7 @@ class StoreApi(object): - def getOrderById(self, **kwargs): + def get_order_by_id(self, **kwargs): """Find purchase order by ID Args: @@ -174,7 +174,7 @@ class StoreApi(object): params = locals() for (key, val) in params['kwargs'].iteritems(): if key not in allParams: - raise TypeError("Got an unexpected keyword argument '%s' to method getOrderById" % key) + raise TypeError("Got an unexpected keyword argument '%s' to method get_order_by_id" % key) params[key] = val del params['kwargs'] @@ -225,7 +225,7 @@ class StoreApi(object): - def deleteOrder(self, **kwargs): + def delete_order(self, **kwargs): """Delete purchase order by ID Args: @@ -242,7 +242,7 @@ class StoreApi(object): params = locals() for (key, val) in params['kwargs'].iteritems(): if key not in allParams: - raise TypeError("Got an unexpected keyword argument '%s' to method deleteOrder" % key) + raise TypeError("Got an unexpected keyword argument '%s' to method delete_order" % key) params[key] = val del params['kwargs'] diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/user_api.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/user_api.py index 8d6f6670c6e..530912c38fe 100644 --- a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/user_api.py +++ b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/user_api.py @@ -33,7 +33,7 @@ class UserApi(object): - def createUser(self, **kwargs): + def create_user(self, **kwargs): """Create user Args: @@ -50,7 +50,7 @@ class UserApi(object): params = locals() for (key, val) in params['kwargs'].iteritems(): if key not in allParams: - raise TypeError("Got an unexpected keyword argument '%s' to method createUser" % key) + raise TypeError("Got an unexpected keyword argument '%s' to method create_user" % key) params[key] = val del params['kwargs'] @@ -92,7 +92,7 @@ class UserApi(object): - def createUsersWithArrayInput(self, **kwargs): + def create_users_with_array_input(self, **kwargs): """Creates list of users with given input array Args: @@ -109,7 +109,7 @@ class UserApi(object): params = locals() for (key, val) in params['kwargs'].iteritems(): if key not in allParams: - raise TypeError("Got an unexpected keyword argument '%s' to method createUsersWithArrayInput" % key) + raise TypeError("Got an unexpected keyword argument '%s' to method create_users_with_array_input" % key) params[key] = val del params['kwargs'] @@ -151,7 +151,7 @@ class UserApi(object): - def createUsersWithListInput(self, **kwargs): + def create_users_with_list_input(self, **kwargs): """Creates list of users with given input array Args: @@ -168,7 +168,7 @@ class UserApi(object): params = locals() for (key, val) in params['kwargs'].iteritems(): if key not in allParams: - raise TypeError("Got an unexpected keyword argument '%s' to method createUsersWithListInput" % key) + raise TypeError("Got an unexpected keyword argument '%s' to method create_users_with_list_input" % key) params[key] = val del params['kwargs'] @@ -210,7 +210,7 @@ class UserApi(object): - def loginUser(self, **kwargs): + def login_user(self, **kwargs): """Logs user into the system Args: @@ -230,7 +230,7 @@ class UserApi(object): params = locals() for (key, val) in params['kwargs'].iteritems(): if key not in allParams: - raise TypeError("Got an unexpected keyword argument '%s' to method loginUser" % key) + raise TypeError("Got an unexpected keyword argument '%s' to method login_user" % key) params[key] = val del params['kwargs'] @@ -281,7 +281,7 @@ class UserApi(object): - def logoutUser(self, **kwargs): + def logout_user(self, **kwargs): """Logs out current logged in user session Args: @@ -295,7 +295,7 @@ class UserApi(object): params = locals() for (key, val) in params['kwargs'].iteritems(): if key not in allParams: - raise TypeError("Got an unexpected keyword argument '%s' to method logoutUser" % key) + raise TypeError("Got an unexpected keyword argument '%s' to method logout_user" % key) params[key] = val del params['kwargs'] @@ -334,7 +334,7 @@ class UserApi(object): - def getUserByName(self, **kwargs): + def get_user_by_name(self, **kwargs): """Get user by user name Args: @@ -351,7 +351,7 @@ class UserApi(object): params = locals() for (key, val) in params['kwargs'].iteritems(): if key not in allParams: - raise TypeError("Got an unexpected keyword argument '%s' to method getUserByName" % key) + raise TypeError("Got an unexpected keyword argument '%s' to method get_user_by_name" % key) params[key] = val del params['kwargs'] @@ -402,7 +402,7 @@ class UserApi(object): - def updateUser(self, **kwargs): + def update_user(self, **kwargs): """Updated user Args: @@ -422,7 +422,7 @@ class UserApi(object): params = locals() for (key, val) in params['kwargs'].iteritems(): if key not in allParams: - raise TypeError("Got an unexpected keyword argument '%s' to method updateUser" % key) + raise TypeError("Got an unexpected keyword argument '%s' to method update_user" % key) params[key] = val del params['kwargs'] @@ -470,7 +470,7 @@ class UserApi(object): - def deleteUser(self, **kwargs): + def delete_user(self, **kwargs): """Delete user Args: @@ -487,7 +487,7 @@ class UserApi(object): params = locals() for (key, val) in params['kwargs'].iteritems(): if key not in allParams: - raise TypeError("Got an unexpected keyword argument '%s' to method deleteUser" % key) + raise TypeError("Got an unexpected keyword argument '%s' to method delete_user" % key) params[key] = val del params['kwargs'] diff --git a/samples/client/petstore/ruby/lib/pet_api.rb b/samples/client/petstore/ruby/lib/pet_api.rb index d083df5f74d..6b032510c41 100644 --- a/samples/client/petstore/ruby/lib/pet_api.rb +++ b/samples/client/petstore/ruby/lib/pet_api.rb @@ -9,7 +9,7 @@ class PetApi # @param [Hash] opts the optional parameters # @option opts [Pet] :body Pet object that needs to be added to the store # @return void - def self.updatePet(opts = {}) + def self.update_pet(opts = {}) # verify existence of params # resource path @@ -61,7 +61,7 @@ class PetApi # @param [Hash] opts the optional parameters # @option opts [Pet] :body Pet object that needs to be added to the store # @return void - def self.addPet(opts = {}) + def self.add_pet(opts = {}) # verify existence of params # resource path @@ -113,7 +113,7 @@ class PetApi # @param [Hash] opts the optional parameters # @option opts [array[string]] :status Status values that need to be considered for filter # @return array[Pet] - def self.findPetsByStatus(opts = {}) + def self.find_pets_by_status(opts = {}) # verify existence of params # resource path @@ -147,7 +147,7 @@ class PetApi # @param [Hash] opts the optional parameters # @option opts [array[string]] :tags Tags to filter by # @return array[Pet] - def self.findPetsByTags(opts = {}) + def self.find_pets_by_tags(opts = {}) # verify existence of params # resource path @@ -181,7 +181,7 @@ class PetApi # @param pet_id ID of pet that needs to be fetched # @param [Hash] opts the optional parameters # @return Pet - def self.getPetById(pet_id, opts = {}) + def self.get_pet_by_id(pet_id, opts = {}) # verify existence of params raise "pet_id is required" if pet_id.nil? @@ -217,7 +217,7 @@ class PetApi # @option opts [string] :name Updated name of the pet # @option opts [string] :status Updated status of the pet # @return void - def self.updatePetWithForm(pet_id, opts = {}) + def self.update_pet_with_form(pet_id, opts = {}) # verify existence of params raise "pet_id is required" if pet_id.nil? @@ -253,7 +253,7 @@ class PetApi # @param [Hash] opts the optional parameters # @option opts [string] :api_key # @return void - def self.deletePet(pet_id, opts = {}) + def self.delete_pet(pet_id, opts = {}) # verify existence of params raise "pet_id is required" if pet_id.nil? @@ -289,7 +289,7 @@ class PetApi # @option opts [string] :additional_metadata Additional data to pass to server # @option opts [file] :file file to upload # @return void - def self.uploadFile(pet_id, opts = {}) + def self.upload_file(pet_id, opts = {}) # verify existence of params raise "pet_id is required" if pet_id.nil? diff --git a/samples/client/petstore/ruby/lib/store_api.rb b/samples/client/petstore/ruby/lib/store_api.rb index 757049a6fb6..6cd3296039b 100644 --- a/samples/client/petstore/ruby/lib/store_api.rb +++ b/samples/client/petstore/ruby/lib/store_api.rb @@ -8,7 +8,7 @@ class StoreApi # Returns a map of status codes to quantities # @param [Hash] opts the optional parameters # @return map[string,int] - def self.getInventory(opts = {}) + def self.get_inventory(opts = {}) # verify existence of params # resource path @@ -41,7 +41,7 @@ class StoreApi # @param [Hash] opts the optional parameters # @option opts [Order] :body order placed for purchasing the pet # @return Order - def self.placeOrder(opts = {}) + def self.place_order(opts = {}) # verify existence of params # resource path @@ -94,7 +94,7 @@ class StoreApi # @param order_id ID of pet that needs to be fetched # @param [Hash] opts the optional parameters # @return Order - def self.getOrderById(order_id, opts = {}) + def self.get_order_by_id(order_id, opts = {}) # verify existence of params raise "order_id is required" if order_id.nil? @@ -128,7 +128,7 @@ class StoreApi # @param order_id ID of the order that needs to be deleted # @param [Hash] opts the optional parameters # @return void - def self.deleteOrder(order_id, opts = {}) + def self.delete_order(order_id, opts = {}) # verify existence of params raise "order_id is required" if order_id.nil? diff --git a/samples/client/petstore/ruby/lib/user_api.rb b/samples/client/petstore/ruby/lib/user_api.rb index 9d0e6bd6ce9..dead94897cd 100644 --- a/samples/client/petstore/ruby/lib/user_api.rb +++ b/samples/client/petstore/ruby/lib/user_api.rb @@ -9,7 +9,7 @@ class UserApi # @param [Hash] opts the optional parameters # @option opts [User] :body Created user object # @return void - def self.createUser(opts = {}) + def self.create_user(opts = {}) # verify existence of params # resource path @@ -61,7 +61,7 @@ class UserApi # @param [Hash] opts the optional parameters # @option opts [array[User]] :body List of user object # @return void - def self.createUsersWithArrayInput(opts = {}) + def self.create_users_with_array_input(opts = {}) # verify existence of params # resource path @@ -113,7 +113,7 @@ class UserApi # @param [Hash] opts the optional parameters # @option opts [array[User]] :body List of user object # @return void - def self.createUsersWithListInput(opts = {}) + def self.create_users_with_list_input(opts = {}) # verify existence of params # resource path @@ -166,7 +166,7 @@ class UserApi # @option opts [string] :username The user name for login # @option opts [string] :password The password for login in clear text # @return string - def self.loginUser(opts = {}) + def self.login_user(opts = {}) # verify existence of params # resource path @@ -200,7 +200,7 @@ class UserApi # # @param [Hash] opts the optional parameters # @return void - def self.logoutUser(opts = {}) + def self.logout_user(opts = {}) # verify existence of params # resource path @@ -232,7 +232,7 @@ class UserApi # @param username The name that needs to be fetched. Use user1 for testing. # @param [Hash] opts the optional parameters # @return User - def self.getUserByName(username, opts = {}) + def self.get_user_by_name(username, opts = {}) # verify existence of params raise "username is required" if username.nil? @@ -267,7 +267,7 @@ class UserApi # @param [Hash] opts the optional parameters # @option opts [User] :body Updated user object # @return void - def self.updateUser(username, opts = {}) + def self.update_user(username, opts = {}) # verify existence of params raise "username is required" if username.nil? @@ -320,7 +320,7 @@ class UserApi # @param username The name that needs to be deleted # @param [Hash] opts the optional parameters # @return void - def self.deleteUser(username, opts = {}) + def self.delete_user(username, opts = {}) # verify existence of params raise "username is required" if username.nil? diff --git a/samples/client/petstore/ruby/spec/pet_spec.rb b/samples/client/petstore/ruby/spec/pet_spec.rb index e3b42b78142..67cee70c1ee 100644 --- a/samples/client/petstore/ruby/spec/pet_spec.rb +++ b/samples/client/petstore/ruby/spec/pet_spec.rb @@ -8,24 +8,24 @@ describe "Pet" do describe "pet methods" do it "should fetch a pet object" do - pet = PetApi.getPetById(10002) + pet = PetApi.get_pet_by_id(10002) pet.should be_a(Pet) pet.id.should == 10002 pet.name.should == "RUBY UNIT TESTING" end it "should find pets by status" do - pets = PetApi.findPetsByStatus(:status => 'available') + pets = PetApi.find_pets_by_status(:status => 'available') pets.length.should >= 3 end it "should not find a pet with invalid status" do - pets = PetApi.findPetsByStatus(:status => 'invalid-status') + pets = PetApi.find_pets_by_status(:status => 'invalid-status') pets.length.should == 0 end it "should find a pet by status" do - pets = PetApi.findPetsByStatus(:status => "available,sold") + pets = PetApi.find_pets_by_status(:status => "available,sold") pets.map {|pet| if(pet.status != 'available' && pet.status != 'sold') raise "pet status wasn't right" @@ -35,18 +35,18 @@ describe "Pet" do it "should update a pet" do pet = Pet.new({'id' => 10002, 'status' => 'sold'}) - PetApi.addPet(:body => pet) + PetApi.add_pet(:body => pet) - fetched = PetApi.getPetById(10002) + fetched = PetApi.get_pet_by_id(10002) fetched.id.should == 10002 fetched.status.should == 'sold' end it "should create a pet" do pet = Pet.new('id' => 10002, 'name' => "RUBY UNIT TESTING") - PetApi.addPet(:body => pet) + PetApi.add_pet(:body => pet) - pet = PetApi.getPetById(10002) + pet = PetApi.get_pet_by_id(10002) pet.id.should == 10002 pet.name.should == "RUBY UNIT TESTING" end diff --git a/samples/client/petstore/ruby/spec/spec_helper.rb b/samples/client/petstore/ruby/spec/spec_helper.rb index c0bcaffa9c7..71725a45a6c 100644 --- a/samples/client/petstore/ruby/spec/spec_helper.rb +++ b/samples/client/petstore/ruby/spec/spec_helper.rb @@ -47,10 +47,10 @@ end # always delete and then re-create the pet object with 10002 def prepare_pet # remove the pet - PetApi.deletePet(10002, :api_key => 'special-key') + PetApi.delete_pet(10002) # recreate the pet pet = Pet.new('id' => 10002, 'name' => "RUBY UNIT TESTING") - PetApi.addPet(:body => pet) + PetApi.add_pet(:body => pet) end # always delete and then re-create the store order @@ -61,7 +61,7 @@ def prepare_store "shipDate" => "2015-04-06T23:42:01.678Z", "status" => "placed", "complete" => false) - StoreApi.placeOrder(:body => order) + StoreApi.place_order(:body => order) end configure_swagger diff --git a/samples/client/petstore/ruby/spec/store_spec.rb b/samples/client/petstore/ruby/spec/store_spec.rb index 961aac05f06..a1e2bd3193f 100644 --- a/samples/client/petstore/ruby/spec/store_spec.rb +++ b/samples/client/petstore/ruby/spec/store_spec.rb @@ -7,7 +7,7 @@ describe "Store" do end it "should fetch an order" do - item = StoreApi.getOrderById(10002) + item = StoreApi.get_order_by_id(10002) item.id.should == 10002 end end diff --git a/samples/html/index.html b/samples/html/index.html index 1055c9962ad..bab16472c30 100644 --- a/samples/html/index.html +++ b/samples/html/index.html @@ -420,7 +420,7 @@

Example data

Content-Type: application/xml
- 
not implemented com.wordnik.swagger.models.properties.MapProperty@2acca551
+ 
not implemented com.wordnik.swagger.models.properties.MapProperty@3c536f11
@@ -444,11 +444,11 @@

Example data

Content-Type: application/json
- 
{\n  "id" : 123456789,\n  "petId" : 123456789,\n  "complete" : true,\n  "status" : "aeiou",\n  "quantity" : 123,\n  "shipDate" : "2015-04-05T03:02:18.855+0000"\n}
+ 
{\n  "id" : 123456789,\n  "petId" : 123456789,\n  "complete" : true,\n  "status" : "aeiou",\n  "quantity" : 123,\n  "shipDate" : "2015-04-16T14:41:29.883+0000"\n}

Example data

Content-Type: application/xml
- 
\n  123456\n  123456\n  0\n  2015-04-04T20:02:18.857Z\n  string\n  true\n
+ 
\n  123456\n  123456\n  0\n  2015-04-16T22:41:29.886Z\n  string\n  true\n
@@ -472,11 +472,11 @@

Example data

Content-Type: application/json
- 
{\n  "id" : 123456789,\n  "petId" : 123456789,\n  "complete" : true,\n  "status" : "aeiou",\n  "quantity" : 123,\n  "shipDate" : "2015-04-05T03:02:18.859+0000"\n}
+ 
{\n  "id" : 123456789,\n  "petId" : 123456789,\n  "complete" : true,\n  "status" : "aeiou",\n  "quantity" : 123,\n  "shipDate" : "2015-04-16T14:41:29.887+0000"\n}

Example data

Content-Type: application/xml
- 
\n  123456\n  123456\n  0\n  2015-04-04T20:02:18.859Z\n  string\n  true\n
+ 
\n  123456\n  123456\n  0\n  2015-04-16T22:41:29.888Z\n  string\n  true\n