[templates] Update templates vendor ext standards (#5295)

* [templates] Update to vendor extension standard keys

* Fix missed value in Java template, also implements=>x-implements. Evaluate Haskell Client changes

* Fix missing accept/content-type update for vendor extension format

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java

@@ -486,7 +486,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
                     StringBuilder sb = new StringBuilder(param.paramName);
                     sb.setCharAt(0, Character.toUpperCase(nameFirstChar));
                     param.vendorExtensions.put("x-exportParamName", sb.toString()); // TODO: 5.0 Remove
-                    param.vendorExtensions.put("x-x-export-param-name", sb.toString());
+                    param.vendorExtensions.put("x-export-param-name", sb.toString());
                 }
             }
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java

@@ -87,76 +87,65 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
     static final String MIME_NO_CONTENT = "MimeNoContent";
     static final String MIME_ANY = "MimeAny";
 
-    // vendor extensions
+    // vendor extensions. These must follow our convention of x- prefixed and lower-kebab cased.
-    static final String X_ALL_UNIQUE_PARAMS = "x-allUniqueParams";  // TODO: 5.0 Remove
-    static final String X_ALL_IMPORT_MAPPINGS = "x-allImportMappings";  // TODO: 5.0 Remove
-    static final String X_ALL_UNIQUE_IMPORT_PATHS = "x-allUniqueImportPaths";  // TODO: 5.0 Remove
     static final String X_COLLECTION_FORMAT = "x-collectionFormat";  // TODO: 5.0 Remove
     static final String X_HADDOCK_PATH = "x-haddockPath";  // TODO: 5.0 Remove
     static final String X_HAS_BODY_OR_FORM_PARAM = "x-hasBodyOrFormParam";  // TODO: 5.0 Remove
-    static final String X_HAS_ENUM_SECTION = "x-hasEnumSection";  // TODO: 5.0 Remove
-    static final String X_HAS_IMPORT_MAPPINGS = "x-hasImportMappings";  // TODO: 5.0 Remove
     static final String X_HAS_MIME_FORM_URL_ENCODED = "x-hasMimeFormUrlEncoded";  // TODO: 5.0 Remove
     static final String X_HAS_NEW_TAG = "x-hasNewTag";  // TODO: 5.0 Remove
     static final String X_HAS_OPTIONAL_PARAMS = "x-hasOptionalParams";  // TODO: 5.0 Remove
-    static final String X_HAS_UNKNOWN_MIME_TYPES = "x-hasUnknownMimeTypes";  // TODO: 5.0 Remove
     static final String X_HAS_UNKNOWN_RETURN = "x-hasUnknownReturn";  // TODO: 5.0 Remove
     static final String X_INLINE_CONTENT_TYPE = "x-inlineContentType";  // TODO: 5.0 Remove
     static final String X_INLINE_ACCEPT = "x-inlineAccept";  // TODO: 5.0 Remove
     static final String X_IS_BODY_OR_FORM_PARAM = "x-isBodyOrFormParam";  // TODO: 5.0 Remove
-    static final String X_IS_BODY_PARAM = "x-isBodyParam";  // TODO: 5.0 Remove
     static final String X_IS_MAYBE_VALUE = "x-isMaybeValue";  // TODO: 5.0 Remove
-    static final String X_MEDIA_DATA_TYPE = "x-mediaDataType";  // TODO: 5.0 Remove
     static final String X_DATA_TYPE = "x-dataType";  // TODO: 5.0 Remove
-    static final String X_ENUM_VALUES = "x-enumValues";  // TODO: 5.0 Remove
-    static final String X_MEDIA_IS_JSON = "x-mediaIsJson";  // TODO: 5.0 Remove
-    static final String X_MEDIA_IS_WILDCARD = "x-mediaIsWildcard";  // TODO: 5.0 Remove
     static final String X_MIME_TYPES = "x-mimeTypes";  // TODO: 5.0 Remove
     static final String X_OPERATION_TYPE = "x-operationType";  // TODO: 5.0 Remove
     static final String X_PARAM_NAME_TYPE = "x-paramNameType";  // TODO: 5.0 Remove
     static final String X_RETURN_TYPE = "x-returnType";  // TODO: 5.0 Remove
-    static final String X_STRICT_FIELDS = "x-strictFields";  // TODO: 5.0 Remove
     static final String X_UNKNOWN_MIME_TYPES = "x-unknownMimeTypes";  // TODO: 5.0 Remove
-    static final String X_USE_KATIP = "x-useKatip";  // TODO: 5.0 Remove
-    static final String X_ALLOW_NONUNIQUE_OPERATION_IDS = "x-allowNonUniqueOperationIds";  // TODO: 5.0 Remove
 
-    static final String VENDOR_EXTENSION_X_ALL_UNIQUE_PARAMS = "x-all-unique-params";
-    static final String VENDOR_EXTENSION_X_ALL_IMPORT_MAPPINGS = "x-all-import-mappings";
-    static final String VENDOR_EXTENSION_X_ALL_UNIQUE_IMPORT_PATHS = "x-all-unique-import-paths";
     static final String VENDOR_EXTENSION_X_COLLECTION_FORMAT = "x-collection-format";
     static final String VENDOR_EXTENSION_X_HADDOCK_PATH = "x-haddock-path";
     static final String VENDOR_EXTENSION_X_HAS_BODY_OR_FORM_PARAM = "x-has-body-or-form-param";
-    static final String VENDOR_EXTENSION_X_HAS_ENUM_SECTION = "x-has-enum-section";
-    static final String VENDOR_EXTENSION_X_HAS_IMPORT_MAPPINGS = "x-has-import-mappings";
     static final String VENDOR_EXTENSION_X_HAS_MIME_FORM_URL_ENCODED = "x-has-mime-form-url-encoded";
     static final String VENDOR_EXTENSION_X_HAS_NEW_TAG = "x-has-new-tag";
     static final String VENDOR_EXTENSION_X_HAS_OPTIONAL_PARAMS = "x-has-optional-params";
-    static final String VENDOR_EXTENSION_X_HAS_UNKNOWN_MIME_TYPES = "x-has-unknown-mime-types";
     static final String VENDOR_EXTENSION_X_HAS_UNKNOWN_RETURN = "x-has-unknown-return";
     static final String VENDOR_EXTENSION_X_INLINE_CONTENT_TYPE = "x-inline-content-type";
     static final String VENDOR_EXTENSION_X_INLINE_ACCEPT = "x-inline-accept";
     static final String VENDOR_EXTENSION_X_IS_BODY_OR_FORM_PARAM = "x-is-body-or-form-param";
-    static final String VENDOR_EXTENSION_X_IS_BODY_PARAM = "x-is-body-param";
     static final String VENDOR_EXTENSION_X_IS_MAYBE_VALUE = "x-is-maybe-value";
-    static final String VENDOR_EXTENSION_X_MEDIA_DATA_TYPE = "x-media-data-type";
     static final String VENDOR_EXTENSION_X_DATA_TYPE = "x-data-type";
-    static final String VENDOR_EXTENSION_X_ENUM_VALUES = "x-enum-values";
-    static final String VENDOR_EXTENSION_X_MEDIA_IS_JSON = "x-media-is-json";
-    static final String VENDOR_EXTENSION_X_MEDIA_IS_WILDCARD = "x-media-is-wildcard";
     static final String VENDOR_EXTENSION_X_MIME_TYPES = "x-mime-types";
     static final String VENDOR_EXTENSION_X_OPERATION_TYPE = "x-operation-type";
     static final String VENDOR_EXTENSION_X_PARAM_NAME_TYPE = "x-param-name-type";
     static final String VENDOR_EXTENSION_X_RETURN_TYPE = "x-return-type";
-    static final String VENDOR_EXTENSION_X_STRICT_FIELDS = "x-strict-fields";
-    static final String VENDOR_EXTENSION_X_UNKNOWN_MIME_TYPES = "x-unknown-mime-types";
-    static final String VENDOR_EXTENSION_X_USE_KATIP = "x-use-katip";
-    static final String VENDOR_EXTENSION_X_ALLOW_NONUNIQUE_OPERATION_IDS = "x-allow-non-unique-operation-ids";
 
     // note; newtype is a single lowercase word in Haskell (not separated by hyphen)
     static final String X_NEWTYPE = "x-newtype";
     static final String VENDOR_EXTENSION_X_ENUM = "x-enum";
     static final String VENDOR_EXTENSION_X_PATH = "x-path";
 
+
+    // additional properties
+    // FIXME: These appear to be used as vendor extensions in the additional properties collection.
+    static final String X_ALL_UNIQUE_PARAMS = "x-allUniqueParams";
+    static final String X_ALL_IMPORT_MAPPINGS = "x-allImportMappings";
+    static final String X_HAS_ENUM_SECTION = "x-hasEnumSection";
+    static final String X_HAS_IMPORT_MAPPINGS = "x-hasImportMappings";
+    static final String X_HAS_UNKNOWN_MIME_TYPES = "x-hasUnknownMimeTypes";
+    static final String X_IS_BODY_PARAM = "x-isBodyParam";
+    static final String X_MEDIA_DATA_TYPE = "x-mediaDataType";
+    static final String X_ENUM_VALUES = "x-enumValues";
+    static final String X_MEDIA_IS_JSON = "x-mediaIsJson";
+    static final String X_MEDIA_IS_WILDCARD = "x-mediaIsWildcard";
+    static final String X_STRICT_FIELDS = "x-strictFields";
+    static final String X_ALL_UNIQUE_IMPORT_PATHS = "x-allUniqueImportPaths";
+    static final String X_USE_KATIP = "x-useKatip";
+    static final String X_ALLOW_NONUNIQUE_OPERATION_IDS = "x-allowNonUniqueOperationIds";
+
     protected ArrayList<Map<String, String>> unknownMimeTypes = new ArrayList<>();
     protected Map<String, Map<String, Object>> uniqueParamNameTypes = new HashMap<>();
     protected Map<String, Set<String>> modelMimeTypes = new HashMap<>();
@@ -742,8 +731,9 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
         op.vendorExtensions.put(VENDOR_EXTENSION_X_OPERATION_TYPE, operationType);
         typeNames.add(operationType);
 
-        op.vendorExtensions.put(X_HADDOCK_PATH, String.format(Locale.ROOT, "%s %s", op.httpMethod, op.path.replace("/", "\\/"))); // TODO: 5.0 Remove
+        String xHaddockPath = String.format(Locale.ROOT, "%s %s", op.httpMethod, op.path.replace("/", "\\/"));
-        op.vendorExtensions.put(VENDOR_EXTENSION_X_HADDOCK_PATH, String.format(Locale.ROOT, "%s %s", op.httpMethod, op.path.replace("/", "\\/")));
+        op.vendorExtensions.put(X_HADDOCK_PATH, xHaddockPath); // TODO: 5.0 Remove
+        op.vendorExtensions.put(VENDOR_EXTENSION_X_HADDOCK_PATH, xHaddockPath);
         op.vendorExtensions.put(X_HAS_BODY_OR_FORM_PARAM, op.getHasBodyParam() || op.getHasFormParams()); // TODO: 5.0 Remove
         op.vendorExtensions.put(VENDOR_EXTENSION_X_HAS_BODY_OR_FORM_PARAM, op.getHasBodyParam() || op.getHasFormParams());
 
@@ -937,6 +927,9 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
                 if (!op.vendorExtensions.containsKey(X_INLINE_ACCEPT)) {
                     SetNoContent(op, X_INLINE_ACCEPT);
                 }
+                if (!op.vendorExtensions.containsKey(VENDOR_EXTENSION_X_INLINE_ACCEPT)) {
+                    SetNoContent(op, VENDOR_EXTENSION_X_INLINE_ACCEPT);
+                }
             }
         }
         if (returnType.contains(" ")) {
@@ -948,7 +941,8 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
 
     private void processProducesConsumes(CodegenOperation op) {
         if (!(Boolean) op.vendorExtensions.get(X_HAS_BODY_OR_FORM_PARAM)) {
-            SetNoContent(op, X_INLINE_CONTENT_TYPE);
+            SetNoContent(op, X_INLINE_CONTENT_TYPE); // TODO: 5.0 Remove
+            SetNoContent(op, VENDOR_EXTENSION_X_INLINE_CONTENT_TYPE);
         }
         if (op.hasConsumes) {
             // deduplicate

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java

@@ -723,6 +723,9 @@ public class JavaClientCodegen extends AbstractJavaCodegen
         objs = super.postProcessModels(objs);
         List<Object> models = (List<Object>) objs.get("models");
 
+        // TODO: 5.0: Remove the camelCased vendorExtension below and ensure templates use the newer property naming.
+        once(LOGGER).warn("4.3.0 has deprecated the use of vendor extensions which don't follow lower-kebab casing standards with x- prefix.");
+
         if (additionalProperties.containsKey(SERIALIZATION_LIBRARY_JACKSON) && !JERSEY1.equals(getLibrary())) {
             List<Map<String, String>> imports = (List<Map<String, String>>) objs.get("imports");
             for (Object _mo : models) {
@@ -733,7 +736,8 @@ public class JavaClientCodegen extends AbstractJavaCodegen
                     boolean isOptionalNullable = Boolean.FALSE.equals(var.required) && Boolean.TRUE.equals(var.isNullable);
                     // only add JsonNullable and related imports to optional and nullable values
                     addImports |= isOptionalNullable;
-                    var.getVendorExtensions().put("isJacksonOptionalNullable", isOptionalNullable);
+                    var.getVendorExtensions().put("isJacksonOptionalNullable", isOptionalNullable); // TODO: 5.0 Remove
+                    var.getVendorExtensions().put("x-is-jackson-optional-nullable", isOptionalNullable);
                 }
                 if (addImports) {
                     Map<String, String> imports2Classnames = new HashMap<String, String>() {{
@@ -755,7 +759,8 @@ public class JavaClientCodegen extends AbstractJavaCodegen
         for (Object _mo : models) {
             Map<String, Object> mo = (Map<String, Object>) _mo;
             CodegenModel cm = (CodegenModel) mo.get("model");
-            cm.getVendorExtensions().putIfAbsent("implements", new ArrayList<String>());
+            cm.getVendorExtensions().putIfAbsent("implements", new ArrayList<String>());  // TODO: 5.0 Remove
+            cm.getVendorExtensions().putIfAbsent("x-implements", cm.getVendorExtensions().get("implements"));
             List<String> impl = (List<String>) cm.getVendorExtensions().get("implements");
             if (this.parcelableModel) {
                 impl.add("Parcelable");

modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/OneOfImplementorAdditionalData.java

@@ -3,12 +3,16 @@ package org.openapitools.codegen.utils;
 import org.openapitools.codegen.CodegenConfig;
 import org.openapitools.codegen.CodegenModel;
 import org.openapitools.codegen.CodegenProperty;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static org.openapitools.codegen.utils.OnceLogger.once;
+
 /**
  * This class holds data to add to `oneOf` members. Let's consider this example:
  *
@@ -44,6 +48,7 @@ public class OneOfImplementorAdditionalData {
     private List<String> additionalInterfaces = new ArrayList<String>();
     private List<CodegenProperty> additionalProps = new ArrayList<CodegenProperty>();
     private List<Map<String, String>> additionalImports = new ArrayList<Map<String, String>>();
+    private static final Logger LOGGER = LoggerFactory.getLogger(OneOfImplementorAdditionalData.class);
 
     public OneOfImplementorAdditionalData(String implementorName) {
         this.implementorName = implementorName;
@@ -97,7 +102,13 @@ public class OneOfImplementorAdditionalData {
      * @param addInterfaceImports whether or not to add the interface model as import (will vary by language)
      */
     public void addToImplementor(CodegenConfig cc, CodegenModel implcm, List<Map<String, String>> implImports, boolean addInterfaceImports) {
-        implcm.getVendorExtensions().putIfAbsent("implements", new ArrayList<String>());
+
+        // TODO: 5.0: Remove the camelCased vendorExtension below and ensure templates use the newer property naming.
+        once(LOGGER).warn("4.3.0 has deprecated the use of vendor extensions which don't follow lower-kebab casing standards with x- prefix.");
+
+
+        implcm.getVendorExtensions().putIfAbsent("implements", new ArrayList<String>()); // TODO: 5.0 Remove
+        implcm.getVendorExtensions().putIfAbsent("x-implements", implcm.getVendorExtensions().get("implements"));
 
         // Add implemented interfaces
         for (String intf : additionalInterfaces) {

modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojo.mustache

@@ -57,9 +57,9 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{#serializ
    * @return {{name}}
   **/
   @JsonbProperty("{{baseName}}")
-{{#vendorExtensions.extraAnnotation}}
+{{#vendorExtensions.x-extra-annotation}}
-  {{{vendorExtensions.extraAnnotation}}}
+  {{{vendorExtensions.x-extra-annotation}}}
-{{/vendorExtensions.extraAnnotation}}
+{{/vendorExtensions.x-extra-annotation}}
 {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  {{#isEnum}}{{^isListContainer}}{{^isMapContainer}}public {{dataType}} {{getter}}() {
     if ({{name}} == null) {
       return null;

modules/openapi-generator/src/main/resources/Java/oneof_interface.mustache

@@ -1,5 +1,5 @@
 {{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}{{>typeInfoAnnotation}}{{>xmlAnnotation}}
-public interface {{classname}} {{#vendorExtensions.implements}}{{#-first}}extends {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.implements}} {
+public interface {{classname}} {{#vendorExtensions.x-implements}}{{#-first}}extends {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-implements}} {
     {{#discriminator}}
     public {{propertyType}} {{propertyGetter}}();
     {{/discriminator}}

modules/openapi-generator/src/main/resources/Java/pojo.mustache

@@ -10,7 +10,7 @@
 })
 {{/jackson}}
 {{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>xmlAnnotation}}
-public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorExtensions.implements}}{{#-first}}implements {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{#-last}} {{/-last}}{{/vendorExtensions.implements}}{
+public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorExtensions.x-implements}}{{#-first}}implements {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{#-last}} {{/-last}}{{/vendorExtensions.x-implements}}{
 {{#serializableModel}}
   private static final long serialVersionUID = 1L;
 
@@ -56,22 +56,22 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE
   {{#gson}}
   @SerializedName(SERIALIZED_NAME_{{nameInSnakeCase}})
   {{/gson}}
-  {{#vendorExtensions.isJacksonOptionalNullable}}
+  {{#vendorExtensions.x-is-jackson-optional-nullable}}
   {{#isContainer}}
   private JsonNullable<{{{datatypeWithEnum}}}> {{name}} = JsonNullable.<{{{datatypeWithEnum}}}>undefined();
   {{/isContainer}}
   {{^isContainer}}
   private JsonNullable<{{{datatypeWithEnum}}}> {{name}} = JsonNullable.<{{{datatypeWithEnum}}}>{{#defaultValue}}of({{{.}}}){{/defaultValue}}{{^defaultValue}}undefined(){{/defaultValue}};
   {{/isContainer}}
-  {{/vendorExtensions.isJacksonOptionalNullable}}
+  {{/vendorExtensions.x-is-jackson-optional-nullable}}
-  {{^vendorExtensions.isJacksonOptionalNullable}}
+  {{^vendorExtensions.x-is-jackson-optional-nullable}}
   {{#isContainer}}
   private {{{datatypeWithEnum}}} {{name}}{{#required}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{/required}}{{^required}} = null{{/required}};
   {{/isContainer}}
   {{^isContainer}}
   private {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};
   {{/isContainer}}
-  {{/vendorExtensions.isJacksonOptionalNullable}}
+  {{/vendorExtensions.x-is-jackson-optional-nullable}}
 
   {{/vars}}
   {{#parcelableModel}}
@@ -99,14 +99,14 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE
 
   {{^isReadOnly}}
   public {{classname}} {{name}}({{{datatypeWithEnum}}} {{name}}) {
-    {{#vendorExtensions.isJacksonOptionalNullable}}this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{name}});{{/vendorExtensions.isJacksonOptionalNullable}}
+    {{#vendorExtensions.x-is-jackson-optional-nullable}}this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{name}});{{/vendorExtensions.x-is-jackson-optional-nullable}}
-    {{^vendorExtensions.isJacksonOptionalNullable}}this.{{name}} = {{name}};{{/vendorExtensions.isJacksonOptionalNullable}}
+    {{^vendorExtensions.x-is-jackson-optional-nullable}}this.{{name}} = {{name}};{{/vendorExtensions.x-is-jackson-optional-nullable}}
     return this;
   }
   {{#isListContainer}}
 
   public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) {
-    {{#vendorExtensions.isJacksonOptionalNullable}}
+    {{#vendorExtensions.x-is-jackson-optional-nullable}}
     if (this.{{name}} == null || !this.{{name}}.isPresent()) {
       this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}});
     }
@@ -116,8 +116,8 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE
       // this can never happen, as we make sure above that the value is present
     }
     return this;
-    {{/vendorExtensions.isJacksonOptionalNullable}}
+    {{/vendorExtensions.x-is-jackson-optional-nullable}}
-    {{^vendorExtensions.isJacksonOptionalNullable}}
+    {{^vendorExtensions.x-is-jackson-optional-nullable}}
     {{^required}}
     if (this.{{name}} == null) {
       this.{{name}} = {{{defaultValue}}};
@@ -125,13 +125,13 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE
     {{/required}}
     this.{{name}}.add({{name}}Item);
     return this;
-    {{/vendorExtensions.isJacksonOptionalNullable}}
+    {{/vendorExtensions.x-is-jackson-optional-nullable}}
   }
   {{/isListContainer}}
   {{#isMapContainer}}
 
   public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) {
-    {{#vendorExtensions.isJacksonOptionalNullable}}
+    {{#vendorExtensions.x-is-jackson-optional-nullable}}
     if (this.{{name}} == null || !this.{{name}}.isPresent()) {
       this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}});
     }
@@ -141,8 +141,8 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE
       // this can never happen, as we make sure above that the value is present
     }
     return this;
-    {{/vendorExtensions.isJacksonOptionalNullable}}
+    {{/vendorExtensions.x-is-jackson-optional-nullable}}
-    {{^vendorExtensions.isJacksonOptionalNullable}}
+    {{^vendorExtensions.x-is-jackson-optional-nullable}}
     {{^required}}
     if (this.{{name}} == null) {
       this.{{name}} = {{{defaultValue}}};
@@ -150,7 +150,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE
     {{/required}}
     this.{{name}}.put(key, {{name}}Item);
     return this;
-    {{/vendorExtensions.isJacksonOptionalNullable}}
+    {{/vendorExtensions.x-is-jackson-optional-nullable}}
   }
   {{/isMapContainer}}
 
@@ -179,49 +179,49 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE
   @javax.annotation.Nullable
 {{/required}}
 {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
-{{#vendorExtensions.extraAnnotation}}
+{{#vendorExtensions.x-extra-annotation}}
-  {{{vendorExtensions.extraAnnotation}}}
+  {{{vendorExtensions.x-extra-annotation}}}
-{{/vendorExtensions.extraAnnotation}}
+{{/vendorExtensions.x-extra-annotation}}
-{{#vendorExtensions.isJacksonOptionalNullable}}
+{{#vendorExtensions.x-is-jackson-optional-nullable}}
   {{!unannotated, Jackson would pick this up automatically and add it *in addition* to the _JsonNullable getter field}}
   @JsonIgnore
-{{/vendorExtensions.isJacksonOptionalNullable}}
+{{/vendorExtensions.x-is-jackson-optional-nullable}}
-{{^vendorExtensions.isJacksonOptionalNullable}}{{#jackson}}{{> jackson_annotations}}{{/jackson}}{{/vendorExtensions.isJacksonOptionalNullable}}
+{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#jackson}}{{> jackson_annotations}}{{/jackson}}{{/vendorExtensions.x-is-jackson-optional-nullable}}
   public {{{datatypeWithEnum}}} {{getter}}() {
-    {{#vendorExtensions.isJacksonOptionalNullable}}
+    {{#vendorExtensions.x-is-jackson-optional-nullable}}
     {{#isReadOnly}}{{! A readonly attribute doesn't have setter => jackson will set null directly if explicitly returned by API, so make sure we have an empty JsonNullable}}
     if ({{name}} == null) {
       {{name}} = JsonNullable.<{{{datatypeWithEnum}}}>{{#defaultValue}}of({{{.}}}){{/defaultValue}}{{^defaultValue}}undefined(){{/defaultValue}};
     }
     {{/isReadOnly}}
     return {{name}}.orElse(null);
-    {{/vendorExtensions.isJacksonOptionalNullable}}
+    {{/vendorExtensions.x-is-jackson-optional-nullable}}
-    {{^vendorExtensions.isJacksonOptionalNullable}}
+    {{^vendorExtensions.x-is-jackson-optional-nullable}}
     return {{name}};
-    {{/vendorExtensions.isJacksonOptionalNullable}}
+    {{/vendorExtensions.x-is-jackson-optional-nullable}}
   }
 
-  {{#vendorExtensions.isJacksonOptionalNullable}}
+  {{#vendorExtensions.x-is-jackson-optional-nullable}}
 {{> jackson_annotations}}
   public JsonNullable<{{{datatypeWithEnum}}}> {{getter}}_JsonNullable() {
     return {{name}};
   }
-  {{/vendorExtensions.isJacksonOptionalNullable}}{{#vendorExtensions.isJacksonOptionalNullable}}
+  {{/vendorExtensions.x-is-jackson-optional-nullable}}{{#vendorExtensions.x-is-jackson-optional-nullable}}
   @JsonProperty(JSON_PROPERTY_{{nameInSnakeCase}})
   {{#isReadOnly}}private{{/isReadOnly}}{{^isReadOnly}}public{{/isReadOnly}} void {{setter}}_JsonNullable(JsonNullable<{{{datatypeWithEnum}}}> {{name}}) {
     {{! For getters/setters that have name differing from attribute name, we must include setter (albeit private) for jackson to be able to set the attribute}}
     this.{{name}} = {{name}};
   }
-  {{/vendorExtensions.isJacksonOptionalNullable}}
+  {{/vendorExtensions.x-is-jackson-optional-nullable}}
 
   {{^isReadOnly}}
   public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {
-    {{#vendorExtensions.isJacksonOptionalNullable}}
+    {{#vendorExtensions.x-is-jackson-optional-nullable}}
     this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{name}});
-    {{/vendorExtensions.isJacksonOptionalNullable}}
+    {{/vendorExtensions.x-is-jackson-optional-nullable}}
-    {{^vendorExtensions.isJacksonOptionalNullable}}
+    {{^vendorExtensions.x-is-jackson-optional-nullable}}
     this.{{name}} = {{name}};
-    {{/vendorExtensions.isJacksonOptionalNullable}}
+    {{/vendorExtensions.x-is-jackson-optional-nullable}}
   }
   {{/isReadOnly}}
 

modules/openapi-generator/src/main/resources/Java/pojo_doc.mustache

@@ -18,14 +18,14 @@ Name | Value
 ---- | -----{{#allowableValues}}{{#enumVars}}
 {{name}} | {{value}}{{/enumVars}}{{/allowableValues}}
 {{/isEnum}}{{/vars}}
-{{#vendorExtensions.implements.0}}
+{{#vendorExtensions.x-implements.0}}
 
 ## Implemented Interfaces
 
-{{#vendorExtensions.implements}}
+{{#vendorExtensions.x-implements}}
 * {{{.}}}
-{{/vendorExtensions.implements}}
+{{/vendorExtensions.x-implements}}
-{{/vendorExtensions.implements.0}}
+{{/vendorExtensions.x-implements.0}}
 {{/vendorExtensions.x-is-one-of-interface}}
 {{#vendorExtensions.x-is-one-of-interface}}
 ## Implementing Classes

modules/openapi-generator/src/main/resources/JavaInflector/pojo.mustache

@@ -37,7 +37,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
     return this;
   }
 
-  {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
+  {{#vendorExtensions.x-extra-annotation}}{{{vendorExtensions.x-extra-annotation}}}{{/vendorExtensions.x-extra-annotation}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   @JsonProperty("{{baseName}}")
   public {{{datatypeWithEnum}}} {{getter}}() {

modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache

@@ -34,7 +34,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
     return this;
   }
 
-  {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
+  {{#vendorExtensions.x-extra-annotation}}{{{vendorExtensions.x-extra-annotation}}}{{/vendorExtensions.x-extra-annotation}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   @JsonProperty("{{baseName}}")
 {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {

modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pojo.mustache

@@ -67,9 +67,9 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{#serializ
   * @return {{name}}
   */
   @JsonProperty("{{baseName}}")
-{{#vendorExtensions.extraAnnotation}}
+{{#vendorExtensions.x-extra-annotation}}
-  {{{vendorExtensions.extraAnnotation}}}
+  {{{vendorExtensions.x-extra-annotation}}}
-{{/vendorExtensions.extraAnnotation}}
+{{/vendorExtensions.x-extra-annotation}}
 {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  {{#isEnum}}{{^isListContainer}}{{^isMapContainer}}public {{dataType}} {{getter}}() {
     return {{name}} == null ? null : {{name}}.value();
   }{{/isMapContainer}}{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isListContainer}}public {{{datatypeWithEnum}}} {{getter}}() {

modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache

@@ -52,9 +52,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
    * @return {{name}}
   **/
   @JsonProperty("{{baseName}}")
-{{#vendorExtensions.extraAnnotation}}
+{{#vendorExtensions.x-extra-annotation}}
-  {{{vendorExtensions.extraAnnotation}}}
+  {{{vendorExtensions.x-extra-annotation}}}
-{{/vendorExtensions.extraAnnotation}}
+{{/vendorExtensions.x-extra-annotation}}
 {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  {{#isEnum}}{{^isListContainer}}{{^isMapContainer}}public {{dataType}} {{getter}}() {
     if ({{name}} == null) {
       return null;

modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache

@@ -83,9 +83,9 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{/maximum}}
    * @return {{name}}
    **/
- {{#vendorExtensions.extraAnnotation}}
+ {{#vendorExtensions.x-extra-annotation}}
-  {{{vendorExtensions.extraAnnotation}}}
+  {{{vendorExtensions.x-extra-annotation}}}
-  {{/vendorExtensions.extraAnnotation}}
+  {{/vendorExtensions.x-extra-annotation}}
   {{#jackson}}
   @JsonProperty("{{baseName}}")
   {{/jackson}}

modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pojo.mustache

@@ -25,7 +25,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
    * maximum: {{maximum}}
    {{/maximum}}
    **/
-  {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
+  {{#vendorExtensions.x-extra-annotation}}{{{vendorExtensions.x-extra-annotation}}}{{/vendorExtensions.x-extra-annotation}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   @JsonProperty("{{baseName}}")
 {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {

modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pojo.mustache

@@ -24,7 +24,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
    * maximum: {{maximum}}
    {{/maximum}}
    **/
-  {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
+  {{#vendorExtensions.x-extra-annotation}}{{{vendorExtensions.x-extra-annotation}}}{{/vendorExtensions.x-extra-annotation}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   @JsonProperty("{{baseName}}")
 {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {

modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache

@@ -36,7 +36,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
     return this;
   }
 
-  {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}{{#useSwaggerAnnotations}}
+  {{#vendorExtensions.x-extra-annotation}}{{{vendorExtensions.x-extra-annotation}}}{{/vendorExtensions.x-extra-annotation}}{{#useSwaggerAnnotations}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}"){{/useSwaggerAnnotations}}
   @JsonProperty("{{baseName}}")
 {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {

modules/openapi-generator/src/main/resources/JavaPlayFramework/newApi.mustache

@@ -26,7 +26,7 @@ public class {{classname}}ControllerImp {{#useInterfaces}}implements {{classname
         return new FileInputStream("replace this");
         {{/isResponseFile}}
         {{^isResponseFile}}
-        {{#supportAsync}}   {{/supportAsync}}return new {{>returnTypesNoVoidNoAbstract}}({{#vendorExtensions.missingReturnInfoIfNeeded}}{{vendorExtensions.missingReturnInfoIfNeeded}}{{/vendorExtensions.missingReturnInfoIfNeeded}});
+        {{#supportAsync}}   {{/supportAsync}}return new {{>returnTypesNoVoidNoAbstract}}({{#vendorExtensions.x-missing-return-info-if-needed}}{{vendorExtensions.x-missing-return-info-if-needed}}{{/vendorExtensions.x-missing-return-info-if-needed}});
         {{/isResponseFile}}
         {{#supportAsync}}
         });

modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache

@@ -78,9 +78,9 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{/maximum}}
    * @return {{name}}
   **/
- {{#vendorExtensions.extraAnnotation}}
+ {{#vendorExtensions.x-extra-annotation}}
-  {{{vendorExtensions.extraAnnotation}}}
+  {{{vendorExtensions.x-extra-annotation}}}
-  {{/vendorExtensions.extraAnnotation}}
+  {{/vendorExtensions.x-extra-annotation}}
   {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
   }

modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache

@@ -80,9 +80,9 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{^parent}}
   {{/maximum}}
    * @return {{name}}
   */
- {{#vendorExtensions.extraAnnotation}}
+ {{#vendorExtensions.x-extra-annotation}}
-  {{{vendorExtensions.extraAnnotation}}}
+  {{{vendorExtensions.x-extra-annotation}}}
-  {{/vendorExtensions.extraAnnotation}}
+  {{/vendorExtensions.x-extra-annotation}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}{{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}")
 {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{>nullableDataType}} {{getter}}() {
     return {{name}};

modules/openapi-generator/src/main/resources/JavaVertXServer/pojo.mustache

@@ -18,7 +18,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   }
 
   {{#vars}}
-    {{#vendorExtensions.extraAnnotation}}{{vendorExtensions.extraAnnotation}}{{/vendorExtensions.extraAnnotation}}
+    {{#vendorExtensions.x-extra-annotation}}{{vendorExtensions.x-extra-annotation}}{{/vendorExtensions.x-extra-annotation}}
   @JsonProperty("{{baseName}}")
   public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};

modules/openapi-generator/src/main/resources/JavaVertXWebServer/pojo.mustache

@@ -18,7 +18,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   }
 
   {{#vars}}
-    {{#vendorExtensions.extraAnnotation}}{{vendorExtensions.extraAnnotation}}{{/vendorExtensions.extraAnnotation}}
+    {{#vendorExtensions.x-extra-annotation}}{{vendorExtensions.x-extra-annotation}}{{/vendorExtensions.x-extra-annotation}}
   @JsonProperty("{{baseName}}")
   public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};

modules/openapi-generator/src/main/resources/Javascript/api.mustache

@@ -52,7 +52,7 @@
      * data is of type: {@link <&vendorExtensions.x-jsdoc-type>}</returnType></usePromises><#usePromises>
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}<#returnType>, with an object containing data of type {@link <&vendorExtensions.x-jsdoc-type>} and HTTP response</returnType><^returnType>, with an object containing HTTP response</returnType></usePromises>
      */
-</emitJSDoc>    this.<operationId><#usePromises>WithHttpInfo</usePromises> = function(<vendorExtensions.x-codegen-argList>) {<#hasOptionalParams>
+</emitJSDoc>    this.<operationId><#usePromises>WithHttpInfo</usePromises> = function(<vendorExtensions.x-codegen-arg-list>) {<#hasOptionalParams>
       opts = opts || {};</hasOptionalParams>
       var postBody = <#bodyParam><#required><paramName></required><^required>opts['<paramName>']</required></bodyParam><^bodyParam>null</bodyParam>;
 <#allParams>
@@ -117,8 +117,8 @@
      * data is of type: {@link <&vendorExtensions.x-jsdoc-type>}</returnType></usePromises><#usePromises>
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}<#returnType>, with data of type {@link <&vendorExtensions.x-jsdoc-type>}</returnType></usePromises>
      */
-</emitJSDoc>    this.<operationId> = function(<vendorExtensions.x-codegen-argList>) {
+</emitJSDoc>    this.<operationId> = function(<vendorExtensions.x-codegen-arg-list>) {
-      return this.<operationId>WithHttpInfo(<vendorExtensions.x-codegen-argList>)
+      return this.<operationId>WithHttpInfo(<vendorExtensions.x-codegen-arg-list>)
         .then(function(response_and_data) {
           return response_and_data.data;
         });

modules/openapi-generator/src/main/resources/Javascript/es6/api.mustache

@@ -43,10 +43,10 @@ export default class <&classname> {
      * data is of type: {@link <&vendorExtensions.x-jsdoc-type>}</returnType></usePromises><#usePromises>
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}<#returnType>, with an object containing data of type {@link <&vendorExtensions.x-jsdoc-type>} and HTTP response</returnType><^returnType>, with an object containing HTTP response</returnType></usePromises>
      */
-</emitJSDoc>    <operationId><#usePromises>WithHttpInfo</usePromises>(<vendorExtensions.x-codegen-argList>) {
+</emitJSDoc>    <operationId><#usePromises>WithHttpInfo</usePromises>(<vendorExtensions.x-codegen-arg-list>) {
-      <#vendorExtensions.x-codegen-hasOptionalParams>
+      <#vendorExtensions.x-codegen-has-optional-params>
       opts = opts || {};
-      </vendorExtensions.x-codegen-hasOptionalParams>
+      </vendorExtensions.x-codegen-has-optional-params>
       let postBody = <#bodyParam><#required><paramName></required><^required>opts['<paramName>']</required></bodyParam><^bodyParam>null</bodyParam>;
 <#allParams>
 <#required>
@@ -105,8 +105,8 @@ export default class <&classname> {
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}<#returnType>, with data of type {@link <&vendorExtensions.x-jsdoc-type>}</returnType></usePromises>
      */
 </emitJSDoc>
-    <operationId>(<vendorExtensions.x-codegen-argList>) {
+    <operationId>(<vendorExtensions.x-codegen-arg-list>) {
-      return this.<operationId>WithHttpInfo(<vendorExtensions.x-codegen-argList>)
+      return this.<operationId>WithHttpInfo(<vendorExtensions.x-codegen-arg-list>)
         .then(function(response_and_data) {
           return response_and_data.data;
         });

modules/openapi-generator/src/main/resources/Javascript/es6/partial_model_generic.mustache

@@ -4,18 +4,18 @@
  * @module {{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}{{#modelPackage}}{{modelPackage}}/{{/modelPackage}}{{classname}}
  * @version {{projectVersion}}
  */{{/emitJSDoc}}
-class {{classname}} {{#parent}}{{^parentModel}}{{#vendorExtensions.x-isArray}}extends Array {{/vendorExtensions.x-isArray}}{{/parentModel}}{{/parent}}{
+class {{classname}} {{#parent}}{{^parentModel}}{{#vendorExtensions.x-is-array}}extends Array {{/vendorExtensions.x-is-array}}{{/parentModel}}{{/parent}}{
     {{#emitJSDoc}}/**
      * Constructs a new <code>{{classname}}</code>.{{#description}}
      * {{description}}{{/description}}
      * @alias module:{{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}{{#modelPackage}}{{modelPackage}}/{{/modelPackage}}{{classname}}{{#useInheritance}}{{#parent}}
-     * @extends {{#parentModel}}module:{{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}{{#modelPackage}}{{modelPackage}}/{{/modelPackage}}{{classname}}{{/parentModel}}{{^parentModel}}{{#vendorExtensions.x-isArray}}Array{{/vendorExtensions.x-isArray}}{{#vendorExtensions.x-isMap}}Object{{/vendorExtensions.x-isMap}}{{/parentModel}}{{/parent}}{{#interfaces}}
+     * @extends {{#parentModel}}module:{{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}{{#modelPackage}}{{modelPackage}}/{{/modelPackage}}{{classname}}{{/parentModel}}{{^parentModel}}{{#vendorExtensions.x-is-array}}Array{{/vendorExtensions.x-is-array}}{{#vendorExtensions.x-is-map}}Object{{/vendorExtensions.x-is-map}}{{/parentModel}}{{/parent}}{{#interfaces}}
      * @implements module:{{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}{{#modelPackage}}{{modelPackage}}/{{/modelPackage}}{{.}}{{/interfaces}}{{/useInheritance}}{{#vendorExtensions.x-all-required}}
      * @param {{name}} {{=< >=}}{<&vendorExtensions.x-jsdoc-type>}<={{ }}=> {{#description}}{{{description}}}{{/description}}{{/vendorExtensions.x-all-required}}
      */{{/emitJSDoc}}
-    constructor({{#vendorExtensions.x-all-required}}{{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-all-required}}) { {{#parent}}{{^parentModel}}{{#vendorExtensions.x-isArray}}
+    constructor({{#vendorExtensions.x-all-required}}{{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-all-required}}) { {{#parent}}{{^parentModel}}{{#vendorExtensions.x-is-array}}
         super();
-        {{/vendorExtensions.x-isArray}}{{/parentModel}}{{/parent}}{{#useInheritance}}
+        {{/vendorExtensions.x-is-array}}{{/parentModel}}{{/parent}}{{#useInheritance}}
         {{#interfaceModels}}{{classname}}.initialize(this{{#vendorExtensions.x-all-required}}, {{name}}{{/vendorExtensions.x-all-required}});{{/interfaceModels}}{{/useInheritance}}
         {{classname}}.initialize(this{{#vendorExtensions.x-all-required}}, {{name}}{{/vendorExtensions.x-all-required}});
     }
@@ -40,7 +40,7 @@ class {{classname}} {{#parent}}{{^parentModel}}{{#vendorExtensions.x-isArray}}ex
         if (data){{! TODO: support polymorphism: discriminator property on data determines class to instantiate.}} {
             obj = obj || new {{classname}}();{{#parent}}{{^parentModel}}
 
-            ApiClient.constructFromObject(data, obj, '{{vendorExtensions.x-itemType}}');
+            ApiClient.constructFromObject(data, obj, '{{vendorExtensions.x-item-type}}');
             {{/parentModel}}{{/parent}}{{#useInheritance}}{{#parentModel}}
             {{classname}}.constructFromObject(data, obj);{{/parentModel}}{{#interfaces}}
             {{.}}.constructFromObject(data, obj);{{/interfaces}}{{/useInheritance}}

modules/openapi-generator/src/main/resources/Javascript/partial_model_generic.mustache

@@ -11,16 +11,16 @@
    * {{description}}{{/description}}
    * @alias module:{{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}{{#modelPackage}}{{modelPackage}}/{{/modelPackage}}{{classname}}
    * @class{{#useInheritance}}{{#parent}}
-   * @extends {{#parentModel}}module:{{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}{{#modelPackage}}{{modelPackage}}/{{/modelPackage}}{{classname}}{{/parentModel}}{{^parentModel}}{{#vendorExtensions.x-isArray}}Array{{/vendorExtensions.x-isArray}}{{#vendorExtensions.x-isMap}}Object{{/vendorExtensions.x-isMap}}{{/parentModel}}{{/parent}}{{#interfaces}}
+   * @extends {{#parentModel}}module:{{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}{{#modelPackage}}{{modelPackage}}/{{/modelPackage}}{{classname}}{{/parentModel}}{{^parentModel}}{{#vendorExtensions.x-is-array}}Array{{/vendorExtensions.x-is-array}}{{#vendorExtensions.x-is-map}}Object{{/vendorExtensions.x-is-map}}{{/parentModel}}{{/parent}}{{#interfaces}}
    * @implements module:{{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}{{#modelPackage}}{{modelPackage}}/{{/modelPackage}}{{.}}{{/interfaces}}{{/useInheritance}}{{#vendorExtensions.x-all-required}}
    * @param {{name}} {{=< >=}}{<&vendorExtensions.x-jsdoc-type>}<={{ }}=> {{#description}}{{{description}}}{{/description}}{{/vendorExtensions.x-all-required}}
    */
 {{/emitJSDoc}}
   var exports = function({{#vendorExtensions.x-all-required}}{{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-all-required}}) {
     var _this = this;
-{{#parent}}{{^parentModel}}{{#vendorExtensions.x-isArray}}    _this = new Array();
+{{#parent}}{{^parentModel}}{{#vendorExtensions.x-is-array}}    _this = new Array();
     Object.setPrototypeOf(_this, exports);
-{{/vendorExtensions.x-isArray}}{{/parentModel}}{{/parent}}
+{{/vendorExtensions.x-is-array}}{{/parentModel}}{{/parent}}
     {{#useInheritance}}
     {{#parentModel}}
     {{classname}}.call(_this{{#vendorExtensions.x-all-required}}, {{name}}{{/vendorExtensions.x-all-required}});
@@ -52,18 +52,18 @@
    * @return {{=< >=}}{module:<#invokerPackage><invokerPackage>/</invokerPackage><#modelPackage><modelPackage>/</modelPackage><classname>}<={{ }}=> The populated <code>{{classname}}</code> instance.
    */
 {{/emitJSDoc}}
-{{#vendorExtensions.x-isPrimitive}}
+{{#vendorExtensions.x-is-primitive}}
   exports.constructFromObject = function(data, obj) {
     return data;
   }
-{{/vendorExtensions.x-isPrimitive}}
+{{/vendorExtensions.x-is-primitive}}
-{{^vendorExtensions.x-isPrimitive}}
+{{^vendorExtensions.x-is-primitive}}
   exports.constructFromObject = function(data, obj) {
     if (data){{! TODO: support polymorphism: discriminator property on data determines class to instantiate.}} {
       obj = obj || new exports();
       {{#parent}}
       {{^parentModel}}
-      ApiClient.constructFromObject(data, obj, '{{vendorExtensions.x-itemType}}');
+      ApiClient.constructFromObject(data, obj, '{{vendorExtensions.x-item-type}}');
       {{/parentModel}}
       {{/parent}}
       {{#useInheritance}}
@@ -84,7 +84,7 @@
     }
     return obj;
   }
-{{/vendorExtensions.x-isPrimitive}}
+{{/vendorExtensions.x-is-primitive}}
 {{#useInheritance}}{{#parentModel}}
   exports.prototype = Object.create({{classname}}.prototype);
   exports.prototype.constructor = exports;

modules/openapi-generator/src/main/resources/apache2/apache-config.mustache

@@ -21,7 +21,7 @@
 		Require valid-user
 	</Limit>
 {{/hasAuthMethods}}
-{{#vendorExtensions.x-codegen-otherMethods}}
+{{#vendorExtensions.x-codegen-other-methods}}
 {{#hasAuthMethods}}
 {{#authMethods}}
 	{{#isOAuth}}
@@ -38,7 +38,7 @@
 		Require valid-user
 	</Limit>
 {{/hasAuthMethods}}
-{{/vendorExtensions.x-codegen-otherMethods}}
+{{/vendorExtensions.x-codegen-other-methods}}
 </Location>
 {{/operation}}
 {{/operations}}

modules/openapi-generator/src/main/resources/apache2/authConf.mustache

@@ -1,5 +1,5 @@
 AuthBasicProvider file
-	AuthUserFile "{{vendorExtensions.x-codegen-userInfoPath}}htpwd"
+	AuthUserFile "{{vendorExtensions.x-codegen-user-info-path}}htpwd"
-	AuthGroupFile "{{vendorExtensions.x-codegen-userInfoPath}}groups"
+	AuthGroupFile "{{vendorExtensions.x-codegen-user-info-path}}groups"
 	AuthType basic
 	AuthName "api"

modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache

@@ -103,14 +103,14 @@ namespace {{modelPackage}}
             return {{#vars}}{{^isContainer}}
                 (
                     {{name}} == other.{{name}} ||
-                    {{^vendorExtensions.isValueType}}{{name}} != null &&{{/vendorExtensions.isValueType}}
+                    {{^vendorExtensions.x-is-value-type}}{{name}} != null &&{{/vendorExtensions.x-is-value-type}}
                     {{name}}.Equals(other.{{name}})
                 ){{#hasMore}} && {{/hasMore}}{{/isContainer}}{{#isContainer}}
                 (
                     {{name}} == other.{{name}} ||
-                    {{^vendorExtensions.isValueType}}{{name}} != null &&
+                    {{^vendorExtensions.x-is-value-type}}{{name}} != null &&
                     other.{{name}} != null &&
-                    {{/vendorExtensions.isValueType}}{{name}}.SequenceEqual(other.{{name}})
+                    {{/vendorExtensions.x-is-value-type}}{{name}}.SequenceEqual(other.{{name}})
                 ){{#hasMore}} && {{/hasMore}}{{/isContainer}}{{/vars}}{{^vars}}false{{/vars}};
         }
 
@@ -125,7 +125,7 @@ namespace {{modelPackage}}
                 var hashCode = 41;
                 // Suitable nullity checks etc, of course :)
                 {{#vars}}
-                    {{^vendorExtensions.isValueType}}if ({{name}} != null){{/vendorExtensions.isValueType}}
+                    {{^vendorExtensions.x-is-value-type}}if ({{name}} != null){{/vendorExtensions.x-is-value-type}}
                     hashCode = hashCode * 59 + {{name}}.GetHashCode();
                 {{/vars}}
                 return hashCode;

modules/openapi-generator/src/main/resources/clojure/spec.mustache

@@ -1,9 +1,9 @@
 {{=< >=}}(ns <package>.<classname>
   (:require [clojure.spec.alpha :as s]
             [spec-tools.data-spec :as ds]
-            <#models><#model><#vars><^isContainer><^vendorExtensions.x-baseSpec>[<package>.<complexType> :refer :all]
+            <#models><#model><#vars><^isContainer><^vendorExtensions.x-base-spec>[<package>.<complexType> :refer :all]
-            </vendorExtensions.x-baseSpec></isContainer><#isContainer><^vendorExtensions.x-baseSpec>[<package>.<complexType> :refer :all]
+            </vendorExtensions.x-base-spec></isContainer><#isContainer><^vendorExtensions.x-base-spec>[<package>.<complexType> :refer :all]
-            </vendorExtensions.x-baseSpec></isContainer></vars></model></models>)
+            </vendorExtensions.x-base-spec></isContainer></vars></model></models>)
   (:import (java.io File)))
 
 <#models><#model>

modules/openapi-generator/src/main/resources/cpp-pistache-server/api-header.mustache

@@ -50,15 +50,15 @@ private:
     /// <remarks>
     /// {{notes}}
     /// </remarks>
-    {{#vendorExtensions.x-codegen-pistache-isParsingSupported}}
+    {{#vendorExtensions.x-codegen-pistache-is-parsing-supported}}
     {{#allParams}}
     /// <param name="{{paramName}}">{{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}</param>
     {{/allParams}}
     virtual void {{operationIdSnakeCase}}({{#allParams}}const {{{dataType}}} &{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#hasParams}}, {{/hasParams}}Pistache::Http::ResponseWriter &response) = 0;
-    {{/vendorExtensions.x-codegen-pistache-isParsingSupported}}
+    {{/vendorExtensions.x-codegen-pistache-is-parsing-supported}}
-    {{^vendorExtensions.x-codegen-pistache-isParsingSupported}}
+    {{^vendorExtensions.x-codegen-pistache-is-parsing-supported}}
     virtual void {{operationIdSnakeCase}}(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter &response) = 0;
-    {{/vendorExtensions.x-codegen-pistache-isParsingSupported}}
+    {{/vendorExtensions.x-codegen-pistache-is-parsing-supported}}
     {{/operation}}
 
 };

modules/openapi-generator/src/main/resources/cpp-pistache-server/api-impl-header.mustache

@@ -35,12 +35,12 @@ public:
     ~{{classname}}Impl() {}
 
     {{#operation}}
-    {{#vendorExtensions.x-codegen-pistache-isParsingSupported}}
+    {{#vendorExtensions.x-codegen-pistache-is-parsing-supported}}
     void {{operationIdSnakeCase}}({{#allParams}}const {{{dataType}}} &{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#hasParams}}, {{/hasParams}}Pistache::Http::ResponseWriter &response);
-    {{/vendorExtensions.x-codegen-pistache-isParsingSupported}}
+    {{/vendorExtensions.x-codegen-pistache-is-parsing-supported}}
-    {{^vendorExtensions.x-codegen-pistache-isParsingSupported}}
+    {{^vendorExtensions.x-codegen-pistache-is-parsing-supported}}
     void {{operationIdSnakeCase}}(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter &response);
-    {{/vendorExtensions.x-codegen-pistache-isParsingSupported}}
+    {{/vendorExtensions.x-codegen-pistache-is-parsing-supported}}
     {{/operation}}
 
 };

modules/openapi-generator/src/main/resources/cpp-pistache-server/api-impl-source.mustache

@@ -15,16 +15,16 @@ using namespace {{modelNamespace}};{{/hasModelImport}}
     { }
 
 {{#operation}}
-{{#vendorExtensions.x-codegen-pistache-isParsingSupported}}
+{{#vendorExtensions.x-codegen-pistache-is-parsing-supported}}
 void {{classname}}Impl::{{operationIdSnakeCase}}({{#allParams}}const {{{dataType}}} &{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#hasParams}}, {{/hasParams}}Pistache::Http::ResponseWriter &response) {
     response.send(Pistache::Http::Code::Ok, "Do some magic\n");
 }
-{{/vendorExtensions.x-codegen-pistache-isParsingSupported}}
+{{/vendorExtensions.x-codegen-pistache-is-parsing-supported}}
-{{^vendorExtensions.x-codegen-pistache-isParsingSupported}}
+{{^vendorExtensions.x-codegen-pistache-is-parsing-supported}}
 void {{classname}}Impl::{{operationIdSnakeCase}}(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter &response){
     response.send(Pistache::Http::Code::Ok, "Do some magic\n");
 }
-{{/vendorExtensions.x-codegen-pistache-isParsingSupported}}
+{{/vendorExtensions.x-codegen-pistache-is-parsing-supported}}
 {{/operation}}
 
 {{#apiNamespaceDeclarations}}

modules/openapi-generator/src/main/resources/cpp-pistache-server/api-source.mustache

@@ -33,7 +33,7 @@ void {{classname}}::setupRoutes() {
 
 {{#operation}}
 void {{classname}}::{{operationIdSnakeCase}}_handler(const Pistache::Rest::Request &{{#hasParams}}request{{/hasParams}}, Pistache::Http::ResponseWriter response) {
-    {{#vendorExtensions.x-codegen-pistache-isParsingSupported}}
+    {{#vendorExtensions.x-codegen-pistache-is-parsing-supported}}
     {{#hasPathParams}}
     // Getting the path params
     {{#pathParams}}
@@ -79,11 +79,11 @@ void {{classname}}::{{operationIdSnakeCase}}_handler(const Pistache::Rest::Reque
     {{/bodyParam}}
     {{/hasBodyParam}}
       this->{{operationIdSnakeCase}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#hasParams}}, {{/hasParams}}response);
-    {{/vendorExtensions.x-codegen-pistache-isParsingSupported}}
+    {{/vendorExtensions.x-codegen-pistache-is-parsing-supported}}
-    {{^vendorExtensions.x-codegen-pistache-isParsingSupported}}
+    {{^vendorExtensions.x-codegen-pistache-is-parsing-supported}}
     try {
       this->{{operationIdSnakeCase}}(request, response);
-    {{/vendorExtensions.x-codegen-pistache-isParsingSupported}}
+    {{/vendorExtensions.x-codegen-pistache-is-parsing-supported}}
     } catch (nlohmann::detail::exception &e) {
         //send a 400 error
         response.send(Pistache::Http::Code::Bad_Request, e.what());

modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache

@@ -116,10 +116,10 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}}
 {{#operations}}{{#operation}}void {{classname}}Request::{{nickname}}Response({{#returnType}}const {{{returnType}}}& res{{/returnType}}){
     writeResponseHeaders();{{#returnType}}{{#isMapContainer}}
     QJsonDocument resDoc(::{{cppNamespace}}::toJsonValue(res).toObject());
-    socket->writeJson(resDoc);{{/isMapContainer}}{{^isMapContainer}}{{^returnTypeIsPrimitive}}{{^vendorExtensions.returnsEnum}}
+    socket->writeJson(resDoc);{{/isMapContainer}}{{^isMapContainer}}{{^returnTypeIsPrimitive}}{{^vendorExtensions.x-returns-enum}}
     QJsonDocument resDoc(::{{cppNamespace}}::toJsonValue(res).to{{^isListContainer}}Object{{/isListContainer}}{{#isListContainer}}Array{{/isListContainer}}());
-    socket->writeJson(resDoc);{{/vendorExtensions.returnsEnum}}{{#vendorExtensions.returnsEnum}}
+    socket->writeJson(resDoc);{{/vendorExtensions.x-returns-enum}}{{#vendorExtensions.x-returns-enum}}
-    socket->write(::{{cppNamespace}}::toStringValue(res).toUtf8());{{/vendorExtensions.returnsEnum}}{{/returnTypeIsPrimitive}}{{#returnTypeIsPrimitive}}
+    socket->write(::{{cppNamespace}}::toStringValue(res).toUtf8());{{/vendorExtensions.x-returns-enum}}{{/returnTypeIsPrimitive}}{{#returnTypeIsPrimitive}}
     socket->write({{#isListContainer}}QString("["+{{/isListContainer}}::{{cppNamespace}}::toStringValue(res){{#isListContainer}}+"]"){{/isListContainer}}.toUtf8());{{/returnTypeIsPrimitive}}{{/isMapContainer}}{{/returnType}}{{^returnType}}
     socket->setStatusCode(QHttpEngine::Socket::OK);{{/returnType}}
     if(socket->isOpen()){
@@ -133,10 +133,10 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}}
     writeResponseHeaders();{{#returnType}}
     Q_UNUSED(error_str);  // response will be used instead of error string{{#isMapContainer}}
     QJsonDocument resDoc(::{{cppNamespace}}::toJsonValue(res).toObject());
-    socket->writeJson(resDoc);{{/isMapContainer}}{{^isMapContainer}}{{^returnTypeIsPrimitive}}{{^vendorExtensions.returnsEnum}}
+    socket->writeJson(resDoc);{{/isMapContainer}}{{^isMapContainer}}{{^returnTypeIsPrimitive}}{{^vendorExtensions.x-returns-enum}}
     QJsonDocument resDoc(::{{cppNamespace}}::toJsonValue(res).to{{^isListContainer}}Object{{/isListContainer}}{{#isListContainer}}Array{{/isListContainer}}());
-    socket->writeJson(resDoc);{{/vendorExtensions.returnsEnum}}{{#vendorExtensions.returnsEnum}}
+    socket->writeJson(resDoc);{{/vendorExtensions.x-returns-enum}}{{#vendorExtensions.x-returns-enum}}
-    socket->write(::{{cppNamespace}}::toStringValue(res).toUtf8());{{/vendorExtensions.returnsEnum}}{{/returnTypeIsPrimitive}}{{#returnTypeIsPrimitive}}
+    socket->write(::{{cppNamespace}}::toStringValue(res).toUtf8());{{/vendorExtensions.x-returns-enum}}{{/returnTypeIsPrimitive}}{{#returnTypeIsPrimitive}}
     socket->write({{#isListContainer}}QString("["+{{/isListContainer}}::{{cppNamespace}}::toStringValue(res){{#isListContainer}}+"]"){{/isListContainer}}.toUtf8());{{/returnTypeIsPrimitive}}{{/isMapContainer}}{{/returnType}}{{^returnType}}
     socket->setStatusCode(QHttpEngine::Socket::NotFound);
     socket->write(error_str.toUtf8());{{/returnType}}

modules/openapi-generator/src/main/resources/cpp-restbed-server/api-header.mustache

@@ -42,15 +42,15 @@ public:
 /// <remarks>
 /// {{notes}}
 /// </remarks>
-class {{declspec}} {{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource: public restbed::Resource
+class {{declspec}} {{classname}}{{vendorExtensions.x-codegen-resource-name}}Resource: public restbed::Resource
 {
 public:
-	{{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource();
+	{{classname}}{{vendorExtensions.x-codegen-resource-name}}Resource();
-    virtual ~{{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource();
+    virtual ~{{classname}}{{vendorExtensions.x-codegen-resource-name}}Resource();
     void {{httpMethod}}_method_handler(const std::shared_ptr<restbed::Session> session);
-    {{#vendorExtensions.x-codegen-otherMethods}}
+    {{#vendorExtensions.x-codegen-other-methods}}
     void {{httpMethod}}_method_handler(const std::shared_ptr<restbed::Session> session);
-    {{/vendorExtensions.x-codegen-otherMethods}}
+    {{/vendorExtensions.x-codegen-other-methods}}
 
 	void set_handler_{{httpMethod}}(
 		std::function<std::pair<int, std::string>(
@@ -58,24 +58,24 @@ public:
 		)> handler
 	);
 
-	{{#vendorExtensions.x-codegen-otherMethods}}
+	{{#vendorExtensions.x-codegen-other-methods}}
 	void set_handler_{{httpMethod}}(
 		std::function<std::pair<int, std::string>(
 			{{#allParams}}{{{dataType}}} const &{{#hasMore}}, {{/hasMore}}{{/allParams}}
 		)> handler
 	);
-	{{/vendorExtensions.x-codegen-otherMethods}}
+	{{/vendorExtensions.x-codegen-other-methods}}
 
 private:
 	std::function<std::pair<int, std::string>(
 		{{#allParams}}{{{dataType}}} const &{{#hasMore}}, {{/hasMore}}{{/allParams}}
 	)> handler_{{httpMethod}}_;
 
-	{{#vendorExtensions.x-codegen-otherMethods}}
+	{{#vendorExtensions.x-codegen-other-methods}}
 	std::function<std::pair<int, std::string>(
 		{{#allParams}}{{{dataType}}} const &{{#hasMore}}, {{/hasMore}}{{/allParams}}
 	)> handler_{{httpMethod}}_;
-	{{/vendorExtensions.x-codegen-otherMethods}}
+	{{/vendorExtensions.x-codegen-other-methods}}
 
 	{{#allParams}}
 	{{{dataType}}} {{paramName}}{};

modules/openapi-generator/src/main/resources/cpp-restbed-server/api-source.mustache

@@ -16,8 +16,8 @@ using namespace {{modelNamespace}};
 
 {{classname}}::{{classname}}() {
 	{{#operation}}
-	std::shared_ptr<{{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource> sp{{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource = std::make_shared<{{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource>();
+	std::shared_ptr<{{classname}}{{vendorExtensions.x-codegen-resource-name}}Resource> sp{{classname}}{{vendorExtensions.x-codegen-resource-name}}Resource = std::make_shared<{{classname}}{{vendorExtensions.x-codegen-resource-name}}Resource>();
-	this->publish(sp{{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource);
+	this->publish(sp{{classname}}{{vendorExtensions.x-codegen-resource-name}}Resource);
 
 	{{/operation}}
 }
@@ -37,40 +37,40 @@ void {{classname}}::stopService() {
 }
 
 {{#operation}}
-{{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource::{{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource()
+{{classname}}{{vendorExtensions.x-codegen-resource-name}}Resource::{{classname}}{{vendorExtensions.x-codegen-resource-name}}Resource()
 {
 	this->set_path("{{path}}");
 	this->set_method_handler("{{httpMethod}}",
-		std::bind(&{{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource::{{httpMethod}}_method_handler, this,
+		std::bind(&{{classname}}{{vendorExtensions.x-codegen-resource-name}}Resource::{{httpMethod}}_method_handler, this,
 			std::placeholders::_1));
-	{{#vendorExtensions.x-codegen-otherMethods}}
+	{{#vendorExtensions.x-codegen-other-methods}}
 	this->set_method_handler("{{httpMethod}}",
-		std::bind(&{{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource::{{httpMethod}}_method_handler, this,
+		std::bind(&{{classname}}{{vendorExtensions.x-codegen-resource-name}}Resource::{{httpMethod}}_method_handler, this,
 			std::placeholders::_1));
-	{{/vendorExtensions.x-codegen-otherMethods}}
+	{{/vendorExtensions.x-codegen-other-methods}}
 }
 
-{{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource::~{{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource()
+{{classname}}{{vendorExtensions.x-codegen-resource-name}}Resource::~{{classname}}{{vendorExtensions.x-codegen-resource-name}}Resource()
 {
 }
 
-void {{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource::set_handler_{{httpMethod}}(
+void {{classname}}{{vendorExtensions.x-codegen-resource-name}}Resource::set_handler_{{httpMethod}}(
 	std::function<std::pair<int, std::string>(
 		{{#allParams}}{{{dataType}}} const &{{#hasMore}}, {{/hasMore}}{{/allParams}}
 	)> handler) {
 	handler_{{httpMethod}}_ = std::move(handler);
 }
 
-{{#vendorExtensions.x-codegen-otherMethods}}
+{{#vendorExtensions.x-codegen-other-methods}}
-void {{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource::set_handler_{{httpMethod}}(
+void {{classname}}{{vendorExtensions.x-codegen-resource-name}}Resource::set_handler_{{httpMethod}}(
 	std::function<std::pair<int, std::string>(
 		{{#allParams}}{{{dataType}}} const &{{#hasMore}}, {{/hasMore}}{{/allParams}}
 	)> handler) {
 	handler_{{httpMethod}}_ = std::move(handler);
 }
-{{/vendorExtensions.x-codegen-otherMethods}}
+{{/vendorExtensions.x-codegen-other-methods}}
 
-void {{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource::{{httpMethod}}_method_handler(const std::shared_ptr<restbed::Session> session) {
+void {{classname}}{{vendorExtensions.x-codegen-resource-name}}Resource::{{httpMethod}}_method_handler(const std::shared_ptr<restbed::Session> session) {
 
 	const auto request = session->get_request();
 	{{#hasBodyParam}}
@@ -141,8 +141,8 @@ void {{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource::{{httpMet
 	{{/hasBodyParam}}
 }
 
-{{#vendorExtensions.x-codegen-otherMethods}}
+{{#vendorExtensions.x-codegen-other-methods}}
-void {{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource::{{httpMethod}}_method_handler(const std::shared_ptr<restbed::Session> session) {
+void {{classname}}{{vendorExtensions.x-codegen-resource-name}}Resource::{{httpMethod}}_method_handler(const std::shared_ptr<restbed::Session> session) {
 
 	const auto request = session->get_request();
 	{{#hasBodyParam}}
@@ -212,7 +212,7 @@ void {{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource::{{httpMet
 		});
 	{{/hasBodyParam}}
 }
-{{/vendorExtensions.x-codegen-otherMethods}}  
+{{/vendorExtensions.x-codegen-other-methods}}  
 
 
 {{/operation}}

modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache

@@ -167,19 +167,19 @@
             return {{#vars}}{{#parent}}base.Equals(input) && {{/parent}}{{^isContainer}}
                 (
                     this.{{name}} == input.{{name}} ||
-                    {{^vendorExtensions.isValueType}}
+                    {{^vendorExtensions.x-is-value-type}}
                     (this.{{name}} != null &&
                     this.{{name}}.Equals(input.{{name}}))
-                    {{/vendorExtensions.isValueType}}
+                    {{/vendorExtensions.x-is-value-type}}
-                    {{#vendorExtensions.isValueType}}
+                    {{#vendorExtensions.x-is-value-type}}
                     this.{{name}}.Equals(input.{{name}})
-                    {{/vendorExtensions.isValueType}}
+                    {{/vendorExtensions.x-is-value-type}}
                 ){{#hasMore}} && {{/hasMore}}{{/isContainer}}{{#isContainer}}
                 (
                     this.{{name}} == input.{{name}} ||
-                    {{^vendorExtensions.isValueType}}this.{{name}} != null &&
+                    {{^vendorExtensions.x-is-value-type}}this.{{name}} != null &&
                     input.{{name}} != null &&
-                    {{/vendorExtensions.isValueType}}this.{{name}}.SequenceEqual(input.{{name}})
+                    {{/vendorExtensions.x-is-value-type}}this.{{name}}.SequenceEqual(input.{{name}})
                 ){{#hasMore}} && {{/hasMore}}{{/isContainer}}{{/vars}}{{^vars}}{{#parent}}base.Equals(input){{/parent}}{{^parent}}false{{/parent}}{{/vars}};
             {{/useCompareNetObjects}}
         }
@@ -199,13 +199,13 @@
                 int hashCode = 41;
                 {{/parent}}
                 {{#vars}}
-                {{^vendorExtensions.isValueType}}
+                {{^vendorExtensions.x-is-value-type}}
                 if (this.{{name}} != null)
                     hashCode = hashCode * 59 + this.{{name}}.GetHashCode();
-                {{/vendorExtensions.isValueType}}
+                {{/vendorExtensions.x-is-value-type}}
-                {{#vendorExtensions.isValueType}}
+                {{#vendorExtensions.x-is-value-type}}
                 hashCode = hashCode * 59 + this.{{name}}.GetHashCode();
-                {{/vendorExtensions.isValueType}}
+                {{/vendorExtensions.x-is-value-type}}
                 {{/vars}}
                 return hashCode;
             }

modules/openapi-generator/src/main/resources/elm/api.mustache

@@ -61,9 +61,9 @@ basePath =
         { method = "{{httpMethod}}"
         , headers = List.filterMap identity [{{#headerParams}}{{#required}}(Just << {{/required}}{{^required}}Maybe.map ({{/required}}Http.header "{{baseName}}" << {{>toString}}) {{^isElm018}}headers.{{/isElm018}}{{paramName}}{{^-last}}, {{/-last}}{{/headerParams}}]
         , url = Url.crossOrigin {{#enableCustomBasePaths}}params.{{/enableCustomBasePaths}}basePath
-            [{{#vendorExtensions.pathParams}}{{#paramName}}{{>toString}} params.{{paramName}}{{/paramName}}{{^paramName}}{{{.}}}{{/paramName}}{{^-last}}, {{/-last}}{{/vendorExtensions.pathParams}}]
+            [{{#vendorExtensions.x-path-params}}{{#paramName}}{{>toString}} params.{{paramName}}{{/paramName}}{{^paramName}}{{{.}}}{{/paramName}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-path-params}}]
             (List.filterMap identity [{{#queryParams}}{{#required}}(Just << {{/required}}{{^required}}Maybe.map ({{/required}}Url.string "{{baseName}}" << {{>toString}}) {{^isElm018}}params.{{/isElm018}}{{paramName}}{{^-last}}, {{/-last}}{{/queryParams}}])
-        , body = {{#bodyParam}}{{^required}}Maybe.withDefault Http.emptyBody <| Maybe.map ({{/required}}Http.jsonBody {{#required}}<|{{/required}}{{^required}}<<{{/required}} {{vendorExtensions.elmEncoder}}{{^required}}){{/required}} params.body{{/bodyParam}}{{^bodyParam}}Http.emptyBody{{/bodyParam}}
+        , body = {{#bodyParam}}{{^required}}Maybe.withDefault Http.emptyBody <| Maybe.map ({{/required}}Http.jsonBody {{#required}}<|{{/required}}{{^required}}<<{{/required}} {{vendorExtensions.x-elm-encoder}}{{^required}}){{/required}} params.body{{/bodyParam}}{{^bodyParam}}Http.emptyBody{{/bodyParam}}
         , expect = {{^responses}}Http.expectWhatever params.onSend{{/responses}}{{#responses}}{{#-first}}{{^dataType}}Http.expectWhatever params.onSend{{/dataType}}{{#dataType}}Http.expectJson params.onSend {{#isMapContainer}}(Decode.dict {{/isMapContainer}}{{#isListContainer}}(Decode.list {{/isListContainer}}{{#vendorExtensions}}{{elmDecoder}}{{/vendorExtensions}}{{#isListContainer}}){{/isListContainer}}{{#isMapContainer}}){{/isMapContainer}}{{/dataType}}{{/-first}}{{/responses}}
         , timeout = Just 30000
         , tracker = {{#enableHttpRequestTrackers}}params.tracker{{/enableHttpRequestTrackers}}{{^enableHttpRequestTrackers}}Nothing{{/enableHttpRequestTrackers}}

modules/openapi-generator/src/main/resources/elm/api018.mustache

@@ -23,7 +23,7 @@ basePath =
     { method = "{{httpMethod}}"
     , url = basePath ++ {{{path}}}
     , headers = []
-    , body = {{#bodyParam}}Http.jsonBody <| {{vendorExtensions.elmEncoder}} model{{/bodyParam}}{{^bodyParam}}Http.emptyBody{{/bodyParam}}
+    , body = {{#bodyParam}}Http.jsonBody <| {{vendorExtensions.x-elm-encoder}} model{{/bodyParam}}{{^bodyParam}}Http.emptyBody{{/bodyParam}}
     , expect = {{^responses}}Http.expectStringResponse (\_ -> Ok ()){{/responses}}{{#responses}}{{#-first}}{{^dataType}}Http.expectStringResponse (\_ -> Ok ()){{/dataType}}{{#dataType}}Http.expectJson {{#isMapContainer}}(Decode.dict {{/isMapContainer}}{{#isListContainer}}(Decode.list {{/isListContainer}}{{#vendorExtensions}}{{elmDecoder}}{{/vendorExtensions}}{{#isListContainer}}){{/isListContainer}}{{#isMapContainer}}){{/isMapContainer}}{{/dataType}}{{/-first}}{{/responses}}
     , timeout = Just 30000
     , withCredentials = False

modules/openapi-generator/src/main/resources/elm/customTypeDecoder.mustache

@@ -1,5 +1,5 @@
-{{vendorExtensions.elmDecoder}} : Decoder {{vendorExtensions.elmCustomType}}
+{{vendorExtensions.x-elm-decoder}} : Decoder {{vendorExtensions.x-elm-custom-type}}
-{{vendorExtensions.elmDecoder}} =
+{{vendorExtensions.x-elm-decoder}} =
     Decode.string
         |> Decode.andThen
             (\str ->

modules/openapi-generator/src/main/resources/elm/customTypeEncoder.mustache

@@ -1,5 +1,5 @@
-{{vendorExtensions.elmEncoder}} : {{vendorExtensions.elmCustomType}} -> Encode.Value
+{{vendorExtensions.x-elm-encoder}} : {{vendorExtensions.x-elm-custom-type}} -> Encode.Value
-{{vendorExtensions.elmEncoder}} model =
+{{vendorExtensions.x-elm-encoder}} model =
     case model of
 {{#allowableValues}}
 {{#enumVars}}

modules/openapi-generator/src/main/resources/elm/model.mustache

@@ -1,6 +1,6 @@
 {{>licenseInfo}}
 
-module Data.{{classname}} exposing ({{#models}}{{#model}}{{classname}}{{#hasChildren}}(..){{/hasChildren}}{{#isEnum}}(..){{/isEnum}}{{^isEnum}}{{#vars}}{{#isEnum}}, {{vendorExtensions.elmCustomType}}(..){{/isEnum}}{{/vars}}{{/isEnum}}, decoder, encode{{^isEnum}}{{^discriminator}}{{^oneOf}}, encodeWithTag{{/oneOf}}{{/discriminator}}{{/isEnum}}, toString{{/model}}{{/models}})
+module Data.{{classname}} exposing ({{#models}}{{#model}}{{classname}}{{#hasChildren}}(..){{/hasChildren}}{{#isEnum}}(..){{/isEnum}}{{^isEnum}}{{#vars}}{{#isEnum}}, {{vendorExtensions.x-elm-custom-type}}(..){{/isEnum}}{{/vars}}{{/isEnum}}, decoder, encode{{^isEnum}}{{^discriminator}}{{^oneOf}}, encodeWithTag{{/oneOf}}{{/discriminator}}{{/isEnum}}, toString{{/model}}{{/models}})
 
 {{>imports}}import Dict exposing (Dict)
 import Json.Decode as Decode exposing (Decoder)

modules/openapi-generator/src/main/resources/elm/modelTypeArray.mustache

@@ -4,12 +4,12 @@ type alias {{classname}} =
 
 decoder : Decoder {{classname}}
 decoder =
-    Decode.list {{vendorExtensions.elmDecoder}}
+    Decode.list {{vendorExtensions.x-elm-decoder}}
 
 
 encode : {{classname}} -> Encode.Value
 encode items =
-    Encode.list {{#isElm018}}(List.map {{/isElm018}}{{vendorExtensions.elmEncoder}} items{{#isElm018}}){{/isElm018}}
+    Encode.list {{#isElm018}}(List.map {{/isElm018}}{{vendorExtensions.x-elm-encoder}} items{{#isElm018}}){{/isElm018}}
 
 
 toString : {{classname}} -> String

modules/openapi-generator/src/main/resources/elm/modelTypePrimitive.mustache

@@ -4,12 +4,12 @@ type alias {{classname}}
 
 decoder : Decoder {{classname}}
 decoder =
-    {{vendorExtensions.elmDecoder}}
+    {{vendorExtensions.x-elm-decoder}}
 
 
 encode : {{classname}} -> Encode.Value
 encode =
-    {{vendorExtensions.elmEncoder}}
+    {{vendorExtensions.x-elm-encoder}}
 
 
 toString : {{classname}} -> String

modules/openapi-generator/src/main/resources/elm/recordFieldValueDecoder.mustache

@@ -1 +1 @@
-{{#isNullable}}(Decode.nullable {{/isNullable}}{{#isContainer}}({{#isListContainer}}Decode.list{{/isListContainer}}{{#isMapContainer}}Decode.dict{{/isMapContainer}} {{#items}}{{>recordFieldValueDecoder}}{{/items}}){{/isContainer}}{{^isContainer}}{{vendorExtensions.elmDecoder}}{{/isContainer}}{{#isNullable}}){{^required}} {{{defaultValue}}}{{/required}}{{/isNullable}}
+{{#isNullable}}(Decode.nullable {{/isNullable}}{{#isContainer}}({{#isListContainer}}Decode.list{{/isListContainer}}{{#isMapContainer}}Decode.dict{{/isMapContainer}} {{#items}}{{>recordFieldValueDecoder}}{{/items}}){{/isContainer}}{{^isContainer}}{{vendorExtensions.x-elm-decoder}}{{/isContainer}}{{#isNullable}}){{^required}} {{{defaultValue}}}{{/required}}{{/isNullable}}

modules/openapi-generator/src/main/resources/elm/recordFieldValueEncoder.mustache

@@ -1 +1 @@
-{{#isNullable}}Maybe.withDefault Encode.null (Maybe.map {{/isNullable}}{{#isContainer}}({{#isListContainer}}Encode.list{{#isElm018}} << List.map{{/isElm018}}{{/isListContainer}}{{#isMapContainer}}Encode.dict identity{{/isMapContainer}} {{#items}}{{>recordFieldValueEncoder}}{{/items}}{{/isContainer}}{{^isContainer}}{{vendorExtensions.elmEncoder}}{{/isContainer}}{{#isContainer}}){{/isContainer}}
+{{#isNullable}}Maybe.withDefault Encode.null (Maybe.map {{/isNullable}}{{#isContainer}}({{#isListContainer}}Encode.list{{#isElm018}} << List.map{{/isElm018}}{{/isListContainer}}{{#isMapContainer}}Encode.dict identity{{/isMapContainer}} {{#items}}{{>recordFieldValueEncoder}}{{/items}}{{/isContainer}}{{^isContainer}}{{vendorExtensions.x-elm-encoder}}{{/isContainer}}{{#isContainer}}){{/isContainer}}

modules/openapi-generator/src/main/resources/go-experimental/api.mustache

@@ -27,7 +27,7 @@ type api{{operationId}}Request struct {
 }
 
 {{#allParams}}{{^isPathParam}}
-func (r api{{operationId}}Request) {{vendorExtensions.x-exportParamName}}({{paramName}} {{{dataType}}}) api{{operationId}}Request {
+func (r api{{operationId}}Request) {{vendorExtensions.x-export-param-name}}({{paramName}} {{{dataType}}}) api{{operationId}}Request {
 	r.{{paramName}} = &{{paramName}}
 	return r
 }

modules/openapi-generator/src/main/resources/go-experimental/api_doc.mustache

@@ -14,7 +14,7 @@ Method | HTTP request | Description
 
 ## {{{operationId}}}
 
-> {{#returnType}}{{{.}}} {{/returnType}}{{{operationId}}}(ctx{{#pathParams}}, {{paramName}}{{/pathParams}}){{#allParams}}{{^isPathParam}}.{{vendorExtensions.x-exportParamName}}({{paramName}}){{/isPathParam}}{{/allParams}}.Execute()
+> {{#returnType}}{{{.}}} {{/returnType}}{{{operationId}}}(ctx{{#pathParams}}, {{paramName}}{{/pathParams}}){{#allParams}}{{^isPathParam}}.{{vendorExtensions.x-export-param-name}}({{paramName}}){{/isPathParam}}{{/allParams}}.Execute()
 
 {{{summary}}}{{#notes}}
 

modules/openapi-generator/src/main/resources/go-experimental/model.mustache

@@ -152,12 +152,12 @@ func (s *{{classname}}) UnmarshalJSON(src []byte) error {
     {{/discriminator}}
 }
 {{/vendorExtensions.x-is-one-of-interface}}
-{{#vendorExtensions.implements}}
+{{#vendorExtensions.x-implements}}
 // As{{{.}}} wraps this instance of {{classname}} in {{{.}}}
 func (s *{{classname}}) As{{{.}}}() {{{.}}} {
     return {{{.}}}{ {{{.}}}Interface: s }
 }
-{{/vendorExtensions.implements}}
+{{/vendorExtensions.x-implements}}
 {{/isEnum}}
 type Nullable{{{classname}}} struct {
 	Value {{{classname}}}

modules/openapi-generator/src/main/resources/go-experimental/model_doc.mustache

@@ -52,14 +52,14 @@ when serializing to JSON (pass true as argument to set this, false to unset)
 The {{name}} value is set to nil even if false is passed
 {{/isNullable}}
 {{/vars}}
-{{#vendorExtensions.implements}}
+{{#vendorExtensions.x-implements}}
 
 ### As{{{.}}}
 
 `func (s *{{classname}}) As{{{.}}}() {{{.}}}`
 
 Convenience method to wrap this instance of {{classname}} in {{{.}}}
-{{/vendorExtensions.implements}}
+{{/vendorExtensions.x-implements}}
 {{/vendorExtensions.x-is-one-of-interface}}
 {{/isEnum}}
 

modules/openapi-generator/src/main/resources/go/api.mustache

@@ -27,14 +27,14 @@ type {{#structPrefix}}{{&classname}}{{/structPrefix}}{{{nickname}}}Opts struct {
 {{^required}}
 {{#isPrimitiveType}}
 {{^isBinary}}
-    {{vendorExtensions.x-exportParamName}} optional.{{vendorExtensions.x-optionalDataType}}
+    {{vendorExtensions.x-export-param-name}} optional.{{vendorExtensions.x-optional-data-type}}
 {{/isBinary}}
 {{#isBinary}}
-    {{vendorExtensions.x-exportParamName}} optional.Interface
+    {{vendorExtensions.x-export-param-name}} optional.Interface
 {{/isBinary}}
 {{/isPrimitiveType}}
 {{^isPrimitiveType}}
-    {{vendorExtensions.x-exportParamName}} optional.Interface
+    {{vendorExtensions.x-export-param-name}} optional.Interface
 {{/isPrimitiveType}}
 {{/required}}
 {{/allParams}}
@@ -56,7 +56,7 @@ type {{#structPrefix}}{{&classname}}{{/structPrefix}}{{{nickname}}}Opts struct {
  * @param optional nil or *{{#structPrefix}}{{&classname}}{{/structPrefix}}{{{nickname}}}Opts - Optional Parameters:
 {{#allParams}}
 {{^required}}
- * @param "{{vendorExtensions.x-exportParamName}}" ({{#isPrimitiveType}}{{^isBinary}}optional.{{vendorExtensions.x-optionalDataType}}{{/isBinary}}{{#isBinary}}optional.Interface of {{dataType}}{{/isBinary}}{{/isPrimitiveType}}{{^isPrimitiveType}}optional.Interface of {{dataType}}{{/isPrimitiveType}}) - {{#description}} {{{.}}}{{/description}}
+ * @param "{{vendorExtensions.x-export-param-name}}" ({{#isPrimitiveType}}{{^isBinary}}optional.{{vendorExtensions.x-optional-data-type}}{{/isBinary}}{{#isBinary}}optional.Interface of {{dataType}}{{/isBinary}}{{/isPrimitiveType}}{{^isPrimitiveType}}optional.Interface of {{dataType}}{{/isPrimitiveType}}) - {{#description}} {{{.}}}{{/description}}
 {{/required}}
 {{/allParams}}
 {{/hasOptionalParams}}
@@ -152,9 +152,9 @@ func (a *{{{classname}}}Service) {{{nickname}}}(ctx _context.Context{{#hasParams
 	{{/isCollectionFormatMulti}}
 	{{/required}}
 	{{^required}}
-	if localVarOptionals != nil && localVarOptionals.{{vendorExtensions.x-exportParamName}}.IsSet() {
+	if localVarOptionals != nil && localVarOptionals.{{vendorExtensions.x-export-param-name}}.IsSet() {
 	{{#isCollectionFormatMulti}}
-		t:=localVarOptionals.{{vendorExtensions.x-exportParamName}}.Value()
+		t:=localVarOptionals.{{vendorExtensions.x-export-param-name}}.Value()
 		if reflect.TypeOf(t).Kind() == reflect.Slice {
 			s := reflect.ValueOf(t)
 			for i := 0; i < s.Len(); i++ {
@@ -165,7 +165,7 @@ func (a *{{{classname}}}Service) {{{nickname}}}(ctx _context.Context{{#hasParams
 		}
 	{{/isCollectionFormatMulti}}
 	{{^isCollectionFormatMulti}}
-		localVarQueryParams.Add("{{baseName}}", parameterToString(localVarOptionals.{{vendorExtensions.x-exportParamName}}.Value(), "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}"))
+		localVarQueryParams.Add("{{baseName}}", parameterToString(localVarOptionals.{{vendorExtensions.x-export-param-name}}.Value(), "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}"))
 	{{/isCollectionFormatMulti}}
 	}
 	{{/required}}
@@ -198,8 +198,8 @@ func (a *{{{classname}}}Service) {{{nickname}}}(ctx _context.Context{{#hasParams
 	localVarHeaderParams["{{baseName}}"] = parameterToString({{paramName}}, "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}")
 	{{/required}}
 	{{^required}}
-	if localVarOptionals != nil && localVarOptionals.{{vendorExtensions.x-exportParamName}}.IsSet() {
+	if localVarOptionals != nil && localVarOptionals.{{vendorExtensions.x-export-param-name}}.IsSet() {
-		localVarHeaderParams["{{baseName}}"] = parameterToString(localVarOptionals.{{vendorExtensions.x-exportParamName}}.Value(), "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}")
+		localVarHeaderParams["{{baseName}}"] = parameterToString(localVarOptionals.{{vendorExtensions.x-export-param-name}}.Value(), "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}")
 	}
 	{{/required}}
 {{/headerParams}}
@@ -213,9 +213,9 @@ func (a *{{{classname}}}Service) {{{nickname}}}(ctx _context.Context{{#hasParams
 {{/required}}
 {{^required}}
 	var localVarFile {{dataType}}
-	if localVarOptionals != nil && localVarOptionals.{{vendorExtensions.x-exportParamName}}.IsSet() {
+	if localVarOptionals != nil && localVarOptionals.{{vendorExtensions.x-export-param-name}}.IsSet() {
 		localVarFileOk := false
-		localVarFile, localVarFileOk = localVarOptionals.{{vendorExtensions.x-exportParamName}}.Value().({{dataType}})
+		localVarFile, localVarFileOk = localVarOptionals.{{vendorExtensions.x-export-param-name}}.Value().({{dataType}})
 		if !localVarFileOk {
 				return {{#returnType}}localVarReturnValue, {{/returnType}}nil, reportError("{{paramName}} should be {{dataType}}")
 		}
@@ -234,8 +234,8 @@ func (a *{{{classname}}}Service) {{{nickname}}}(ctx _context.Context{{#hasParams
 {{/required}}
 {{^required}}
 {{#isModel}}
-	if localVarOptionals != nil && localVarOptionals.{{vendorExtensions.x-exportParamName}}.IsSet() {
+	if localVarOptionals != nil && localVarOptionals.{{vendorExtensions.x-export-param-name}}.IsSet() {
-		paramJson, err := parameterToJson(localVarOptionals.{{vendorExtensions.x-exportParamName}}.Value())
+		paramJson, err := parameterToJson(localVarOptionals.{{vendorExtensions.x-export-param-name}}.Value())
 		if err != nil {
 			return {{#returnType}}localVarReturnValue, {{/returnType}}nil, err
 		}
@@ -243,8 +243,8 @@ func (a *{{{classname}}}Service) {{{nickname}}}(ctx _context.Context{{#hasParams
 	}
 {{/isModel}}
 {{^isModel}}
-	if localVarOptionals != nil && localVarOptionals.{{vendorExtensions.x-exportParamName}}.IsSet() {
+	if localVarOptionals != nil && localVarOptionals.{{vendorExtensions.x-export-param-name}}.IsSet() {
-		localVarFormParams.Add("{{baseName}}", parameterToString(localVarOptionals.{{vendorExtensions.x-exportParamName}}.Value(), "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}"))
+		localVarFormParams.Add("{{baseName}}", parameterToString(localVarOptionals.{{vendorExtensions.x-export-param-name}}.Value(), "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}"))
 	}
 {{/isModel}}
 {{/required}}
@@ -258,16 +258,16 @@ func (a *{{{classname}}}Service) {{{nickname}}}(ctx _context.Context{{#hasParams
 	localVarPostBody = &{{paramName}}
 {{/required}}
 {{^required}}
-	if localVarOptionals != nil && localVarOptionals.{{vendorExtensions.x-exportParamName}}.IsSet() {
+	if localVarOptionals != nil && localVarOptionals.{{vendorExtensions.x-export-param-name}}.IsSet() {
 		{{#isPrimitiveType}}
-		localVarPostBody = localVarOptionals.{{vendorExtensions.x-exportParamName}}.Value()
+		localVarPostBody = localVarOptionals.{{vendorExtensions.x-export-param-name}}.Value()
 		{{/isPrimitiveType}}
 		{{^isPrimitiveType}}
-		localVarOptional{{vendorExtensions.x-exportParamName}}, localVarOptional{{vendorExtensions.x-exportParamName}}ok := localVarOptionals.{{vendorExtensions.x-exportParamName}}.Value().({{{dataType}}})
+		localVarOptional{{vendorExtensions.x-export-param-name}}, localVarOptional{{vendorExtensions.x-export-param-name}}ok := localVarOptionals.{{vendorExtensions.x-export-param-name}}.Value().({{{dataType}}})
-		if !localVarOptional{{vendorExtensions.x-exportParamName}}ok {
+		if !localVarOptional{{vendorExtensions.x-export-param-name}}ok {
 			return {{#returnType}}localVarReturnValue, {{/returnType}}nil, reportError("{{paramName}} should be {{dataType}}")
 		}
-		localVarPostBody = &localVarOptional{{vendorExtensions.x-exportParamName}}
+		localVarPostBody = &localVarOptional{{vendorExtensions.x-export-param-name}}
 		{{/isPrimitiveType}}
 	}
 

modules/openapi-generator/src/main/resources/go/api_doc.mustache

@@ -36,7 +36,7 @@ Optional parameters are passed through a pointer to a {{{nickname}}}Opts struct
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------{{/-last}}{{/allParams}}{{#allParams}}
-{{^required}} **{{paramName}}** | {{#isFile}}**optional.Interface of {{dataType}}**{{/isFile}}{{#isPrimitiveType}}**optional.{{vendorExtensions.x-optionalDataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{^isFile}}[**optional.Interface of {{dataType}}**]({{baseType}}.md){{/isFile}}{{/isPrimitiveType}}| {{description}} | {{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}{{/required}}{{/allParams}}{{/hasOptionalParams}}
+{{^required}} **{{paramName}}** | {{#isFile}}**optional.Interface of {{dataType}}**{{/isFile}}{{#isPrimitiveType}}**optional.{{vendorExtensions.x-optional-data-type}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{^isFile}}[**optional.Interface of {{dataType}}**]({{baseType}}.md){{/isFile}}{{/isPrimitiveType}}| {{description}} | {{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}{{/required}}{{/allParams}}{{/hasOptionalParams}}
 
 ### Return type
 

modules/openapi-generator/src/main/resources/haskell-http-client/API.mustache

@@ -44,29 +44,29 @@ import Prelude ((==),(/=),($), (.),(<$>),(<*>),(>>=),Maybe(..),Bool(..),Char,Dou
 import qualified Prelude as P
 
 -- * Operations
-{{#operations}}{{#operation}}{{#vendorExtensions.x-hasNewTag}}
+{{#operations}}{{#operation}}{{#vendorExtensions.x-has-new-tag}}
 
--- ** {{baseName}}{{/vendorExtensions.x-hasNewTag}}
+-- ** {{baseName}}{{/vendorExtensions.x-has-new-tag}}
 
 -- *** {{operationId}}
 
--- | @{{{vendorExtensions.x-haddockPath}}}@
+-- | @{{{vendorExtensions.x-haddock-path}}}@
 -- {{#summary}}
 -- {{{.}}}
 -- {{/summary}}{{#notes}}
 -- {{{.}}}
 -- {{/notes}}{{#hasAuthMethods}}
 -- AuthMethod: {{#authMethods}}'{{{name}}}'{{#hasMore}}, {{/hasMore}}{{/authMethods}}
--- {{/hasAuthMethods}}{{#vendorExtensions.x-hasUnknownReturn}}
+-- {{/hasAuthMethods}}{{#vendorExtensions.x-has-unknown-return}}
 -- Note: Has 'Produces' instances, but no response schema
--- {{/vendorExtensions.x-hasUnknownReturn}}
+-- {{/vendorExtensions.x-has-unknown-return}}
 {{operationId}} 
-  :: {{#vendorExtensions.x-hasBodyOrFormParam}}(Consumes {{{vendorExtensions.x-operationType}}} {{>_contentType}}{{#allParams}}{{#isBodyParam}}{{#required}}, MimeRender {{>_contentType}} {{#vendorExtensions.x-paramNameType}}{{{.}}}{{/vendorExtensions.x-paramNameType}}{{^vendorExtensions.x-paramNameType}}{{{dataType}}}{{/vendorExtensions.x-paramNameType}}{{/required}}{{/isBodyParam}}{{/allParams}})
+  :: {{#vendorExtensions.x-has-body-or-form-param}}(Consumes {{{vendorExtensions.x-operation-type}}} {{>_contentType}}{{#allParams}}{{#isBodyParam}}{{#required}}, MimeRender {{>_contentType}} {{#vendorExtensions.x-param-name-type}}{{{.}}}{{/vendorExtensions.x-param-name-type}}{{^vendorExtensions.x-param-name-type}}{{{dataType}}}{{/vendorExtensions.x-param-name-type}}{{/required}}{{/isBodyParam}}{{/allParams}})
-  => {{^vendorExtensions.x-inlineContentType}}ContentType contentType -- ^ request content-type ('MimeType')
+  => {{^vendorExtensions.x-inline-content-type}}ContentType contentType -- ^ request content-type ('MimeType')
-  -> {{/vendorExtensions.x-inlineContentType}}{{/vendorExtensions.x-hasBodyOrFormParam}}{{^vendorExtensions.x-inlineAccept}}Accept accept -- ^ request accept ('MimeType')
+  -> {{/vendorExtensions.x-inline-content-type}}{{/vendorExtensions.x-has-body-or-form-param}}{{^vendorExtensions.x-inline-accept}}Accept accept -- ^ request accept ('MimeType')
-  -> {{/vendorExtensions.x-inlineAccept}}{{#allParams}}{{#required}}{{#vendorExtensions.x-paramNameType}}{{{.}}}{{/vendorExtensions.x-paramNameType}}{{^vendorExtensions.x-paramNameType}}{{{dataType}}}{{/vendorExtensions.x-paramNameType}} -- ^ "{{{paramName}}}"{{#description}} -  {{{.}}}{{/description}}{{^required}}{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}{{/required}}
+  -> {{/vendorExtensions.x-inline-accept}}{{#allParams}}{{#required}}{{#vendorExtensions.x-param-name-type}}{{{.}}}{{/vendorExtensions.x-param-name-type}}{{^vendorExtensions.x-param-name-type}}{{{dataType}}}{{/vendorExtensions.x-param-name-type}} -- ^ "{{{paramName}}}"{{#description}} -  {{{.}}}{{/description}}{{^required}}{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}{{/required}}
-  -> {{/required}}{{/allParams}}{{requestType}} {{{vendorExtensions.x-operationType}}} {{>_contentType}} {{vendorExtensions.x-returnType}} {{>_accept}}
+  -> {{/required}}{{/allParams}}{{requestType}} {{{vendorExtensions.x-operation-type}}} {{>_contentType}} {{vendorExtensions.x-return-type}} {{>_accept}}
-{{operationId}} {{^vendorExtensions.x-inlineContentType}}_ {{/vendorExtensions.x-inlineContentType}}{{^vendorExtensions.x-inlineAccept}} _ {{/vendorExtensions.x-inlineAccept}}{{#allParams}}{{#required}}{{#isBodyParam}}{{{paramName}}}{{/isBodyParam}}{{^isBodyParam}}({{{vendorExtensions.x-paramNameType}}} {{{paramName}}}){{/isBodyParam}} {{/required}}{{/allParams}}=
+{{operationId}} {{^vendorExtensions.x-inline-content-type}}_ {{/vendorExtensions.x-inline-content-type}}{{^vendorExtensions.x-inline-accept}} _ {{/vendorExtensions.x-inline-accept}}{{#allParams}}{{#required}}{{#isBodyParam}}{{{paramName}}}{{/isBodyParam}}{{^isBodyParam}}({{{vendorExtensions.x-param-name-type}}} {{{paramName}}}){{/isBodyParam}} {{/required}}{{/allParams}}=
   _mkRequest "{{httpMethod}}" {{{vendorExtensions.x-path}}}{{#authMethods}}
     `_hasAuthType` (P.Proxy :: P.Proxy {{name}}){{/authMethods}}{{#allParams}}{{#required}}{{#isHeaderParam}}
     `setHeader` {{>_headerColl}} ("{{{baseName}}}", {{{paramName}}}){{/isHeaderParam}}{{#isQueryParam}}
@@ -78,27 +78,27 @@ import qualified Prelude as P
 
 {-# DEPRECATED {{operationId}} "" #-}{{/isDeprecated}}
 
-data {{{vendorExtensions.x-operationType}}} {{#allParams}}{{#isBodyParam}}{{#description}}
+data {{{vendorExtensions.x-operation-type}}} {{#allParams}}{{#isBodyParam}}{{#description}}
 
 -- | /Body Param/ "{{{baseName}}}" - {{{description}}}{{/description}}
-instance HasBodyParam {{{vendorExtensions.x-operationType}}} {{#vendorExtensions.x-paramNameType}}{{{.}}}{{/vendorExtensions.x-paramNameType}}{{^vendorExtensions.x-paramNameType}}{{{dataType}}}{{/vendorExtensions.x-paramNameType}}{{/isBodyParam}}{{/allParams}} {{#vendorExtensions.x-hasOptionalParams}}{{#allParams}}{{^isBodyParam}}{{^required}}{{#description}}
+instance HasBodyParam {{{vendorExtensions.x-operation-type}}} {{#vendorExtensions.x-param-name-type}}{{{.}}}{{/vendorExtensions.x-param-name-type}}{{^vendorExtensions.x-param-name-type}}{{{dataType}}}{{/vendorExtensions.x-param-name-type}}{{/isBodyParam}}{{/allParams}} {{#vendorExtensions.x-has-optional-params}}{{#allParams}}{{^isBodyParam}}{{^required}}{{#description}}
 
 -- | /Optional Param/ "{{{baseName}}}" - {{{description}}}{{/description}}
-instance HasOptionalParam {{{vendorExtensions.x-operationType}}} {{{vendorExtensions.x-paramNameType}}} where
+instance HasOptionalParam {{{vendorExtensions.x-operation-type}}} {{{vendorExtensions.x-param-name-type}}} where
-  applyOptionalParam req ({{{vendorExtensions.x-paramNameType}}} xs) =
+  applyOptionalParam req ({{{vendorExtensions.x-param-name-type}}} xs) =
-    {{#isHeaderParam}}req `setHeader` {{>_headerColl}} ("{{{baseName}}}", xs){{/isHeaderParam}}{{#isQueryParam}}req `setQuery` {{>_queryColl}} ("{{{baseName}}}", Just xs){{/isQueryParam}}{{#isFormParam}}{{#isFile}}req `_addMultiFormPart` NH.partFileSource "{{{baseName}}}" xs{{/isFile}}{{^isFile}}{{#isMultipart}}req `_addMultiFormPart` NH.partLBS "{{{baseName}}}" (mimeRender' MimeMultipartFormData xs){{/isMultipart}}{{^isMultipart}}req `addForm` {{>_formColl}} ("{{{baseName}}}", xs){{/isMultipart}}{{/isFile}}{{/isFormParam}}{{/required}}{{/isBodyParam}}{{/allParams}}{{/vendorExtensions.x-hasOptionalParams}}{{#hasConsumes}}
+    {{#isHeaderParam}}req `setHeader` {{>_headerColl}} ("{{{baseName}}}", xs){{/isHeaderParam}}{{#isQueryParam}}req `setQuery` {{>_queryColl}} ("{{{baseName}}}", Just xs){{/isQueryParam}}{{#isFormParam}}{{#isFile}}req `_addMultiFormPart` NH.partFileSource "{{{baseName}}}" xs{{/isFile}}{{^isFile}}{{#isMultipart}}req `_addMultiFormPart` NH.partLBS "{{{baseName}}}" (mimeRender' MimeMultipartFormData xs){{/isMultipart}}{{^isMultipart}}req `addForm` {{>_formColl}} ("{{{baseName}}}", xs){{/isMultipart}}{{/isFile}}{{/isFormParam}}{{/required}}{{/isBodyParam}}{{/allParams}}{{/vendorExtensions.x-has-optional-params}}{{#hasConsumes}}
 
 {{#consumes}}-- | @{{{mediaType}}}@{{^x-mediaIsWildcard}}
-instance Consumes {{{vendorExtensions.x-operationType}}} {{{x-mediaDataType}}}{{/x-mediaIsWildcard}}{{#x-mediaIsWildcard}}
+instance Consumes {{{vendorExtensions.x-operation-type}}} {{{x-mediaDataType}}}{{/x-mediaIsWildcard}}{{#x-mediaIsWildcard}}
-instance MimeType mtype => Consumes {{{vendorExtensions.x-operationType}}} mtype{{/x-mediaIsWildcard}}
+instance MimeType mtype => Consumes {{{vendorExtensions.x-operation-type}}} mtype{{/x-mediaIsWildcard}}
-{{/consumes}}{{/hasConsumes}}{{^hasConsumes}}{{#vendorExtensions.x-hasBodyOrFormParam}}
+{{/consumes}}{{/hasConsumes}}{{^hasConsumes}}{{#vendorExtensions.x-has-body-or-form-param}}
     
 -- | @*/*@
-instance MimeType mtype => Consumes {{{vendorExtensions.x-operationType}}} mtype
+instance MimeType mtype => Consumes {{{vendorExtensions.x-operation-type}}} mtype
-{{/vendorExtensions.x-hasBodyOrFormParam}}{{/hasConsumes}}{{#hasProduces}}
+{{/vendorExtensions.x-has-body-or-form-param}}{{/hasConsumes}}{{#hasProduces}}
 {{#produces}}-- | @{{{mediaType}}}@{{^x-mediaIsWildcard}}
-instance Produces {{{vendorExtensions.x-operationType}}} {{{x-mediaDataType}}}{{/x-mediaIsWildcard}}{{#x-mediaIsWildcard}}
+instance Produces {{{vendorExtensions.x-operation-type}}} {{{x-mediaDataType}}}{{/x-mediaIsWildcard}}{{#x-mediaIsWildcard}}
-instance MimeType mtype => Produces {{{vendorExtensions.x-operationType}}} mtype{{/x-mediaIsWildcard}}
+instance MimeType mtype => Produces {{{vendorExtensions.x-operation-type}}} mtype{{/x-mediaIsWildcard}}
 {{/produces}}{{/hasProduces}}{{^hasProduces}}
-instance Produces {{{vendorExtensions.x-operationType}}} MimeNoContent
+instance Produces {{{vendorExtensions.x-operation-type}}} MimeNoContent
 {{/hasProduces}}{{/operation}}{{/operations}}

modules/openapi-generator/src/main/resources/haskell-http-client/Model.mustache

@@ -71,10 +71,10 @@ newtype {{{x-paramNameType}}} = {{{x-paramNameType}}} { un{{{x-paramNameType}}}
 -- {{/title}}{{#description}}
 -- {{{.}}}{{/description}}{{#isAlias}}
 newtype {{classname}} = {{classname}}
-  { un{{classname}} :: {{{vendorExtensions.x-dataType}}}
+  { un{{classname}} :: {{{vendorExtensions.x-data-type}}}
   } deriving (P.Eq, P.Show, P.Typeable, A.ToJSON, A.FromJSON{{#modelDeriving}}, {{modelDeriving}}{{/modelDeriving}}){{/isAlias}}{{^isAlias}}
 data {{classname}} = {{classname}}
-  { {{#vars}}{{name}} :: {{#x-strictFields}}!({{/x-strictFields}}{{^required}}Maybe {{/required}}{{{vendorExtensions.x-dataType}}}{{#x-strictFields}}){{/x-strictFields}} -- ^ {{#required}}/Required/ {{/required}}{{#isReadOnly}}/ReadOnly/ {{/isReadOnly}}"{{baseName}}"{{#description}} - {{description}}{{/description}}{{#hasMore}}
+  { {{#vars}}{{name}} :: {{#x-strictFields}}!({{/x-strictFields}}{{^required}}Maybe {{/required}}{{{vendorExtensions.x-data-type}}}{{#x-strictFields}}){{/x-strictFields}} -- ^ {{#required}}/Required/ {{/required}}{{#isReadOnly}}/ReadOnly/ {{/isReadOnly}}"{{baseName}}"{{#description}} - {{description}}{{/description}}{{#hasMore}}
   , {{/hasMore}}{{/vars}}
   } deriving (P.Show, P.Eq, P.Typeable{{#modelDeriving}}, {{modelDeriving}}{{/modelDeriving}}){{/isAlias}}
 
@@ -93,7 +93,7 @@ instance A.ToJSON {{classname}} where
       , {{/hasMore}}{{/vars}}
       ]
 
-{{#vendorExtensions.x-hasMimeFormUrlEncoded}}
+{{#vendorExtensions.x-has-mime-form-url-encoded}}
 -- | FromForm {{classname}}
 instance WH.FromForm {{classname}} where
   fromForm f =
@@ -108,12 +108,12 @@ instance WH.ToForm {{classname}} where
       [ {{#vars}}_toFormItem "{{baseName}}" ({{#required}}Just {{/required}}{{name}}){{#hasMore}}
       , {{/hasMore}}{{/vars}}
       ]
-{{/vendorExtensions.x-hasMimeFormUrlEncoded}}
+{{/vendorExtensions.x-has-mime-form-url-encoded}}
 
 {{#generateModelConstructors}}
 -- | Construct a value of type '{{classname}}' (by applying it's required fields, if any)
 mk{{classname}}
-  :: {{#vars}}{{#required}}{{{vendorExtensions.x-dataType}}} -- ^ '{{name}}'{{#description}}:{{/description}} {{{description}}}
+  :: {{#vars}}{{#required}}{{{vendorExtensions.x-data-type}}} -- ^ '{{name}}'{{#description}}:{{/description}} {{{description}}}
   -> {{/required}}{{/vars}}{{classname}}
 mk{{classname}} {{#vars}}{{#required}}{{name}} {{/required}}{{/vars}}=
   {{classname}}

modules/openapi-generator/src/main/resources/haskell-http-client/ModelLens.mustache

@@ -33,7 +33,7 @@ import {{baseModule}}.Core
 
 {{#vars}}
 -- | '{{name}}' Lens
-{{name}}L :: Lens_' {{classname}} ({{^required}}Maybe {{/required}}{{{vendorExtensions.x-dataType}}})
+{{name}}L :: Lens_' {{classname}} ({{^required}}Maybe {{/required}}{{{vendorExtensions.x-data-type}}})
 {{name}}L f {{classname}}{..} = (\{{name}} -> {{classname}} { {{name}}, ..} ) <$> f {{name}}
 {-# INLINE {{name}}L #-}
 

modules/openapi-generator/src/main/resources/haskell-http-client/_accept.mustache

@@ -1 +1 @@
-{{^vendorExtensions.x-inlineAccept}}accept{{/vendorExtensions.x-inlineAccept}}{{#vendorExtensions.x-inlineAccept}}{{{x-mediaDataType}}}{{/vendorExtensions.x-inlineAccept}}
+{{^vendorExtensions.x-inline-accept}}accept{{/vendorExtensions.x-inline-accept}}{{#vendorExtensions.x-inline-accept}}{{{x-mediaDataType}}}{{/vendorExtensions.x-inline-accept}}

modules/openapi-generator/src/main/resources/haskell-http-client/_contentType.mustache

@@ -1 +1 @@
-{{^vendorExtensions.x-inlineContentType}}contentType{{/vendorExtensions.x-inlineContentType}}{{#vendorExtensions.x-inlineContentType}}{{{x-mediaDataType}}}{{/vendorExtensions.x-inlineContentType}}
+{{^vendorExtensions.x-inline-content-type}}contentType{{/vendorExtensions.x-inline-content-type}}{{#vendorExtensions.x-inline-content-type}}{{{x-mediaDataType}}}{{/vendorExtensions.x-inline-content-type}}

modules/openapi-generator/src/main/resources/haskell-http-client/_formColl.mustache

@@ -1 +1 @@
-toForm{{#collectionFormat}}Coll {{vendorExtensions.x-collectionFormat}}{{/collectionFormat}}
+toForm{{#collectionFormat}}Coll {{vendorExtensions.x-collection-format}}{{/collectionFormat}}

modules/openapi-generator/src/main/resources/haskell-http-client/_headerColl.mustache

@@ -1 +1 @@
-toHeader{{#collectionFormat}}Coll {{vendorExtensions.x-collectionFormat}}{{/collectionFormat}}
+toHeader{{#collectionFormat}}Coll {{vendorExtensions.x-collection-format}}{{/collectionFormat}}

modules/openapi-generator/src/main/resources/haskell-http-client/_queryColl.mustache

@@ -1 +1 @@
-toQuery{{#collectionFormat}}Coll {{vendorExtensions.x-collectionFormat}}{{/collectionFormat}}
+toQuery{{#collectionFormat}}Coll {{vendorExtensions.x-collection-format}}{{/collectionFormat}}

modules/openapi-generator/src/main/resources/haskell-http-client/tests/Instances.mustache

@@ -115,7 +115,7 @@ gen{{classname}} :: Int -> Gen {{classname}}
 gen{{classname}} n =
   {{#isAlias}}{{classname}} <$> arbitrary{{/isAlias}}{{^isAlias}}{{^hasVars}}
   pure {{/hasVars}}{{classname}}
-  {{#hasVars}}  <$>{{/hasVars}} {{#vars}}{{#required}}{{#isPrimitiveType}}arbitrary{{/isPrimitiveType}}{{^isPrimitiveType}}arbitraryReduced n{{/isPrimitiveType}}{{/required}}{{^required}}{{^vendorExtensions.x-isMaybeValue}}arbitraryReducedMaybe n{{/vendorExtensions.x-isMaybeValue}}{{#vendorExtensions.x-isMaybeValue}}arbitraryReducedMaybeValue n{{/vendorExtensions.x-isMaybeValue}}{{/required}} -- {{name}} :: {{^required}}Maybe {{/required}}{{{vendorExtensions.x-dataType}}}
+  {{#hasVars}}  <$>{{/hasVars}} {{#vars}}{{#required}}{{#isPrimitiveType}}arbitrary{{/isPrimitiveType}}{{^isPrimitiveType}}arbitraryReduced n{{/isPrimitiveType}}{{/required}}{{^required}}{{^vendorExtensions.x-is-maybe-value}}arbitraryReducedMaybe n{{/vendorExtensions.x-is-maybe-value}}{{#vendorExtensions.x-is-maybe-value}}arbitraryReducedMaybeValue n{{/vendorExtensions.x-is-maybe-value}}{{/required}} -- {{name}} :: {{^required}}Maybe {{/required}}{{{vendorExtensions.x-data-type}}}
   {{#hasMore}}  <*> {{/hasMore}}{{/vars}}{{/isAlias}}
 {{/isEnum}}
 {{/model}}

modules/openapi-generator/src/main/resources/haskell-servant/API.mustache

@@ -68,13 +68,13 @@ import           Web.HttpApiData
 
 
 {{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}{{#hasFormParams}}
-data {{vendorExtensions.x-formName}} = {{vendorExtensions.x-formName}}
+data {{vendorExtensions.x-form-name}} = {{vendorExtensions.x-form-name}}
-  { {{#formParams}}{{vendorExtensions.x-formPrefix}}{{vendorExtensions.x-formParamName}} :: {{dataType}}{{#hasMore}}
+  { {{#formParams}}{{vendorExtensions.x-form-prefix}}{{vendorExtensions.x-form-param-name}} :: {{dataType}}{{#hasMore}}
   , {{/hasMore}}{{/formParams}}
   } deriving (Show, Eq, Generic, Data)
 
-instance FromForm {{vendorExtensions.x-formName}}
+instance FromForm {{vendorExtensions.x-form-name}}
-instance ToForm {{vendorExtensions.x-formName}}
+instance ToForm {{vendorExtensions.x-form-name}}
 {{/hasFormParams}}{{/operation}}{{/operations}}{{/apis}}{{/apiInfo}}
 
 -- | List of elements parsed from a query.
@@ -130,7 +130,7 @@ formatSeparatedQueryList char = T.intercalate (T.singleton char) . map toQueryPa
 {{#apiInfo}}
 -- | Servant type-level API, generated from the OpenAPI spec for {{title}}.
 type {{title}}API
-    =    {{#apis}}{{#operations}}{{#operation}}{{& vendorExtensions.x-routeType}} -- '{{operationId}}' route{{#hasMore}}
+    =    {{#apis}}{{#operations}}{{#operation}}{{& vendorExtensions.x-route-type}} -- '{{operationId}}' route{{#hasMore}}
     :<|> {{/hasMore}}{{/operation}}{{/operations}}{{#hasMore}}
     :<|> {{/hasMore}}{{/apis}}{{#serveStatic}}
     :<|> Raw {{/serveStatic}}
@@ -155,7 +155,7 @@ newtype {{title}}ClientError = {{title}}ClientError ClientError
 -- is a backend that executes actions by sending HTTP requests (see @create{{title}}Client@). Alternatively, provided
 -- a backend, the API can be served using @run{{title}}MiddlewareServer@.
 data {{title}}Backend m = {{title}}Backend
-  { {{#apis}}{{#operations}}{{#operation}}{{operationId}} :: {{& vendorExtensions.x-clientType}}{- ^ {{& notes}} -}{{#hasMore}}
+  { {{#apis}}{{#operations}}{{#operation}}{{operationId}} :: {{& vendorExtensions.x-client-type}}{- ^ {{& notes}} -}{{#hasMore}}
   , {{/hasMore}}{{/operation}}{{/operations}}{{#hasMore}}
   , {{/hasMore}}{{/apis}}
   }

modules/openapi-generator/src/main/resources/haskell-servant/Types.mustache

@@ -34,7 +34,7 @@ import Data.Function ((&))
 {{#model}}
 
 -- | {{description}}
-{{^vendorExtensions.x-customNewtype}}
+{{^vendorExtensions.x-custom-newtype}}
 {{^parent}}
 {{vendorExtensions.x-data}} {{classname}} = {{classname}}
   { {{#vars}}{{& name}} :: {{^required}}Maybe {{/required}}{{dataType}} -- ^ {{& description}}{{#hasMore}}
@@ -57,10 +57,10 @@ instance ToSchema {{classname}} where
 newtype {{classname}} = {{classname}} { un{{classname}} :: {{parent}} }
   deriving (Show, Eq, FromJSON, ToJSON, Generic, Data)
 {{/parent}}
-{{/vendorExtensions.x-customNewtype}}
+{{/vendorExtensions.x-custom-newtype}}
-{{#vendorExtensions.x-customNewtype}}
+{{#vendorExtensions.x-custom-newtype}}
-newtype {{classname}} = {{classname}} {{vendorExtensions.x-customNewtype}} deriving (Show, Eq, FromJSON, ToJSON, Generic)
+newtype {{classname}} = {{classname}} {{vendorExtensions.x-custom-newtype}} deriving (Show, Eq, FromJSON, ToJSON, Generic)
-{{/vendorExtensions.x-customNewtype}}
+{{/vendorExtensions.x-custom-newtype}}
 {{/model}}
 {{/models}}
 

modules/openapi-generator/src/main/resources/htmlDocs2/index.mustache

@@ -218,7 +218,7 @@
 
                         <div class="tab-content">
                           <div class="tab-pane active" id="examples-{{baseName}}-{{nickname}}-0-curl">
-                            <pre class="prettyprint"><code class="language-bsh">curl -X {{vendorExtensions.x-codegen-httpMethodUpperCase}}{{#authMethods}}{{#isApiKey}}{{#isKeyInHeader}} -H "{{keyParamName}}: [[apiKey]]"{{/isKeyInHeader}}{{/isApiKey}}{{#isBasic}}{{#hasProduces}} -H "Accept: {{#produces}}{{{mediaType}}}{{#hasMore}},{{/hasMore}}{{/produces}}"{{/hasProduces}}{{#hasConsumes}} -H "Content-Type: {{#consumes}}{{{mediaType}}}{{#hasMore}},{{/hasMore}}{{/consumes}}"{{/hasConsumes}} -H "Authorization: Basic [[basicHash]]"{{/isBasic}}{{/authMethods}} "{{basePath}}{{path}}{{#hasQueryParams}}?{{#queryParams}}{{^-first}}&{{/-first}}{{baseName}}={{vendorExtensions.x-eg}}{{/queryParams}}{{/hasQueryParams}}"</code></pre>
+                            <pre class="prettyprint"><code class="language-bsh">curl -X {{vendorExtensions.x-codegen-http-method-upper-case}}{{#authMethods}}{{#isApiKey}}{{#isKeyInHeader}} -H "{{keyParamName}}: [[apiKey]]"{{/isKeyInHeader}}{{/isApiKey}}{{#isBasic}}{{#hasProduces}} -H "Accept: {{#produces}}{{{mediaType}}}{{#hasMore}},{{/hasMore}}{{/produces}}"{{/hasProduces}}{{#hasConsumes}} -H "Content-Type: {{#consumes}}{{{mediaType}}}{{#hasMore}},{{/hasMore}}{{/consumes}}"{{/hasConsumes}} -H "Authorization: Basic [[basicHash]]"{{/isBasic}}{{/authMethods}} "{{basePath}}{{path}}{{#hasQueryParams}}?{{#queryParams}}{{^-first}}&{{/-first}}{{baseName}}={{vendorExtensions.x-eg}}{{/queryParams}}{{/hasQueryParams}}"</code></pre>
                           </div>
                           <div class="tab-pane" id="examples-{{baseName}}-{{nickname}}-0-java">
                             <pre class="prettyprint"><code class="language-java">{{>sample_java}}</code></pre>

modules/openapi-generator/src/main/resources/htmlDocs2/param.mustache

@@ -21,13 +21,13 @@
                 {{/description}}
             </div>
             {{#isEnum}}
-                {{#vendorExtensions.x-eumFormatted}}
+                {{#vendorExtensions.x-eum-formatted}}
                     <div class="inner enums" id="{{nickname}}_{{paramName}}_enum">
                         <span class="inner">
-                            <b>Enum: </b>{{{vendorExtensions.x-eumFormatted}}}
+                            <b>Enum: </b>{{{vendorExtensions.x-eum-formatted}}}
                         </span>
                     </div>
-                {{/vendorExtensions.x-eumFormatted}}
+                {{/vendorExtensions.x-eum-formatted}}
             {{/isEnum}}
             {{#required}}
                 <div class="inner required">

modules/openapi-generator/src/main/resources/htmlDocs2/sample_objc.mustache

@@ -19,7 +19,7 @@
 {{classname}} *apiInstance = [[{{classname}} alloc] init];
 
 {{#summary}}// {{{.}}}
-{{/summary}}[apiInstance {{#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}}
+{{/summary}}[apiInstance {{#vendorExtensions.x-objc-operationId}}{{vendorExtensions.x-objc-operationId}}{{/vendorExtensions.x-objc-operationId}}{{^vendorExtensions.x-objc-operationId}}{{nickname}}{{#hasParams}}With{{vendorExtensions.x-first-param-alt-name}}{{/hasParams}}{{^hasParams}}WithCompletionHandler: {{/hasParams}}{{/vendorExtensions.x-objc-operationId}}{{#allParams}}{{#secondaryParam}}
     {{paramName}}{{/secondaryParam}}:{{paramName}}{{/allParams}}
               {{#hasParams}}completionHandler: {{/hasParams}}^({{#returnBaseType}}{{{returnType}}} output, {{/returnBaseType}}NSError* error) {
 {{#returnType}}

modules/openapi-generator/src/main/resources/java-msf4j-server/pojo.mustache

@@ -76,9 +76,9 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{/maximum}}
    * @return {{name}}
   **/
-  {{#vendorExtensions.extraAnnotation}}
+  {{#vendorExtensions.x-extra-annotation}}
-  {{{vendorExtensions.extraAnnotation}}}
+  {{{vendorExtensions.x-extra-annotation}}}
-  {{/vendorExtensions.extraAnnotation}}
+  {{/vendorExtensions.x-extra-annotation}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};

modules/openapi-generator/src/main/resources/java-pkmst/pojo.mustache

@@ -81,9 +81,9 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{/maximum}}
    * @return {{name}}
   **/
- {{#vendorExtensions.extraAnnotation}}
+ {{#vendorExtensions.x-extra-annotation}}
-  {{{vendorExtensions.extraAnnotation}}}
+  {{{vendorExtensions.x-extra-annotation}}}
-  {{/vendorExtensions.extraAnnotation}}
+  {{/vendorExtensions.x-extra-annotation}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}{{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}")
 {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};

modules/openapi-generator/src/main/resources/java-undertow-server/pojo.mustache

@@ -19,7 +19,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
     return this;
   }
 
-  {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
+  {{#vendorExtensions.x-extra-annotation}}{{{vendorExtensions.x-extra-annotation}}}{{/vendorExtensions.x-extra-annotation}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   @JsonProperty("{{baseName}}")
   public {{{datatypeWithEnum}}} {{getter}}() {

modules/openapi-generator/src/main/resources/objc/NSManagedObject-header.mustache

@@ -35,10 +35,10 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)removeEntries:(NSOrderedSet<{{{arrayModelType}}}ManagedObject*> *)values;
 {{/isArrayModel}}
 {{^isArrayModel}}
-{{#vars}}{{#isListContainer}}{{#complexType}}- (void)add{{vendorExtensions.x-uppercaseName}}Object:({{complexType}}ManagedObject *)value;
+{{#vars}}{{#isListContainer}}{{#complexType}}- (void)add{{vendorExtensions.x-uppercase-name}}Object:({{complexType}}ManagedObject *)value;
-- (void)remove{{vendorExtensions.x-uppercaseName}}Object:({{complexType}}ManagedObject *)value;
+- (void)remove{{vendorExtensions.x-uppercase-name}}Object:({{complexType}}ManagedObject *)value;
-- (void)add{{vendorExtensions.x-uppercaseName}}:(NSOrderedSet<{{{complexType}}}ManagedObject*> *)values;
+- (void)add{{vendorExtensions.x-uppercase-name}}:(NSOrderedSet<{{{complexType}}}ManagedObject*> *)values;
-- (void)remove{{vendorExtensions.x-uppercaseName}}:(NSOrderedSet<{{{complexType}}}ManagedObject*> *)values;
+- (void)remove{{vendorExtensions.x-uppercase-name}}:(NSOrderedSet<{{{complexType}}}ManagedObject*> *)values;
 {{/complexType}}{{/isListContainer}}{{/vars}}
 {{/isArrayModel}}
 @end

modules/openapi-generator/src/main/resources/objc/README.mustache

@@ -87,7 +87,7 @@ Please follow the [installation procedure](#installation--usage) and then run th
 {{classname}} *apiInstance = [[{{classname}} alloc] init];
 
 {{#summary}}// {{{.}}}
-{{/summary}}[apiInstance {{#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}}
+{{/summary}}[apiInstance {{#vendorExtensions.x-objc-operationId}}{{vendorExtensions.x-objc-operationId}}{{/vendorExtensions.x-objc-operationId}}{{^vendorExtensions.x-objc-operationId}}{{nickname}}{{#hasParams}}With{{vendorExtensions.x-first-param-alt-name}}{{/hasParams}}{{^hasParams}}WithCompletionHandler: {{/hasParams}}{{/vendorExtensions.x-objc-operationId}}{{#allParams}}{{#secondaryParam}}
     {{paramName}}{{/secondaryParam}}:{{paramName}}{{/allParams}}
               {{#hasParams}}completionHandler: {{/hasParams}}^({{#returnBaseType}}{{{returnType}}} output, {{/returnBaseType}}NSError* error) {
 {{#returnType}}

modules/openapi-generator/src/main/resources/objc/api-body.mustache

@@ -59,7 +59,7 @@ NSInteger k{{classname}}MissingParamErrorCode = 234513;
 ///
 /// {{/allParams}} @returns {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
 ///
--(NSURLSessionTask*) {{#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}}
+-(NSURLSessionTask*) {{#vendorExtensions.x-objc-operationId}}{{vendorExtensions.x-objc-operationId}}{{/vendorExtensions.x-objc-operationId}}{{^vendorExtensions.x-objc-operationId}}{{nickname}}{{#hasParams}}With{{vendorExtensions.x-first-param-alt-name}}{{/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}}

modules/openapi-generator/src/main/resources/objc/api-header.mustache

@@ -23,7 +23,7 @@ extern NSInteger k{{classname}}MissingParamErrorCode;
 ///  code:{{{code}}} message:"{{{message}}}"{{#hasMore}},{{/hasMore}}{{/responses}}
 ///
 /// @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
--(NSURLSessionTask*) {{#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}}
+-(NSURLSessionTask*) {{#vendorExtensions.x-objc-operationId}}{{vendorExtensions.x-objc-operationId}}{{/vendorExtensions.x-objc-operationId}}{{^vendorExtensions.x-objc-operationId}}{{nickname}}{{#hasParams}}With{{vendorExtensions.x-first-param-alt-name}}{{/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;
 

modules/openapi-generator/src/main/resources/objc/api_doc.mustache

@@ -12,7 +12,7 @@ Method | HTTP request | Description
 {{#operation}}
 # **{{{operationId}}}**
 ```objc
--(NSURLSessionTask*) {{#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}}
+-(NSURLSessionTask*) {{#vendorExtensions.x-objc-operationId}}{{vendorExtensions.x-objc-operationId}}{{/vendorExtensions.x-objc-operationId}}{{^vendorExtensions.x-objc-operationId}}{{nickname}}{{#hasParams}}With{{vendorExtensions.x-first-param-alt-name}}{{/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;
 ```
@@ -45,7 +45,7 @@ Method | HTTP request | Description
 {{classname}}*apiInstance = [[{{classname}} alloc] init];
 
 {{#summary}}// {{{.}}}
-{{/summary}}[apiInstance {{#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}}
+{{/summary}}[apiInstance {{#vendorExtensions.x-objc-operationId}}{{vendorExtensions.x-objc-operationId}}{{/vendorExtensions.x-objc-operationId}}{{^vendorExtensions.x-objc-operationId}}{{nickname}}{{#hasParams}}With{{vendorExtensions.x-first-param-alt-name}}{{/hasParams}}{{^hasParams}}WithCompletionHandler: {{/hasParams}}{{/vendorExtensions.x-objc-operationId}}{{#allParams}}{{#secondaryParam}}
               {{paramName}}{{/secondaryParam}}:{{paramName}}{{/allParams}}
           {{#hasParams}}completionHandler: {{/hasParams}}^({{#returnBaseType}}{{{returnType}}} output, {{/returnBaseType}}NSError* error) {
 {{#returnType}}

modules/openapi-generator/src/main/resources/ocaml/api-impl.mustache

@@ -60,7 +60,7 @@ let {{{operationId}}} {{^hasParams}}(){{/hasParams}}{{#allParams}}{{> to_param}}
     Request.handle_unit_response resp
 {{/returnType}}
 {{#returnType}}
-    Request.read_json_body{{#returnContainer}}{{#isListContainer}}_as_list{{/isListContainer}}{{#isMapContainer}}_as_map{{/isMapContainer}}{{#returnBaseType}}{{^vendorExtensions.x-returnFreeFormObject}}_of{{/vendorExtensions.x-returnFreeFormObject}}{{/returnBaseType}}{{/returnContainer}}{{^returnContainer}}{{#returnBaseType}}{{^vendorExtensions.x-returnFreeFormObject}}_as{{/vendorExtensions.x-returnFreeFormObject}}{{/returnBaseType}}{{/returnContainer}} {{#returnType}}{{^vendorExtensions.x-returnFreeFormObject}}({{> of_json}}){{/vendorExtensions.x-returnFreeFormObject}}{{/returnType}} resp body
+    Request.read_json_body{{#returnContainer}}{{#isListContainer}}_as_list{{/isListContainer}}{{#isMapContainer}}_as_map{{/isMapContainer}}{{#returnBaseType}}{{^vendorExtensions.x-return-free-form-object}}_of{{/vendorExtensions.x-return-free-form-object}}{{/returnBaseType}}{{/returnContainer}}{{^returnContainer}}{{#returnBaseType}}{{^vendorExtensions.x-return-free-form-object}}_as{{/vendorExtensions.x-return-free-form-object}}{{/returnBaseType}}{{/returnContainer}} {{#returnType}}{{^vendorExtensions.x-return-free-form-object}}({{> of_json}}){{/vendorExtensions.x-return-free-form-object}}{{/returnType}} resp body
 {{/returnType}}
 
 {{/operation}}

modules/openapi-generator/src/main/resources/php-symfony/README.mustache

@@ -112,7 +112,7 @@ class {{baseName}}Api implements {{classname}} // An interface is autogenerated
     /**
      * Implementation of {{classname}}#{{operationId}}
      */
-    public function {{operationId}}({{#allParams}}{{#vendorExtensions.x-parameterType}}{{vendorExtensions.x-parameterType}} {{/vendorExtensions.x-parameterType}}${{paramName}}{{^required}} = {{#defaultValue}}'{{{.}}}'{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
+    public function {{operationId}}({{#allParams}}{{#vendorExtensions.x-parameter-type}}{{vendorExtensions.x-parameter-type}} {{/vendorExtensions.x-parameter-type}}${{paramName}}{{^required}} = {{#defaultValue}}'{{{.}}}'{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
     {
         // Implement the operation ...
     }

modules/openapi-generator/src/main/resources/php-symfony/api.mustache

@@ -57,15 +57,15 @@ interface {{classname}}
      *
     {{/description}}
     {{#allParams}}
-     * @param  {{vendorExtensions.x-commentType}} ${{paramName}}  {{description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
+     * @param  {{vendorExtensions.x-comment-type}} ${{paramName}}  {{description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
     {{/allParams}}
      * @param  integer $responseCode     The HTTP response code to return
      * @param  array   $responseHeaders  Additional HTTP headers to return with the response ()
      *
-     * @return {{{vendorExtensions.x-commentType}}}
+     * @return {{{vendorExtensions.x-comment-type}}}
      *
      */
-    public function {{operationId}}({{#allParams}}{{#vendorExtensions.x-parameterType}}{{vendorExtensions.x-parameterType}} {{/vendorExtensions.x-parameterType}}${{paramName}}{{^required}} = {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/required}}, {{/allParams}}&$responseCode, array &$responseHeaders);
+    public function {{operationId}}({{#allParams}}{{#vendorExtensions.x-parameter-type}}{{vendorExtensions.x-parameter-type}} {{/vendorExtensions.x-parameter-type}}${{paramName}}{{^required}} = {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/required}}, {{/allParams}}&$responseCode, array &$responseHeaders);
 {{/operation}}
 }
 {{/operations}}

modules/openapi-generator/src/main/resources/php-symfony/api_doc.mustache

@@ -62,7 +62,7 @@ class {{baseName}}Api implements {{classname}}
     /**
      * Implementation of {{classname}}#{{operationId}}
      */
-    public function {{operationId}}({{#allParams}}{{#vendorExtensions.x-parameterType}}{{vendorExtensions.x-parameterType}} {{/vendorExtensions.x-parameterType}}${{paramName}}{{^required}} = {{#defaultValue}}'{{{.}}}'{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
+    public function {{operationId}}({{#allParams}}{{#vendorExtensions.x-parameter-type}}{{vendorExtensions.x-parameter-type}} {{/vendorExtensions.x-parameter-type}}${{paramName}}{{^required}} = {{#defaultValue}}'{{{.}}}'{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
     {
         // Implement the operation ...
     }

modules/openapi-generator/src/main/resources/php-symfony/model_generic.mustache

@@ -21,7 +21,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}
     /**
      * Gets {{name}}.
      *
-     * @return {{{vendorExtensions.x-commentType}}}{{^required}}|null{{/required}}
+     * @return {{{vendorExtensions.x-comment-type}}}{{^required}}|null{{/required}}
      */
     public function {{getter}}()
     {
@@ -31,11 +31,11 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}
     /**
      * Sets {{name}}.
      *
-     * @param {{{vendorExtensions.x-commentType}}}{{^required}}|null{{/required}} ${{name}}{{#description}}  {{{description}}}{{/description}}
+     * @param {{{vendorExtensions.x-comment-type}}}{{^required}}|null{{/required}} ${{name}}{{#description}}  {{{description}}}{{/description}}
      *
      * @return $this
      */
-    public function {{setter}}({{#vendorExtensions.x-parameterType}}{{vendorExtensions.x-parameterType}} {{/vendorExtensions.x-parameterType}}${{name}}{{^required}} = null{{/required}})
+    public function {{setter}}({{#vendorExtensions.x-parameter-type}}{{vendorExtensions.x-parameter-type}} {{/vendorExtensions.x-parameter-type}}${{name}}{{^required}} = null{{/required}})
     {
         $this->{{name}} = ${{name}};
 

modules/openapi-generator/src/main/resources/php-symfony/model_variables.mustache

@@ -3,7 +3,7 @@
      * {{description}}
      *
     {{/description}}
-     * @var {{{vendorExtensions.x-commentType}}}{{^required}}|null{{/required}}
+     * @var {{{vendorExtensions.x-comment-type}}}{{^required}}|null{{/required}}
      * @SerializedName("{{baseName}}")
 {{#required}}
      * @Assert\NotNull()

modules/openapi-generator/src/main/resources/php/api_test.mustache

@@ -69,7 +69,7 @@ use PHPUnit\Framework\TestCase;
      * {{{summary}}}.
      *
      */
-    public function test{{vendorExtensions.x-testOperationId}}()
+    public function test{{vendorExtensions.x-test-operation-id}}()
     {
     }
     {{/operation}}

modules/openapi-generator/src/main/resources/rust-server/client-mod.mustache

@@ -419,7 +419,7 @@ impl<F, C> Api<C> for Client<F> where
 {{/vendorExtensions}}
 
         request.headers_mut().set(XSpanId((context as &dyn Has<XSpanIdString>).get().0.clone()));
-{{#vendorExtensions.hasHeaderAuthMethods}}
+{{#vendorExtensions.x-has-header-auth-methods}}
 
         (context as &dyn Has<Option<AuthData>>).get().as_ref().map(|auth_data| {
             // Currently only authentication with Basic, API Key, and Bearer are supported
@@ -462,14 +462,14 @@ impl<F, C> Api<C> for Client<F> where
                 _ => {}
             }
         });
-{{/vendorExtensions.hasHeaderAuthMethods}}
+{{/vendorExtensions.x-has-header-auth-methods}}
 {{#headerParams}}
 {{#-first}}
 
         // Header parameters
-{{/-first}}{{^isMapContainer}}        header! { (Request{{vendorExtensions.typeName}}, "{{{baseName}}}") => {{#isListContainer}}({{{baseType}}})*{{/isListContainer}}{{^isListContainer}}[{{{dataType}}}]{{/isListContainer}} }
+{{/-first}}{{^isMapContainer}}        header! { (Request{{vendorExtensions.x-type-name}}, "{{{baseName}}}") => {{#isListContainer}}({{{baseType}}})*{{/isListContainer}}{{^isListContainer}}[{{{dataType}}}]{{/isListContainer}} }
-{{#required}}        request.headers_mut().set(Request{{vendorExtensions.typeName}}(param_{{{paramName}}}{{#isListContainer}}.clone(){{/isListContainer}}));
+{{#required}}        request.headers_mut().set(Request{{vendorExtensions.x-type-name}}(param_{{{paramName}}}{{#isListContainer}}.clone(){{/isListContainer}}));
-{{/required}}{{^required}}        param_{{{paramName}}}.map(|header| request.headers_mut().set(Request{{vendorExtensions.typeName}}(header{{#isListContainer}}.clone(){{/isListContainer}})));
+{{/required}}{{^required}}        param_{{{paramName}}}.map(|header| request.headers_mut().set(Request{{vendorExtensions.x-type-name}}(header{{#isListContainer}}.clone(){{/isListContainer}})));
 {{/required}}{{/isMapContainer}}{{#isMapContainer}}                let param_{{{paramName}}}: Option<{{{dataType}}}> = None;
 {{/isMapContainer}}
 {{/headerParams}}

modules/openapi-generator/src/main/resources/rust-server/models.mustache

@@ -72,14 +72,14 @@ impl ::std::convert::From<{{{dataType}}}> for {{{classname}}} {
     }
 }
 
-{{#vendorExtensions.isString}}
+{{#vendorExtensions.x-is-string}}
 impl std::str::FromStr for {{{classname}}} {
     type Err = ParseError;
     fn from_str(x: &str) -> Result<Self, Self::Err> {
         Ok({{{classname}}}(x.to_string()))
     }
 }
-{{/vendorExtensions.isString}}
+{{/vendorExtensions.x-is-string}}
 
 impl ::std::convert::From<{{{classname}}}> for {{{dataType}}} {
     fn from(x: {{{classname}}}) -> Self {

modules/openapi-generator/src/main/resources/rust-server/server-mod.mustache

@@ -141,7 +141,7 @@ where
         match &method {
 {{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}
             // {{{operationId}}} - {{{httpMethod}}} {{{path}}}
-            &hyper::Method::{{vendorExtensions.HttpMethod}} if path.matched(paths::ID_{{vendorExtensions.PATH_ID}}) => {
+            &hyper::Method::{{vendorExtensions.x-http-method}} if path.matched(paths::ID_{{vendorExtensions.x-path-id}}) => {
 {{#hasAuthMethods}}
                 {
                     let authorization = match (&context as &dyn Has<Option<Authorization>>).get() {
@@ -207,15 +207,15 @@ where
   {{#-first}}
                 // Header parameters
   {{/-first}}
-                header! { (Request{{vendorExtensions.typeName}}, "{{{baseName}}}") => {{#isListContainer}}({{{baseType}}})*{{/isListContainer}}{{^isListContainer}}[{{{dataType}}}]{{/isListContainer}} }
+                header! { (Request{{vendorExtensions.x-type-name}}, "{{{baseName}}}") => {{#isListContainer}}({{{baseType}}})*{{/isListContainer}}{{^isListContainer}}[{{{dataType}}}]{{/isListContainer}} }
   {{#required}}
-                let param_{{{paramName}}} = match headers.get::<Request{{vendorExtensions.typeName}}>() {
+                let param_{{{paramName}}} = match headers.get::<Request{{vendorExtensions.x-type-name}}>() {
                     Some(param_{{{paramName}}}) => param_{{{paramName}}}.0.clone(),
                     None => return Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body("Missing or invalid required header {{{baseName}}}"))),
                 };
   {{/required}}
   {{^required}}
-                let param_{{{paramName}}} = headers.safe_get::<Request{{vendorExtensions.typeName}}>().map(|header| header.0.clone());
+                let param_{{{paramName}}} = headers.safe_get::<Request{{vendorExtensions.x-type-name}}>().map(|header| header.0.clone());
   {{/required}}
 {{/headerParams}}
 {{#queryParams}}
@@ -551,7 +551,7 @@ impl RequestParser for ApiRequestParser {
         match request.method() {
 {{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}
             // {{{operationId}}} - {{{httpMethod}}} {{{path}}}
-            &hyper::Method::{{{vendorExtensions.HttpMethod}}} if path.matched(paths::ID_{{{vendorExtensions.PATH_ID}}}) => Ok("{{{operationId}}}"),
+            &hyper::Method::{{{vendorExtensions.x-http-method}}} if path.matched(paths::ID_{{{vendorExtensions.x-path-id}}}) => Ok("{{{operationId}}}"),
 {{/operation}}{{/operations}}{{/apis}}{{/apiInfo}}            _ => Err(()),
         }
     }

modules/openapi-generator/src/main/resources/rust/model.mustache

@@ -21,7 +21,7 @@ pub enum {{classname}} {
 {{!-- for schemas that have a discriminator --}}
 {{#discriminator}}
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(tag = "{{{vendorExtensions.tagName}}}")]
+#[serde(tag = "{{{vendorExtensions.x-tag-name}}}")]
 pub enum {{classname}} {
 {{#vendorExtensions}}
     {{#mappedModels}}

modules/openapi-generator/src/main/resources/scala-finch/DataAccessor.mustache

@@ -22,7 +22,7 @@ trait DataAccessor {
         * {{{description}}}
         * @return A {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}
         */
-        def {{baseName}}_{{operationId}}({{{vendorExtensions.x-codegen-typedParams}}}): Either[CommonError,{{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}] = Left(TODO)
+        def {{baseName}}_{{operationId}}({{{vendorExtensions.x-codegen-typed-params}}}): Either[CommonError,{{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}] = Left(TODO)
 
     {{/operation}}
 {{/operations}}

modules/openapi-generator/src/main/resources/scala-finch/api.mustache

@@ -58,7 +58,7 @@ object {{classname}} {
         * @return An endpoint representing a {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}
         */
         private def {{operationId}}(da: DataAccessor): Endpoint[{{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}] =
-        {{httpMethod}}({{{vendorExtensions.x-codegen-paths}}}) { {{#vendorExtensions.x-codegen-typedParams}}({{{vendorExtensions.x-codegen-typedParams}}}) =>{{/vendorExtensions.x-codegen-typedParams}}
+        {{httpMethod}}({{{vendorExtensions.x-codegen-paths}}}) { {{#vendorExtensions.x-codegen-typed-params}}({{{vendorExtensions.x-codegen-typed-params}}}) =>{{/vendorExtensions.x-codegen-typed-params}}
           da.{{baseName}}_{{operationId}}({{{vendorExtensions.x-codegen-params}}}) match {
             case Left(error) => checkError(error)
             case Right(data) => Ok(data)

modules/openapi-generator/src/main/resources/scala-play-server/caseClass.mustache

@@ -8,14 +8,14 @@ case class {{classname}}(
 )
 
 object {{classname}} {
-  {{^vendorExtensions.hasFiles}}
+  {{^vendorExtensions.x-has-files}}
   implicit lazy val {{classVarName}}JsonFormat: Format[{{classname}}] = {{^isMapModel}}Json.format[{{classname}}]{{/isMapModel}}{{#isMapModel}}{
     {{#lambda.indented_4}}{{>extensibleObjectJsonFormat}}{{/lambda.indented_4}}
   }{{/isMapModel}}
-  {{/vendorExtensions.hasFiles}}
+  {{/vendorExtensions.x-has-files}}
-  {{#vendorExtensions.hasFiles}}
+  {{#vendorExtensions.x-has-files}}
   // NOTE: The JSON format for {{classname}} was not generated because it contains a file variable which cannot be encoded to JSON.
-  {{/vendorExtensions.hasFiles}}
+  {{/vendorExtensions.x-has-files}}
   {{#vars}}
   {{#isEnum}}
 

modules/openapi-generator/src/main/resources/scala-play-server/conf/routes.mustache

@@ -10,16 +10,16 @@
 
 {{#operations}}
 {{#operation}}
-{{^vendorExtensions.hasPathParams}}
+{{^vendorExtensions.x-has-path-params}}
-{{httpMethod}} {{{contextPath}}}{{{vendorExtensions.paddedPath}}}    {{apiPackage}}.{{classname}}Controller.{{operationId}}()
+{{httpMethod}} {{{contextPath}}}{{{vendorExtensions.x-padded-path}}}    {{apiPackage}}.{{classname}}Controller.{{operationId}}()
-{{/vendorExtensions.hasPathParams}}
+{{/vendorExtensions.x-has-path-params}}
 {{/operation}}
 {{/operations}}
 {{#operations}}
 {{#operation}}
-{{#vendorExtensions.hasPathParams}}
+{{#vendorExtensions.x-has-path-params}}
-{{httpMethod}} {{{contextPath}}}{{{vendorExtensions.paddedPath}}}    {{apiPackage}}.{{classname}}Controller.{{operationId}}({{#pathParams}}{{paramName}}: {{#isUuid}}java.util.UUID{{/isUuid}}{{^isUuid}}{{{dataType}}}{{/isUuid}}{{#hasMore}}, {{/hasMore}}{{/pathParams}})
+{{httpMethod}} {{{contextPath}}}{{{vendorExtensions.x-padded-path}}}    {{apiPackage}}.{{classname}}Controller.{{operationId}}({{#pathParams}}{{paramName}}: {{#isUuid}}java.util.UUID{{/isUuid}}{{^isUuid}}{{{dataType}}}{{/isUuid}}{{#hasMore}}, {{/hasMore}}{{/pathParams}})
-{{/vendorExtensions.hasPathParams}}
+{{/vendorExtensions.x-has-path-params}}
 {{/operation}}
 {{/operations}}
 {{/apis}}

modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache

@@ -37,7 +37,7 @@ export class {{classname}} extends BaseAPI {
      * {{&summary}}
      {{/summary}}
      */
-    {{nickname}} = ({{#allParams.0}}{ {{#allParams}}{{paramName}}{{#vendorExtensions.paramNameAlternative}}: {{vendorExtensions.paramNameAlternative}}{{/vendorExtensions.paramNameAlternative}}{{^-last}}, {{/-last}}{{/allParams}} }: {{operationIdCamelCase}}Request{{/allParams.0}}): Observable<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}> => {
+    {{nickname}} = ({{#allParams.0}}{ {{#allParams}}{{paramName}}{{#vendorExtensions.x-param-name-alternative}}: {{vendorExtensions.x-param-name-alternative}}{{/vendorExtensions.x-param-name-alternative}}{{^-last}}, {{/-last}}{{/allParams}} }: {{operationIdCamelCase}}Request{{/allParams.0}}): Observable<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}> => {
         {{#hasParams}}
         {{#allParams}}
         {{#required}}

modules/openapi-generator/src/main/resources/typescript-rxjs/paramNamePartial.mustache

@@ -1,2 +1,2 @@
 {{! helper to output the alias of a parameter if provided and to not clutter the main template  }}
-{{#vendorExtensions.paramNameAlternative}}{{vendorExtensions.paramNameAlternative}}{{/vendorExtensions.paramNameAlternative}}{{^vendorExtensions.paramNameAlternative}}{{paramName}}{{/vendorExtensions.paramNameAlternative}}
+{{#vendorExtensions.x-param-name-alternative}}{{vendorExtensions.x-param-name-alternative}}{{/vendorExtensions.x-param-name-alternative}}{{^vendorExtensions.x-param-name-alternative}}{{paramName}}{{/vendorExtensions.x-param-name-alternative}}