From 5994a2fb2da4a8dac302c3e455e6ea1c3693f768 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 29 Nov 2017 16:17:51 +0800 Subject: [PATCH] use {{{mediaType}} instead of {{mediaType}} (#7073) --- .../main/resources/Java/libraries/resttemplate/api.mustache | 4 ++-- .../main/resources/Java/libraries/retrofit2/api.mustache | 2 +- .../resources/Java/libraries/retrofit2/play24/api.mustache | 2 +- .../resources/Java/libraries/retrofit2/play25/api.mustache | 2 +- .../src/main/resources/JavaJaxRS/cxf-cdi/api.mustache | 4 ++-- .../swagger-codegen/src/main/resources/apex/api.mustache | 4 ++-- .../swagger-codegen/src/main/resources/bash/client.mustache | 6 +++--- .../src/main/resources/cpprest/api-source.mustache | 4 ++-- .../src/main/resources/php-symfony/api_controller.mustache | 4 ++-- .../src/main/resources/tizen/api-body.mustache | 2 +- .../swagger-codegen/src/main/resources/ze-ph/api.mustache | 4 ++-- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/api.mustache index 5daa24d1fb0..f48180f4381 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/api.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/api.mustache @@ -89,11 +89,11 @@ public class {{classname}} { {{/hasMore}}{{/formParams}}{{/hasFormParams}} final String[] {{localVariablePrefix}}accepts = { {{#hasProduces}} - {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} + {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} {{/hasProduces}}}; final List {{localVariablePrefix}}accept = {{localVariablePrefix}}apiClient.selectHeaderAccept({{localVariablePrefix}}accepts); final String[] {{localVariablePrefix}}contentTypes = { {{#hasConsumes}} - {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} + {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} {{/hasConsumes}}}; final MediaType {{localVariablePrefix}}contentType = {{localVariablePrefix}}apiClient.selectHeaderContentType({{localVariablePrefix}}contentTypes); diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/api.mustache index 00b28c20aab..d19c634e29d 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/api.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/api.mustache @@ -50,7 +50,7 @@ public interface {{classname}} { {{#prioritizedContentTypes}} {{#-first}} @Headers({ - "Content-Type:{{mediaType}}" + "Content-Type:{{{mediaType}}}" }) {{/-first}} {{/prioritizedContentTypes}} diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/play24/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/play24/api.mustache index bb462a2c583..6ffa06c5385 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/play24/api.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/play24/api.mustache @@ -42,7 +42,7 @@ public interface {{classname}} { {{#prioritizedContentTypes}} {{#-first}} @Headers({ - "Content-Type:{{mediaType}}" + "Content-Type:{{{mediaType}}}" }) {{/-first}} {{/prioritizedContentTypes}} diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/play25/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/play25/api.mustache index 506846826e5..b16f1779b9a 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/play25/api.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/play25/api.mustache @@ -42,7 +42,7 @@ public interface {{classname}} { {{#prioritizedContentTypes}} {{#-first}} @Headers({ - "Content-Type:{{mediaType}}" + "Content-Type:{{{mediaType}}}" }) {{/-first}} {{/prioritizedContentTypes}} diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/api.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/api.mustache index 7c7e1c1ef3c..49567903a52 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/api.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/api.mustache @@ -41,8 +41,8 @@ public class {{classname}} { @{{httpMethod}} {{#subresourceOperation}}@Path("{{{path}}}"){{/subresourceOperation}} - {{#hasConsumes}}@Consumes({ {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}} - {{#hasProduces}}@Produces({ {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}} + {{#hasConsumes}}@Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}} + {{#hasProduces}}@Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}} @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnBaseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}{{#hasAuthMethods}}, authorizations = { {{#authMethods}}@Authorization(value = "{{name}}"{{#isOAuth}}, scopes = { {{#scopes}}@AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}}, diff --git a/modules/swagger-codegen/src/main/resources/apex/api.mustache b/modules/swagger-codegen/src/main/resources/apex/api.mustache index 700c66eb15c..ebbef7283f6 100644 --- a/modules/swagger-codegen/src/main/resources/apex/api.mustache +++ b/modules/swagger-codegen/src/main/resources/apex/api.mustache @@ -88,13 +88,13 @@ public class {{classname}} { {{/headerParams}} }{{/hasHeaderParams}}{{^hasHeaderParams}}(){{/hasHeaderParams}}, {{#hasProduces}} - new List{ {{#produces}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/produces}} }, + new List{ {{#produces}}'{{{mediaType}}}'{{#hasMore}}, {{/hasMore}}{{/produces}} }, {{/hasProduces}} {{^hasProduces}} new List(), {{/hasProduces}} {{#hasConsumes}} - new List{ {{#consumes}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/consumes}} }, + new List{ {{#consumes}}'{{{mediaType}}}'{{#hasMore}}, {{/hasMore}}{{/consumes}} }, {{/hasConsumes}} {{^hasConsumes}} new List(), diff --git a/modules/swagger-codegen/src/main/resources/bash/client.mustache b/modules/swagger-codegen/src/main/resources/bash/client.mustache index 92e62eaa55d..168c9817add 100644 --- a/modules/swagger-codegen/src/main/resources/bash/client.mustache +++ b/modules/swagger-codegen/src/main/resources/bash/client.mustache @@ -706,7 +706,7 @@ print_{{operationId}}_help() { {{/allParams}} {{#allParams}} {{#isBodyParam}} - echo -e " * ${GREEN}body${OFF} ${BLUE}[{{#consumes}}{{mediaType}}{{#hasMore}},{{/hasMore}}{{/consumes}}]${OFF}{{#required}} ${RED}(required)${OFF}{{/required}}${OFF} - {{{description}}}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/ /' + echo -e " * ${GREEN}body${OFF} ${BLUE}[{{#consumes}}{{{mediaType}}}{{#hasMore}},{{/hasMore}}{{/consumes}}]${OFF}{{#required}} ${RED}(required)${OFF}{{/required}}${OFF} - {{{description}}}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/ /' echo -e "" {{#vendorExtensions}} {{#x-codegen-body-example}} @@ -791,7 +791,7 @@ call_{{operationId}}() { {{#-first}} {{^hasMore}} if [[ -z $header_content_type ]]; then - header_content_type="{{mediaType}}" + header_content_type="{{{mediaType}}}" fi {{/hasMore}} {{/-first}} @@ -805,7 +805,7 @@ call_{{operationId}}() { echo "ERROR: Request's content-type not specified!!!" echo "This operation expects content-type in one of the following formats:" {{#consumes}} - echo -e "\\t- {{mediaType}}" + echo -e "\\t- {{{mediaType}}}" {{/consumes}} echo "" echo "Use '--content-type' to set proper content type" diff --git a/modules/swagger-codegen/src/main/resources/cpprest/api-source.mustache b/modules/swagger-codegen/src/main/resources/cpprest/api-source.mustache index 2e3ee4cd24c..d55a7ef020f 100644 --- a/modules/swagger-codegen/src/main/resources/cpprest/api-source.mustache +++ b/modules/swagger-codegen/src/main/resources/cpprest/api-source.mustache @@ -48,7 +48,7 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r std::unordered_set responseHttpContentTypes; {{#produces}} - responseHttpContentTypes.insert( utility::conversions::to_string_t("{{mediaType}}") ); + responseHttpContentTypes.insert( utility::conversions::to_string_t("{{{mediaType}}}") ); {{/produces}} utility::string_t responseHttpContentType; @@ -98,7 +98,7 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r std::unordered_set consumeHttpContentTypes; {{#consumes}} - consumeHttpContentTypes.insert( utility::conversions::to_string_t("{{mediaType}}") ); + consumeHttpContentTypes.insert( utility::conversions::to_string_t("{{{mediaType}}}") ); {{/consumes}} {{#allParams}} diff --git a/modules/swagger-codegen/src/main/resources/php-symfony/api_controller.mustache b/modules/swagger-codegen/src/main/resources/php-symfony/api_controller.mustache index dde510fb5c9..cdf7fe7a6fa 100644 --- a/modules/swagger-codegen/src/main/resources/php-symfony/api_controller.mustache +++ b/modules/swagger-codegen/src/main/resources/php-symfony/api_controller.mustache @@ -58,7 +58,7 @@ class {{controllerName}} extends Controller { {{#bodyParams}} // Make sure that the client is providing something that we can consume - $consumes = [{{#consumes}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/consumes}}]; + $consumes = [{{#consumes}}'{{{mediaType}}}'{{#hasMore}}, {{/hasMore}}{{/consumes}}]; $inputFormat = $request->headers->has('Content-Type')?$request->headers->get('Content-Type'):$consumes[0]; if (!in_array($inputFormat, $consumes)) { // We can't consume the content that the client is sending us @@ -67,7 +67,7 @@ class {{controllerName}} extends Controller {{/bodyParams}} // Figure out what data format to return to the client - $produces = [{{#produces}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/produces}}]; + $produces = [{{#produces}}'{{{mediaType}}}'{{#hasMore}}, {{/hasMore}}{{/produces}}]; // Figure out what the client accepts $clientAccepts = $request->headers->has('Accept')?$request->headers->get('Accept'):'*/*'; $responseFormat = $this->getOutputFormat($clientAccepts, $produces); diff --git a/modules/swagger-codegen/src/main/resources/tizen/api-body.mustache b/modules/swagger-codegen/src/main/resources/tizen/api-body.mustache index 56d6983766c..57fd894dd6f 100644 --- a/modules/swagger-codegen/src/main/resources/tizen/api-body.mustache +++ b/modules/swagger-codegen/src/main/resources/tizen/api-body.mustache @@ -169,7 +169,7 @@ static bool {{nickname}}Helper(char * accessToken, headerList = curl_slist_append(headerList, accessHeader.c_str()); {{#hasConsumes}} {{#consumes}} - headerList = curl_slist_append(headerList, "Content-Type: {{mediaType}}"); + headerList = curl_slist_append(headerList, "Content-Type: {{{mediaType}}}"); {{/consumes}} {{/hasConsumes}} {{^hasConsumes}} diff --git a/modules/swagger-codegen/src/main/resources/ze-ph/api.mustache b/modules/swagger-codegen/src/main/resources/ze-ph/api.mustache index fdaf4ca7ba7..2749cc42a83 100644 --- a/modules/swagger-codegen/src/main/resources/ze-ph/api.mustache +++ b/modules/swagger-codegen/src/main/resources/ze-ph/api.mustache @@ -29,7 +29,7 @@ class {{classname}} implements {{interfacesToImplement}} {{#bodyParam}} {{#consumes}} * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation - * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="{{mediaType}}") + * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="{{{mediaType}}}") {{/consumes}} {{^isPrimitiveType}} * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":{{dataType}}::class,"objectAttr":"{{paramName}}"}) @@ -37,7 +37,7 @@ class {{classname}} implements {{interfacesToImplement}} {{/bodyParam}} {{#produces}} * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation - * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="{{mediaType}}") + * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="{{{mediaType}}}") {{/produces}} * @param ServerRequestInterface $request *