Merge remote-tracking branch 'origin/master'

Author: jpfinne

.github/workflows/samples-postman.yaml

@@ -4,6 +4,7 @@ on:
   pull_request:
     paths:
       - samples/schema/postman-collection/python/**
+      - samples/schema/postman-collection/postman.json
       - .github/workflows/samples-postman.yaml
 jobs:
   build:

.github/workflows/samples-swift.yaml

@@ -41,7 +41,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-      - uses: swift-actions/setup-swift@v1
+      - uses: swift-actions/setup-swift@v2
         if: ${{ matrix.os == 'ubuntu-latest' }}
         with:
           swift-version: '5'

README.md

@@ -1114,8 +1114,9 @@ Here is a list of template creators:
    * GraphQL: @wing328 [:heart:](https://www.patreon.com/wing328)
    * Ktorm: @Luiz-Monad
    * MySQL: [@ybelenko](https://github.com/ybelenko)
+   * Postman Collection: @gcatanese
    * Protocol Buffer: @wing328
-   * WSDL @adessoDpd
+   * WSDL: @adessoDpd
 
 :heart: = Link to support the contributor directly
 

docs/customization.md

@@ -598,3 +598,10 @@ Example:
 ```
 java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g java -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -o /tmp/java-okhttp/ --openapi-normalizer FILTER="operationId:addPet|getPetById"
 ```
+
+- `SET_CONTAINER_TO_NULLABLE`: When set to `array|set|map` (or just `array`) for example, it will set `nullable` in array, set and map to true.
+
+Example:
+```
+java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g java -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -o /tmp/java-okhttp/ --openapi-normalizer SET_CONTAINER_TO_NULLABLE="array|map"
+```

docs/templating.md

@@ -822,6 +822,7 @@ Many generators (*those extending DefaultCodegen*) come with a small set of lamb
 - `uppercase` - Converts all of the characters in this fragment to upper case using the rules of the `ROOT` locale.
 - `titlecase` - Converts text in a fragment to title case. For example `once upon a time` to `Once Upon A Time`.
 - `camelcase` - Converts text in a fragment to camelCase. For example `Input-text` to `inputText`.
+- `uncamelize` - Converts text in a fragment from camelCase or PascalCase to a string of words separated by whitespaces. For example `inputText` to `Input Text`.
 - `indented` - Prepends 4 spaces indention from second line of a fragment on. First line will be indented by Mustache.
 - `indented_8` - Prepends 8 spaces indention from second line of a fragment on. First line will be indented by Mustache.
 - `indented_12` - Prepends 12 spaces indention from second line of a fragment on. First line will be indented by Mustache.

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

@@ -463,8 +463,9 @@ protected ImmutableMap.Builder<String, Lambda> addMustacheLambdas() {
                 .put("snakecase", new SnakecaseLambda())
                 .put("titlecase", new TitlecaseLambda())
                 .put("kebabcase", new KebabCaseLambda())
-                .put("camelcase", new CamelCaseLambda(true).generator(this))
-                .put("pascalcase", new CamelCaseLambda(false).generator(this))
+                .put("camelcase", new CamelCaseAndSanitizeLambda(true).generator(this))
+                .put("pascalcase", new CamelCaseAndSanitizeLambda(false).generator(this))
+                .put("uncamelize", new UncamelizeLambda())
                 .put("forwardslash", new ForwardSlashLambda())
                 .put("backslash", new BackSlashLambda())
                 .put("doublequote", new DoubleQuoteLambda())

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

@@ -101,10 +101,17 @@ public class OpenAPINormalizer {
     final String X_INTERNAL = "x-internal";
     boolean removeXInternal;
 
-    // when set (e.g. operationId:getPetById, addPet), filter out (or remove) everything else
+    // when set (e.g. operationId:getPetById|addPet), filter out (or remove) everything else
     final String FILTER = "FILTER";
     HashSet<String> operationIdFilters = new HashSet<>();
 
+    // when set (e.g. operationId:getPetById|addPet), filter out (or remove) everything else
+    final String SET_CONTAINER_TO_NULLABLE = "SET_CONTAINER_TO_NULLABLE";
+    HashSet<String> setContainerToNullable = new HashSet<>();
+    boolean updateArrayToNullable;
+    boolean updateSetToNullable;
+    boolean updateMapToNullable;
+
     // ============= end of rules =============
 
     /**
@@ -199,6 +206,23 @@ public void processRules(Map<String, String> inputRules) {
                 }
             }
         }
+
+        if (inputRules.get(SET_CONTAINER_TO_NULLABLE) != null) {
+            rules.put(SET_CONTAINER_TO_NULLABLE, true);
+            setContainerToNullable = new HashSet<>(Arrays.asList(inputRules.get(SET_CONTAINER_TO_NULLABLE).split("[|]")));
+            if (setContainerToNullable.contains("array")) {
+                updateArrayToNullable = true;
+            }
+            if (setContainerToNullable.contains("set")) {
+                updateSetToNullable = true;
+            }
+            if (setContainerToNullable.contains("map")) {
+                updateMapToNullable = true;
+            }
+            if (!updateArrayToNullable && !updateSetToNullable && !updateMapToNullable) {
+                LOGGER.error("SET_CONTAINER_TO_NULLABLE rule must be in the form of `array|set|map`, e.g. `set`, `array|map`: {}", inputRules.get(SET_CONTAINER_TO_NULLABLE));
+            }
+        }
     }
 
     /**
@@ -445,8 +469,10 @@ public Schema normalizeSchema(Schema schema, Set<Schema> visitedSchemas) {
         }
 
         if (schema instanceof ArraySchema) { // array
+            normalizeArraySchema(schema);
             normalizeSchema(schema.getItems(), visitedSchemas);
         } else if (schema.getAdditionalProperties() instanceof Schema) { // map
+            normalizeMapSchema(schema);
             normalizeSchema((Schema) schema.getAdditionalProperties(), visitedSchemas);
         } else if (ModelUtils.isOneOf(schema)) { // oneOf
             return normalizeOneOf(schema, visitedSchemas);
@@ -498,6 +524,14 @@ public Schema normalizeSchema(Schema schema, Set<Schema> visitedSchemas) {
         return schema;
     }
 
+    private Schema normalizeArraySchema(Schema schema) {
+        return processSetArraytoNullable(schema);
+    }
+
+    private Schema normalizeMapSchema(Schema schema) {
+        return processSetMapToNullable(schema);
+    }
+
     private Schema normalizeSimpleSchema(Schema schema, Set<Schema> visitedSchemas) {
         return processNormalize31Spec(schema, visitedSchemas);
     }
@@ -864,6 +898,60 @@ private Schema processSimplifyOneOf(Schema schema) {
         return schema;
     }
 
+    /**
+     * Set nullable to true in array/set if needed.
+     *
+     * @param schema Schema
+     * @return Schema
+     */
+    private Schema processSetArraytoNullable(Schema schema) {
+        if (!getRule(SET_CONTAINER_TO_NULLABLE)) {
+            return schema;
+        }
+
+        if (Boolean.TRUE.equals(schema.getUniqueItems())) { // a set
+            if (updateSetToNullable) {
+                if (schema.getNullable() != null || (schema.getExtensions() != null && schema.getExtensions().containsKey("x-nullable"))) {
+                    // already set, don't overwrite
+                    return schema;
+                }
+                schema.setNullable(true);
+            }
+        } else { // array
+            if (updateArrayToNullable) {
+                if (schema.getNullable() != null || (schema.getExtensions() != null && schema.getExtensions().containsKey("x-nullable"))) {
+                    // already set, don't overwrite
+                    return schema;
+                }
+                schema.setNullable(true);
+            }
+        }
+
+        return schema;
+    }
+
+    /**
+     * Set nullable to true in map if needed.
+     *
+     * @param schema Schema
+     * @return Schema
+     */
+    private Schema processSetMapToNullable(Schema schema) {
+        if (!getRule(SET_CONTAINER_TO_NULLABLE)) {
+            return schema;
+        }
+
+        if (updateMapToNullable) {
+            if (schema.getNullable() != null || (schema.getExtensions() != null && schema.getExtensions().containsKey("x-nullable"))) {
+                // already set, don't override
+                return schema;
+            }
+            schema.setNullable(true);
+        }
+
+        return schema;
+    }
+
     /**
      * If the schema is anyOf and the sub-schemas is null, set `nullable: true` instead.
      * If there's only one sub-schema, simply return the sub-schema directly.
@@ -1036,6 +1124,7 @@ private Schema processNormalize31Spec(Schema schema, Set<Schema> visitedSchemas)
                 as.setMaxItems(schema.getMaxItems());
                 as.setExtensions(schema.getExtensions());
                 as.setXml(schema.getXml());
+                as.setUniqueItems(schema.getUniqueItems());
                 if (schema.getItems() != null) {
                     // `items` is also a json schema
                     if (StringUtils.isNotEmpty(schema.getItems().get$ref())) {

modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/ExampleGenerator.java

@@ -37,7 +37,7 @@ public class ExampleGenerator {
     private static final String MIME_TYPE_JSON = "application/json";
     private static final String MIME_TYPE_XML = "application/xml";
 
-    protected final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd", Locale.ROOT);
+    protected final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.ROOT);
 
     private static final String EXAMPLE = "example";
     private static final String CONTENT_TYPE = "contentType";
@@ -57,7 +57,7 @@ public ExampleGenerator(Map<String, Schema> examples, OpenAPI openAPI) {
         this.openAPI = openAPI;
         // use a fixed seed to make the "random" numbers reproducible.
         this.random = new Random("ExampleGenerator".hashCode());
-        DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
+        dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
     }
 
     public List<Map<String, String>> generateFromResponseSchema(String statusCode, Schema responseSchema, Set<String> producesInfo) {
@@ -238,7 +238,7 @@ private Object resolvePropertyToExample(String propertyName, String mediaType, S
             // When a property is of type Date, we want to ensure that we're returning a formatted Date.
             // And not returning the Date object directly.
             if (property.getExample() instanceof Date) {
-                return DATE_FORMAT.format(property.getExample());
+                return dateFormat.format(property.getExample());
             }
             return property.getExample();
         } else if (ModelUtils.isBooleanSchema(property)) {

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

@@ -85,7 +85,8 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
     protected String enumValueSuffix = "Enum";
 
     protected String sourceFolder = "src";
-    protected String invalidNamePrefix = "var";
+    protected static final String invalidParameterNamePrefix = "var";
+    protected static final String invalidPropertyNamePrefix = "Var";
     protected CodegenConstants.ENUM_PROPERTY_NAMING_TYPE enumPropertyNaming = CodegenConstants.ENUM_PROPERTY_NAMING_TYPE.PascalCase;
 
     // TODO: Add option for test folder output location. Nice to allow e.g. ./test instead of ./src.
@@ -441,7 +442,7 @@ protected ImmutableMap.Builder<String, Lambda> addMustacheLambdas() {
         CopyLambda copyLambda = new CopyLambda();
 
         return super.addMustacheLambdas()
-                .put("camelcase_param", new CamelCaseLambda().generator(this).escapeAsParamName(true))
+                .put("camelcase_sanitize_param", new CamelCaseAndSanitizeLambda().generator(this).escapeAsParamName(true))
                 .put("required", new RequiredParameterLambda())
                 .put("optional", new OptionalParameterLambda().generator(this))
                 .put("joinWithComma", new JoinWithCommaLambda())
@@ -461,7 +462,9 @@ protected ImmutableMap.Builder<String, Lambda> addMustacheLambdas() {
                 .put("pasteOnce", new PasteLambda(copyLambda, true, true, true, true))
                 .put("pasteLine", new PasteLambda(copyLambda, true, true, false, false))
                 .put("uniqueLines", new UniqueLambda("\n", false))
-                .put("unique", new UniqueLambda("\n", true));
+                .put("unique", new UniqueLambda("\n", true))
+                .put("camel_case", new CamelCaseLambda())
+                .put("escape_reserved_word", new EscapeKeywordLambda((val) -> this.escapeKeyword(val)));
     }
 
     @Override
@@ -664,18 +667,13 @@ protected void removePropertiesDeclaredInComposedTypes(Map<String, ModelsMap> ob
     }
 
     private String patchPropertyName(CodegenModel model, String value) {
-        // the casing will be wrong if we just set the name to escapeReservedWord
-        // if we try to fix it with camelize, underscores get stripped out
-        // so test if the name was escaped and then replace var with Var
-        String tmpPropertyName = escapeReservedWord(model, value);
-        if (!value.equals(tmpPropertyName) || value.startsWith(this.invalidNamePrefix)) {
-            value = tmpPropertyName;
-            String firstCharacter = value.substring(0, 1);
-            value = value.substring(1);
-            value = firstCharacter.toUpperCase(Locale.ROOT) + value;
+        String name = escapeReservedWord(model, value);
+
+        if (name.startsWith(AbstractCSharpCodegen.invalidParameterNamePrefix)) {
+            name = AbstractCSharpCodegen.invalidPropertyNamePrefix + name.substring(AbstractCSharpCodegen.invalidParameterNamePrefix.length());
         }
 
-        return value;
+        return name;
     }
 
     private void patchPropertyVendorExtensions(CodegenProperty property) {
@@ -700,7 +698,6 @@ protected void patchProperty(Map<String, CodegenModel> enumRefs, CodegenModel mo
 
         patchPropertyVendorExtensions(property);
 
-        String tmpPropertyName = escapeReservedWord(model, property.name);
         property.name = patchPropertyName(model, property.name);
 
         String[] nestedTypes = { "List", "Collection", "ICollection", "Dictionary" };
@@ -1122,7 +1119,7 @@ protected void patchVendorExtensionNullableValueType(CodegenParameter parameter)
      * Returns the model related to the given parameter
      */
     private CodegenModel getModelFromParameter(List<ModelMap> allModels, CodegenParameter parameter) {
-        return parameter.isModel
+        return parameter.isModel || parameter.getIsEnumOrRef()
                 ? allModels.stream().map(m -> m.getModel()).filter(m -> m.getClassname().equals(parameter.dataType)).findFirst().orElse(null)
                 : null;
     }
@@ -1308,23 +1305,24 @@ public String toParamName(String name) {
     public String escapeReservedWord(CodegenModel model, String name) {
         name = this.escapeReservedWord(name);
 
-        return name.equalsIgnoreCase(model.getClassname())
-                ? this.invalidNamePrefix + camelize(name)
+        return name.equals(model.getClassname())
+                ? AbstractCSharpCodegen.invalidParameterNamePrefix + camelize(name)
                 : name;
     }
 
     @Override
     public String escapeReservedWord(String name) {
-        if (reservedWords().contains(name) ||
-                reservedWords().contains(name.toLowerCase(Locale.ROOT)) ||
-                reservedWords().contains(camelize(sanitizeName(name))) ||
-                isReservedWord(name) ||
+        if (isReservedWord(name) ||
                 name.matches("^\\d.*")) {
-            name = this.invalidNamePrefix + camelize(name);
+            name = AbstractCSharpCodegen.invalidParameterNamePrefix + camelize(name);
         }
         return name;
     }
 
+    public String escapeKeyword(String value) {
+        return isReservedWord(value) ? "@" + value : value;
+    }
+
     /**
      * Return the example value of the property
      *

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

@@ -313,7 +313,7 @@ public void processOpts() {
     @Override
     protected ImmutableMap.Builder<String, Lambda> addMustacheLambdas() {
         return super.addMustacheLambdas()
-                .put("camelcase_param", new CamelCaseLambda().generator(this).escapeAsParamName(true));
+                .put("camelcase_param", new CamelCaseAndSanitizeLambda().generator(this).escapeAsParamName(true));
     }
 
     @Override