[windows] Fixed missing output (#19715)

* fixed missing output

* bug fix

* add new sample

* build samples again

* delete sample

* move the sample and add to github workflow

* remove model not needed for this test

* handle specs with no models

Author: devhl-labs

.github/workflows/openapi-generator.yaml

@@ -142,6 +142,8 @@ jobs:
           path: modules/openapi-generator-cli/target
       - name: Delete samples that are entirely generated
         run: |
+          rm -rf samples/client/petstore/csharp/generichost/latest/Tags
+
           rm -rf samples/client/petstore/csharp/generichost/net8/AllOf
           rm -rf samples/client/petstore/csharp/generichost/net8/AnyOf
           rm -rf samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare

.github/workflows/samples-dotnet.yaml

@@ -3,12 +3,14 @@ name: Samples C# .Net 8 Clients
 on:
   push:
     paths:
+      - samples/client/petstore/csharp/generichost/latest/**
       - samples/client/petstore/csharp/generichost/net8/**
       - samples/client/petstore/csharp/httpclient/net8/**
       - samples/client/petstore/csharp/restsharp/net8/**
       - samples/client/petstore/csharp/unityWebRequest/net8/**
   pull_request:
     paths:
+      - samples/client/petstore/csharp/generichost/latest/**
       - samples/client/petstore/csharp/generichost/net8/**
       - samples/client/petstore/csharp/httpclient/net8/**
       - samples/client/petstore/csharp/restsharp/net8/**
@@ -21,6 +23,7 @@ jobs:
       fail-fast: false
       matrix:
         sample:
+          - samples/client/petstore/csharp/generichost/latest/Tags
           - samples/client/petstore/csharp/generichost/net8/AllOf
           - samples/client/petstore/csharp/generichost/net8/AnyOf
           - samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare

bin/configs/csharp-generichost-tags-latest.yaml

@@ -0,0 +1,10 @@
+# for csharp generichost
+generatorName: csharp
+outputDir: samples/client/petstore/csharp/generichost/latest/Tags
+inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/tags.json
+library: generichost
+templateDir: modules/openapi-generator/src/main/resources/csharp
+additionalProperties:
+  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
+  modelPropertySorting: alphabetical
+  operationParameterSorting: alphabetical

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

@@ -1456,7 +1456,7 @@ public String toRegularExpression(String pattern) {
     }
 
     /**
-     * Return the file name of the Api Test
+     * Return the file name of the Api
      *
      * @param name the file name of the Api
      * @return the file name of the Api
@@ -5678,6 +5678,8 @@ protected void addHeaders(ApiResponse response, List<CodegenProperty> properties
         }
     }
 
+    private final Map<String, Integer> seenOperationIds = new HashMap<String, Integer>();
+
     /**
      * Add operation to group
      *
@@ -5698,13 +5700,18 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera
         }
         // check for operationId uniqueness
         String uniqueName = co.operationId;
-        int counter = 0;
+        int counter = seenOperationIds.getOrDefault(uniqueName, 0);
+        while(seenOperationIds.containsKey(uniqueName)) {
+            uniqueName = co.operationId + "_" + counter;
+            counter++;
+        }
         for (CodegenOperation op : opList) {
             if (uniqueName.equals(op.operationId)) {
                 uniqueName = co.operationId + "_" + counter;
                 counter++;
             }
         }
+        seenOperationIds.put(co.operationId, counter);
         if (!co.operationId.equals(uniqueName)) {
             LOGGER.warn("generated unique operationId `{}`", uniqueName);
         }
@@ -6080,30 +6087,68 @@ protected String removeNonNameElementToCamelCase(final String name, final String
         return result;
     }
 
+    /**
+     * Return a value that is unique, suffixed with _index to make it unique
+     * Ensures generated files are unique when compared case-insensitive
+     * Not all operating systems support case-sensitive paths
+     */
+    private String uniqueCaseInsensitiveString(String value, Map<String, String> seenValues) {
+        if (seenValues.keySet().contains(value)) {
+            return seenValues.get(value);
+        }
+
+        Optional<Entry<String,String>> foundEntry = seenValues.entrySet().stream().filter(v -> v.getValue().toLowerCase(Locale.ROOT).equals(value.toLowerCase(Locale.ROOT))).findAny();
+        if (foundEntry.isPresent()) {
+            int counter = 0;
+            String uniqueValue = value + "_" + counter;
+
+            while (seenValues.values().stream().map(v -> v.toLowerCase(Locale.ROOT)).collect(Collectors.toList()).contains(uniqueValue.toLowerCase(Locale.ROOT))) {
+                counter++;
+                uniqueValue = value + "_" + counter;
+            }
+
+            seenValues.put(value, uniqueValue);
+            return uniqueValue;
+        }
+
+        seenValues.put(value, value);
+        return value;
+    }
+
+    private final Map<String, String> seenApiFilenames = new HashMap<String, String>();
+
     @Override
     public String apiFilename(String templateName, String tag) {
+        String uniqueTag = uniqueCaseInsensitiveString(tag, seenApiFilenames);
         String suffix = apiTemplateFiles().get(templateName);
-        return apiFileFolder() + File.separator + toApiFilename(tag) + suffix;
+        return apiFileFolder() + File.separator + toApiFilename(uniqueTag) + suffix;
     }
 
     @Override
     public String apiFilename(String templateName, String tag, String outputDir) {
+        String uniqueTag = uniqueCaseInsensitiveString(tag, seenApiFilenames);
         String suffix = apiTemplateFiles().get(templateName);
-        return outputDir + File.separator + toApiFilename(tag) + suffix;
+        return outputDir + File.separator + toApiFilename(uniqueTag) + suffix;
     }
 
+    private final Map<String, String> seenModelFilenames = new HashMap<String, String>();
+
     @Override
     public String modelFilename(String templateName, String modelName) {
+        String uniqueModelName = uniqueCaseInsensitiveString(modelName, seenModelFilenames);
         String suffix = modelTemplateFiles().get(templateName);
-        return modelFileFolder() + File.separator + toModelFilename(modelName) + suffix;
+        return modelFileFolder() + File.separator + toModelFilename(uniqueModelName) + suffix;
     }
 
     @Override
     public String modelFilename(String templateName, String modelName, String outputDir) {
+        String uniqueModelName = uniqueCaseInsensitiveString(modelName, seenModelFilenames);
         String suffix = modelTemplateFiles().get(templateName);
-        return outputDir + File.separator + toModelFilename(modelName) + suffix;
+        return outputDir + File.separator + toModelFilename(uniqueModelName) + suffix;
     }
 
+    private final Map<String, String> seenApiDocFilenames = new HashMap<String, String>();
+
     /**
      * Return the full path and API documentation file
      *
@@ -6113,11 +6158,14 @@ public String modelFilename(String templateName, String modelName, String output
      */
     @Override
     public String apiDocFilename(String templateName, String tag) {
+        String uniqueTag = uniqueCaseInsensitiveString(tag, seenApiDocFilenames);
         String docExtension = getDocExtension();
         String suffix = docExtension != null ? docExtension : apiDocTemplateFiles().get(templateName);
-        return apiDocFileFolder() + File.separator + toApiDocFilename(tag) + suffix;
+        return apiDocFileFolder() + File.separator + toApiDocFilename(uniqueTag) + suffix;
     }
 
+    private final Map<String, String> seenApiTestFilenames = new HashMap<String, String>();
+
     /**
      * Return the full path and API test file
      *
@@ -6127,8 +6175,9 @@ public String apiDocFilename(String templateName, String tag) {
      */
     @Override
     public String apiTestFilename(String templateName, String tag) {
+        String uniqueTag = uniqueCaseInsensitiveString(tag, seenApiTestFilenames);
         String suffix = apiTestTemplateFiles().get(templateName);
-        return apiTestFileFolder() + File.separator + toApiTestFilename(tag) + suffix;
+        return apiTestFileFolder() + File.separator + toApiTestFilename(uniqueTag) + suffix;
     }
 
     @Override

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

@@ -1441,6 +1441,8 @@ protected File processTemplateToFile(Map<String, Object> templateData, String te
         return processTemplateToFile(templateData, templateName, outputFilename, shouldGenerate, skippedByOption, this.config.getOutputDir());
     }
 
+    private final Set<String> seenFiles = new HashSet<>();
+
     private File processTemplateToFile(Map<String, Object> templateData, String templateName, String outputFilename, boolean shouldGenerate, String skippedByOption, String intendedOutputDir) throws IOException {
         String adjustedOutputFilename = outputFilename.replaceAll("//", "/").replace('/', File.separatorChar);
         File target = new File(adjustedOutputFilename);
@@ -1451,6 +1453,11 @@ private File processTemplateToFile(Map<String, Object> templateData, String temp
                 if (!absoluteTarget.startsWith(outDir)) {
                     throw new RuntimeException(String.format(Locale.ROOT, "Target files must be generated within the output directory; absoluteTarget=%s outDir=%s", absoluteTarget, outDir));
                 }
+
+                if (seenFiles.stream().filter(f -> f.toLowerCase(Locale.ROOT).equals(absoluteTarget.toString().toLowerCase(Locale.ROOT))).findAny().isPresent()) {
+                    LOGGER.warn("Duplicate file path detected. Not all operating systems can handle case sensitive file paths. path={}", absoluteTarget.toString());
+                }
+                seenFiles.add(absoluteTarget.toString());
                 return this.templateProcessor.write(templateData, templateName, target);
             } else {
                 this.templateProcessor.skip(target.toPath(), String.format(Locale.ROOT, "Skipped by %s options supplied by user.", skippedByOption));

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ClientUtils.mustache

@@ -12,7 +12,11 @@ using System.Text;
 using System.Text.Json;
 using System.Text.RegularExpressions;{{#useCompareNetObjects}}
 using KellermanSoftware.CompareNetObjects;{{/useCompareNetObjects}}
+{{#models}}
+{{#-first}}
 using {{packageName}}.{{modelPackage}};
+{{/-first}}
+{{/models}}
 using System.Runtime.CompilerServices;
 
 {{>Assembly}}namespace {{packageName}}.{{clientPackage}}

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HostConfiguration.mustache

@@ -11,7 +11,11 @@ using System.Text.Json.Serialization;
 using System.Net.Http;
 using Microsoft.Extensions.DependencyInjection;
 using {{packageName}}.{{apiPackage}};
+{{#models}}
+{{#-first}}
 using {{packageName}}.{{modelPackage}};
+{{/-first}}
+{{/models}}
 
 namespace {{packageName}}.{{clientPackage}}
 {

modules/openapi-generator/src/test/resources/3_0/csharp/tags.json

@@ -0,0 +1,82 @@
+{
+  "info": {
+      "title": "Files.com API",
+      "contact": {
+          "name": "Files.com Customer Success Team",
+          "email": "support@files.com"
+      },
+      "version": "0.0.1"
+  },
+  "swagger": "2.0",
+  "produces": [
+      "application/json",
+      "application/msgpack",
+      "application/xml"
+  ],
+  "securityDefinitions": {
+      "api_key": {
+          "type": "apiKey",
+          "description": "API Key - supports user-based or site-wide API keys",
+          "name": "XFilesAPIKey",
+          "in": "header"
+      }
+  },
+  "host": "app.files.com",
+  "basePath": "/api/rest/v1",
+  "tags": [
+      {
+          "name": "api_key",
+          "description": "Operations about api_keys"
+      },
+      {
+          "name": "API Keys",
+          "description": "Operations about API Keys"
+      },
+      {
+          "name": "a_p_i_k_e_y_s",
+          "description": "Operations about API keys"
+      }
+  ],
+  "paths": {
+      "/api_keys/{id}": {
+          "get": {
+              "summary": "Show API Key",
+              "description": "Show API Key",
+              "produces": [
+                  "application/json"
+              ],
+              "parameters": [
+                  {
+                      "in": "path",
+                      "name": "id",
+                      "description": "Api Key ID.",
+                      "type": "integer",
+                      "format": "int32",
+                      "required": true,
+                      "x-ms-summary": "Api Key ID."
+                  }
+              ],
+              "responses": {
+                  "400": {
+                      "description": "Bad Request",
+                      "x-ms-summary": "Bad Request"
+                  }
+              },
+              "tags": [
+                  "api_keys",
+                  "API Keys",
+                  "a_p_i_k_e_y_s"
+              ],
+              "operationId": "GetApiKeysId",
+              "x-authentication": [
+                  "self_managed"
+              ],
+              "x-category": [
+                  "developers"
+              ]
+          }
+      }
+  }
+  ,
+  "definitions": {}
+}