Merge branch 'OpenAPITools:master' into generate_enums

OpenAPITools · Sep 16, 2022 · d224fe6 · d224fe6
2 parents cbaa34b + 048af8e
commit d224fe6
Show file tree

Hide file tree

Showing 246 changed files with 1,263 additions and 599 deletions.
diff --git a/docs/customization.md b/docs/customization.md
@@ -110,7 +110,7 @@ java -cp "out/generators/my-codegen/target/my-codegen-openapi-generator-1.0.0.ja
 Note the `my-codegen` is an option for `-g` now, and you can use the usual arguments for generating your code:
 
 ```sh
-java -cp out/codegens/customCodegen/target/my-codegen-openapi-generator-1.0.0.jar:modules/openapi-generator-cli/target/openapi-generator-cli.jar \
+java -cp out/generators/my-codegen/target/my-codegen-openapi-generator-1.0.0.jar:modules/openapi-generator-cli/target/openapi-generator-cli.jar \
   org.openapitools.codegen.OpenAPIGenerator generate -g my-codegen \
   -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
   -o ./out/myClient

diff --git a/docs/generators/php-dt.md b/docs/generators/php-dt.md
@@ -56,7 +56,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>bool</li>
 <li>boolean</li>
 <li>byte</li>
-<li>double</li>
 <li>float</li>
 <li>int</li>
 <li>integer</li>

diff --git a/docs/generators/php-laravel.md b/docs/generators/php-laravel.md
@@ -57,7 +57,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>bool</li>
 <li>boolean</li>
 <li>byte</li>
-<li>double</li>
 <li>float</li>
 <li>int</li>
 <li>integer</li>

diff --git a/docs/generators/php-lumen.md b/docs/generators/php-lumen.md
@@ -57,7 +57,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>bool</li>
 <li>boolean</li>
 <li>byte</li>
-<li>double</li>
 <li>float</li>
 <li>int</li>
 <li>integer</li>

diff --git a/docs/generators/php-mezzio-ph.md b/docs/generators/php-mezzio-ph.md
@@ -56,7 +56,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>bool</li>
 <li>boolean</li>
 <li>byte</li>
-<li>double</li>
 <li>float</li>
 <li>int</li>
 <li>integer</li>

diff --git a/docs/generators/php-slim-deprecated.md b/docs/generators/php-slim-deprecated.md
@@ -57,7 +57,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>bool</li>
 <li>boolean</li>
 <li>byte</li>
-<li>double</li>
 <li>float</li>
 <li>int</li>
 <li>integer</li>

diff --git a/docs/generators/php-slim4.md b/docs/generators/php-slim4.md
@@ -58,7 +58,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>bool</li>
 <li>boolean</li>
 <li>byte</li>
-<li>double</li>
 <li>float</li>
 <li>int</li>
 <li>integer</li>

diff --git a/docs/generators/php-symfony.md b/docs/generators/php-symfony.md
@@ -62,7 +62,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>array</li>
 <li>bool</li>
 <li>byte</li>
-<li>double</li>
 <li>float</li>
 <li>int</li>
 <li>mixed</li>

diff --git a/docs/generators/php.md b/docs/generators/php.md
@@ -58,7 +58,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>bool</li>
 <li>boolean</li>
 <li>byte</li>
-<li>double</li>
 <li>float</li>
 <li>int</li>
 <li>integer</li>

diff --git a/...penapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java b/...penapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java
@@ -91,7 +91,6 @@ public AbstractPhpCodegen() {
                         "boolean",
                         "int",
                         "integer",
-                        "double",
                         "float",
                         "string",
                         "object",
@@ -119,7 +118,7 @@ public AbstractPhpCodegen() {
         typeMapping.put("number", "float");
         typeMapping.put("float", "float");
         typeMapping.put("decimal", "float");
-        typeMapping.put("double", "double");
+        typeMapping.put("double", "float");
         typeMapping.put("string", "string");
         typeMapping.put("byte", "int");
         typeMapping.put("boolean", "bool");
@@ -656,7 +655,7 @@ public void setParameterExampleValue(CodegenParameter p) {
 
     @Override
     public String toEnumValue(String value, String datatype) {
-        if ("int".equals(datatype) || "double".equals(datatype) || "float".equals(datatype)) {
+        if ("int".equals(datatype) || "float".equals(datatype)) {
             return value;
         } else {
             return "\'" + escapeText(value) + "\'";
@@ -684,7 +683,7 @@ public String toEnumVarName(String name, String datatype) {
         }
 
         // number
-        if ("int".equals(datatype) || "double".equals(datatype) || "float".equals(datatype)) {
+        if ("int".equals(datatype) || "float".equals(datatype)) {
             String varName = name;
             varName = varName.replaceAll("-", "MINUS_");
             varName = varName.replaceAll("\\+", "PLUS_");

diff --git a/...erator/src/main/java/org/openapitools/codegen/languages/PhpDataTransferClientCodegen.java b/...erator/src/main/java/org/openapitools/codegen/languages/PhpDataTransferClientCodegen.java
@@ -92,9 +92,6 @@ public PhpDataTransferClientCodegen() {
                 .stability(Stability.BETA)
                 .build();
 
-        //no point to use double - http://php.net/manual/en/language.types.float.php , especially because of PHP 7+ float type declaration
-        typeMapping.put("double", "float");
-
         // remove these from primitive types to make the output works
         languageSpecificPrimitives.remove("\\DateTime");
         languageSpecificPrimitives.remove("\\SplFileObject");

diff --git a/...i-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java b/...i-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java
@@ -382,7 +382,7 @@ public String toEnumVarName(String value, String datatype) {
         }
 
         // number
-        if ("int".equals(datatype) || "double".equals(datatype) || "float".equals(datatype)) {
+        if ("int".equals(datatype) || "float".equals(datatype)) {
             String varName = "NUMBER_" + value;
             varName = varName.replaceAll("-", "MINUS_");
             varName = varName.replaceAll("\\+", "PLUS_");

diff --git a/...r/src/main/java/org/openapitools/codegen/languages/PhpMezzioPathHandlerServerCodegen.java b/...r/src/main/java/org/openapitools/codegen/languages/PhpMezzioPathHandlerServerCodegen.java
@@ -87,9 +87,6 @@ public PhpMezzioPathHandlerServerCodegen() {
                 )
         );
 
-        //no point to use double - http://php.net/manual/en/language.types.float.php , especially because of PHP 7+ float type declaration
-        typeMapping.put("double", "float");
-
         // remove these from primitive types to make the output works
         languageSpecificPrimitives.remove("\\DateTime");
         languageSpecificPrimitives.remove("\\SplFileObject");

diff --git a/...api-generator/src/main/java/org/openapitools/codegen/languages/PhpSilexServerCodegen.java b/...api-generator/src/main/java/org/openapitools/codegen/languages/PhpSilexServerCodegen.java
@@ -98,7 +98,6 @@ public PhpSilexServerCodegen() {
                         "boolean",
                         "int",
                         "integer",
-                        "double",
                         "float",
                         "string",
                         "object",
@@ -115,7 +114,7 @@ public PhpSilexServerCodegen() {
         typeMapping.put("integer", "int");
         typeMapping.put("long", "int");
         typeMapping.put("float", "float");
-        typeMapping.put("double", "double");
+        typeMapping.put("double", "float");
         typeMapping.put("string", "string");
         typeMapping.put("byte", "int");
         typeMapping.put("boolean", "boolean");

diff --git a/...i-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java b/...i-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java
@@ -147,7 +147,6 @@ public PhpSymfonyServerCodegen() {
                 Arrays.asList(
                         "bool",
                         "int",
-                        "double",
                         "float",
                         "string",
                         "object",
@@ -183,7 +182,7 @@ public PhpSymfonyServerCodegen() {
         typeMapping.put("decimal", "float");
         typeMapping.put("number", "float");
         typeMapping.put("float", "float");
-        typeMapping.put("double", "double");
+        typeMapping.put("double", "float");
         typeMapping.put("string", "string");
         typeMapping.put("byte", "int");
         typeMapping.put("boolean", "bool");
@@ -588,7 +587,7 @@ public String toModelImport(String name) {
 
     @Override
     public String toEnumValue(String value, String datatype) {
-        if ("int".equals(datatype) || "double".equals(datatype) || "float".equals(datatype)) {
+        if ("int".equals(datatype) || "float".equals(datatype)) {
             return value;
         } else {
             return "\"" + escapeText(value) + "\"";

diff --git a/...-generator/src/main/resources/python-experimental/model_templates/dict_partial.handlebars b/...-generator/src/main/resources/python-experimental/model_templates/dict_partial.handlebars
@@ -25,6 +25,7 @@ def discriminator(cls):
 {{/with}}
 {{/if}}
 {{#if vars}}
+
 class properties:
 {{#each vars}}
 {{#if complexType}}

diff --git a/...-generator/src/main/resources/python-experimental/model_templates/list_partial.handlebars b/...-generator/src/main/resources/python-experimental/model_templates/list_partial.handlebars
@@ -0,0 +1,11 @@
+{{#with items}}
+{{#if complexType}}
+
+@classmethod
+@property
+def {{baseName}}(cls) -> typing.Type['{{complexType}}']:
+    return {{complexType}}
+{{else}}
+{{> model_templates/schema }}
+{{/if}}
+{{/with}}
diff --git a/.../main/resources/python-experimental/model_templates/schema_composed_or_anytype.handlebars b/.../main/resources/python-experimental/model_templates/schema_composed_or_anytype.handlebars
@@ -11,9 +11,6 @@ class {{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}
     schemas.AnyTypeSchema,
     {{/if}}
 {{else}}
-    {{#if getHasMultipleTypes}}
-    schemas.SchemaTypeCheckerClsFactory(typing.Union[{{#if isNull}}schemas.NoneClass, {{/if}}{{#if isMap}}frozendict.frozendict, {{/if}}{{#if isArray}}tuple, {{/if}}{{#if isString }}str, {{/if}}{{#or isInteger isNumber}}decimal.Decimal, {{/or}}{{#if isBoolean}}schemas.BoolClass, {{/if}}]),
-    {{/if}}
     {{#if composedSchemas}}
     schemas.ComposedBase,
     {{/if}}
@@ -41,17 +38,9 @@ class {{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}
 {{#if getFormat}}
         format = '{{getFormat}}'
 {{/if}}
-{{#with items}}
-{{#if complexType}}
-
-        @classmethod
-        @property
-        def {{baseName}}(cls) -> typing.Type['{{complexType}}']:
-            return {{complexType}}
-{{else}}
-        {{> model_templates/schema }}
+{{#if getItems}}
+        {{> model_templates/list_partial }}
 {{/if}}
-{{/with}}
 {{#or additionalProperties getRequiredVarsMap getHasDiscriminatorWithNonEmptyMapping vars}}
         {{> model_templates/dict_partial }}
 {{/or}}

diff --git a/...i-generator/src/main/resources/python-experimental/model_templates/schema_dict.handlebars b/...i-generator/src/main/resources/python-experimental/model_templates/schema_dict.handlebars
@@ -14,13 +14,22 @@ class {{> model_templates/classname }}(
 {{/if}}
     """
 {{/if}}
+{{#if isStub}}
+{{#or additionalProperties getRequiredVarsMap getHasDiscriminatorWithNonEmptyMapping vars}}
+
+
+    class MetaOapg:
+        {{> model_templates/dict_partial }}
+{{/or}}
+{{else}}
+{{#or additionalProperties getRequiredVarsMap getHasDiscriminatorWithNonEmptyMapping vars hasValidation}}
 
 
     class MetaOapg:
         {{> model_templates/dict_partial }}
-{{#unless isStub}}
         {{> model_templates/validations }}
-{{/unless}}
+{{/or}}
+{{/if}}
     {{> model_templates/property_type_hints }}
 
     {{> model_templates/new }}
diff --git a/...i-generator/src/main/resources/python-experimental/model_templates/schema_list.handlebars b/...i-generator/src/main/resources/python-experimental/model_templates/schema_list.handlebars
@@ -14,23 +14,24 @@ class {{> model_templates/classname }}(
 {{/if}}
     """
 {{/if}}
+{{#if isStub}}
+{{#if items}}
 
 
     class MetaOapg:
-{{#unless isStub}}
-        {{> model_templates/validations }}
-{{/unless}}
-{{#with items}}
-{{#if complexType}}
-
-        @classmethod
-        @property
-        def {{baseName}}(cls) -> typing.Type['{{complexType}}']:
-            return {{complexType}}
+        {{> model_templates/list_partial }}
+{{/if}}
 {{else}}
-        {{> model_templates/schema }}
+{{#or getItems hasValidation}}
+
+
+    class MetaOapg:
+{{#if hasValidation}}
+        {{> model_templates/validations }}
+{{/if}}
+        {{> model_templates/list_partial }}
+{{/or}}
 {{/if}}
-{{/with}}
 
     {{> model_templates/new }}