From debf92fd7da807fb48317620e2b23a261d7a35e6 Mon Sep 17 00:00:00 2001 From: martin-mfg <2026226+martin-mfg@users.noreply.github.com> Date: Tue, 27 Jun 2023 04:28:01 +0200 Subject: [PATCH] author command: replace \ by /, fix #9528 (#15861) * author command: replace \ by / * add windows test for author template --- .github/workflows/windows.yaml | 5 +++++ .../java/org/openapitools/codegen/cmd/AuthorTemplate.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index 7e36d2732ff..db43b979283 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -47,6 +47,11 @@ jobs: run: ./mvnw clean --no-snapshot-updates --batch-mode --quiet install env: GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} + - name: Test Template Retrieval + run: | + cd modules/openapi-generator-cli/target + # generator names containing "-" caused problems in the past, see https://github.com/OpenAPITools/openapi-generator/issues/9528 + java -jar ./openapi-generator-cli.jar author template --verbose -g jaxrs-spec --library quarkus - name: Setup Gradle uses: gradle/gradle-build-action@v2 - name: Gradle tests diff --git a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/AuthorTemplate.java b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/AuthorTemplate.java index da02a602463..e19c3b80f9d 100644 --- a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/AuthorTemplate.java +++ b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/AuthorTemplate.java @@ -45,7 +45,7 @@ public class AuthorTemplate extends OpenApiGeneratorCommand { @Override void execute() { CodegenConfig config = CodegenConfigLoader.forName(generatorName); - String templateDirectory = config.templateDir(); + String templateDirectory = config.templateDir().replace('\\', '/'); log("Requesting '{}' from embedded resource directory '{}'", generatorName, templateDirectory);