From 8909bd4ba1bac4ddcf660e40a9f005577bbcf330 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janusz=20Jab=C5=82o=C5=84ski?= Date: Mon, 10 Feb 2014 22:42:02 +0100 Subject: [PATCH] Added consumes and produces to php templates. --- src/main/resources/php/Swagger.mustache | 6 ------ src/main/resources/php/api.mustache | 2 ++ .../scala/com/wordnik/swagger/codegen/Codegen.scala | 10 ++++++++++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/resources/php/Swagger.mustache b/src/main/resources/php/Swagger.mustache index e7b7c11fbeb..b98dee9770e 100644 --- a/src/main/resources/php/Swagger.mustache +++ b/src/main/resources/php/Swagger.mustache @@ -50,7 +50,6 @@ class APIClient { $headerParams) { $headers = array(); - $headers[] = "Content-type: application/json"; # Allow API key from $headerParams to override default $added_api_key = False; @@ -234,8 +233,3 @@ class APIClient { return $instance; } } - - -?> - - diff --git a/src/main/resources/php/api.mustache b/src/main/resources/php/api.mustache index fa081768fa8..87a2a0a197d 100644 --- a/src/main/resources/php/api.mustache +++ b/src/main/resources/php/api.mustache @@ -45,6 +45,8 @@ class {{classname}} { $method = "{{httpMethod}}"; $queryParams = array(); $headerParams = array(); + $headerParams['Accept'] = '{{produces}}'; + $headerParams['Content-Type'] = '{{consume}}'; {{#queryParams}} if(${{paramName}} != null) { diff --git a/src/main/scala/com/wordnik/swagger/codegen/Codegen.scala b/src/main/scala/com/wordnik/swagger/codegen/Codegen.scala index 9295dff0d99..8819ce736bc 100644 --- a/src/main/scala/com/wordnik/swagger/codegen/Codegen.scala +++ b/src/main/scala/com/wordnik/swagger/codegen/Codegen.scala @@ -384,6 +384,16 @@ class Codegen(config: CodegenConfig) { "httpMethod" -> operation.method.toUpperCase, "httpMethodLowerCase" -> operation.method.toLowerCase, operation.method.toLowerCase -> "true") + if (0 < operation.consumes.length) { + properties += "consume" -> operation.consumes(0) + } else { + properties += "consume" -> "application/json" + } + if (0 < operation.produces.length) { + properties += "produces" -> operation.produces + } else { + properties += "produces" -> "application/json" + } if (requiredParams.size > 0) properties += "requiredParamCount" -> requiredParams.size.toString operation.responseClass.indexOf("[") match { case -1 => {