Merge branch 'OpenAPITools:master' into master

Author: vvb

.circleci/config.yml

@@ -141,7 +141,7 @@ commands: # a reusable command with parameters
 jobs:
   node0:
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2004:2024.01.1
     working_directory: ~/OpenAPITools/openapi-generator
     shell: /bin/bash --login
     environment:
@@ -154,7 +154,7 @@ jobs:
           nodeNo: "0"
   node1:
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2004:2024.01.1
     working_directory: ~/OpenAPITools/openapi-generator
     shell: /bin/bash --login
     environment:
@@ -167,7 +167,7 @@ jobs:
           nodeNo: "1"
   node2:
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2004:2024.01.1
     working_directory: ~/OpenAPITools/openapi-generator
     shell: /bin/bash --login
     environment:
@@ -180,7 +180,7 @@ jobs:
           nodeNo: "2"
   node3:
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2004:2024.01.1
     working_directory: ~/OpenAPITools/openapi-generator
     shell: /bin/bash --login
     environment:
@@ -192,20 +192,6 @@ jobs:
       - checkout
       - command_build_and_test:
           nodeNo: "3"
-  node4:
-    machine:
-      image: ubuntu-2004:202201-02
-    working_directory: ~/OpenAPITools/openapi-generator
-    shell: /bin/bash --login
-    environment:
-      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
-      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
-      DOCKER_GENERATOR_IMAGE_NAME: openapitools/openapi-generator
-      DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli
-    steps:
-      - checkout
-      - command_build_and_test:
-          nodeNo: "4"
 workflows:
   version: 2
   build:
@@ -214,4 +200,3 @@ workflows:
       - node1
       - node2
       - node3
-      - node4

.devcontainer/devcontainer.json

@@ -9,6 +9,7 @@
     "ghcr.io/devcontainers/features/node:1": {
       "version": "lts"
     },
+    "ghcr.io/devcontainers/features/rust:1": {},
     "ghcr.io/snebjorn/devcontainer-feature/chromium:latest": {},
     "docker-in-docker": {
       "version": "latest",
@@ -25,8 +26,8 @@
         "java.configuration.runtimes": [
           {
             "name": "JavaSE-11",
-            "path": "/usr/local/sdkman/candidates/java/11.0.16.1-ms",
-            "sources": "/usr/local/sdkman/candidates/java/11.0.16.1-ms/lib/src.zip",
+            "path": "/usr/local/sdkman/candidates/java/current",
+            "sources": "/usr/local/sdkman/candidates/java/current/lib/src.zip",
             "javadoc": "https://docs.oracle.com/en/java/javase/11/docs/api",
             "default": true
           }
@@ -49,4 +50,4 @@
   // "postCreateCommand": "mvn clean package -DskipTests",
   // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
   "remoteUser": "vscode"
-}
+}

.github/PULL_REQUEST_TEMPLATE.md

@@ -17,5 +17,5 @@
   These must match the expectations made by your contribution. 
   You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example `./bin/generate-samples.sh bin/configs/java*`. 
   IMPORTANT: Do **NOT** purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
-- [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master` (upcoming 7.1.0 minor release - breaking changes with fallbacks), `8.0.x` (breaking changes without fallbacks)
+- [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master` (upcoming 7.6.0 minor release - breaking changes with fallbacks), `8.0.x` (breaking changes without fallbacks)
 - [ ] If your PR is targeting a particular programming language, @mention the [technical committee](https://github.com/openapitools/openapi-generator/#62---openapi-generator-technical-committee) members, so they are more likely to review the pull request.

.github/workflows/gradle-plugin-tests.yaml

@@ -20,7 +20,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-maven-repository
         with:

.github/workflows/gradle-test.yaml

@@ -10,7 +10,7 @@ on:
       - 'samples/client/petstore/java/**'
       - 'samples/openapi3/client/petstore/java/**'
 env:
-  GRADLE_VERSION: 7.2
+  GRADLE_VERSION: 8.7
 
 jobs:
   build:
@@ -37,14 +37,14 @@ jobs:
           java-version: 11
       # Cache Gradle Dependencies
       - name: Setup Gradle Dependencies Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts') }}
 
       # Cache Gradle Wrapper
       - name: Setup Gradle Wrapper Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.gradle/wrapper
           key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}

.github/workflows/linux.yaml

@@ -28,14 +28,14 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('pom.xml', 'modules/**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
@@ -45,7 +45,7 @@ jobs:
             ${{ runner.os }}-gradle-
 
       - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.11.0
+        uses: s4u/setup-maven-action@v1.13.0
         with:
           java-version: ${{ matrix.java }}
           maven-version: 3.8.8
@@ -87,7 +87,7 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v4
       - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.11.0
+        uses: s4u/setup-maven-action@v1.13.0
         with:
           java-version: 11
           maven-version: 3.8.8

.github/workflows/maven-plugin-tests.yaml

@@ -20,7 +20,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-maven-repository
         with:

.github/workflows/openapi-generator.yaml

@@ -22,7 +22,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-maven-repository
         with:
@@ -60,7 +60,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-maven-repository
         with:
@@ -140,8 +140,40 @@ jobs:
         with:
           name: openapi-generator-cli.jar
           path: modules/openapi-generator-cli/target
+      - name: Delete samples that are entirely generated
+        run: |
+          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
+          rm -rf samples/client/petstore/csharp/generichost/net8/FormModels
+          rm -rf samples/client/petstore/csharp/generichost/net8/NullReferenceTypes
+          rm -rf samples/client/petstore/csharp/generichost/net8/OneOf
+          rm -rf samples/client/petstore/csharp/generichost/net8/Petstore
+          rm -rf samples/client/petstore/csharp/generichost/net8/SourceGeneration
+          rm -rf samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate
+
+          rm -rf samples/client/petstore/csharp/generichost/standard2.0/Petstore
+
+          rm -rf samples/client/petstore/csharp/generichost/net4.8/AllOf
+          rm -rf samples/client/petstore/csharp/generichost/net4.8/AnyOf
+          rm -rf samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare
+          rm -rf samples/client/petstore/csharp/generichost/net4.8/FormModels
+          rm -rf samples/client/petstore/csharp/generichost/net4.8/OneOf
+          rm -rf samples/client/petstore/csharp/generichost/net4.8/Petstore
+          rm -rf samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate
+
+          rm -rf samples/client/petstore/csharp/generichost/net4.7/AllOf
+          rm -rf samples/client/petstore/csharp/generichost/net4.7/AnyOf
+          rm -rf samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare
+          rm -rf samples/client/petstore/csharp/generichost/net4.7/FormModels
+          rm -rf samples/client/petstore/csharp/generichost/net4.7/OneOf
+          rm -rf samples/client/petstore/csharp/generichost/net4.7/Petstore
+          rm -rf samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate
       - name: Generate samples
-        run: bash bin/generate-samples.sh
+        run: |
+          bash bin/generate-samples.sh
+          # when a sample is deleted, you have to generate it twice for all files to get created
+          bash bin/generate-samples.sh
       - name: Verify git status
         run: |
           if [[ "$(git status --porcelain)" != "" ]]; then

.github/workflows/samples-c-libcurl-client.yaml

@@ -4,22 +4,31 @@ on:
   push:
     paths:
       - 'samples/client/petstore/c/**'
+      - 'samples/client/petstore/c-useJsonUnformatted/**'
   pull_request:
     paths:
       - 'samples/client/petstore/c/**'
+      - 'samples/client/petstore/c-useJsonUnformatted/**'
 
 jobs:
   build:
     name: Build c libcurl client
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          - 'samples/client/petstore/c/'
+          - 'samples/client/petstore/c-useJsonUnformatted/'
+
     steps:
       - uses: actions/checkout@v4
       - name: Prepare
         run: |
           sudo apt-get update
           sudo apt-get install -y libssl-dev libcurl4-openssl-dev
       - name: Build
-        working-directory: "samples/client/petstore/c"
+        working-directory: ${{ matrix.sample }}
         run: |
           mkdir build
           cd build

.github/workflows/samples-cpp-qt-client.yaml

@@ -27,7 +27,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           version: ${{ matrix.qt-version }}
           tools: ${{ matrix.tools }}

.github/workflows/samples-dart.yaml

@@ -24,7 +24,7 @@ jobs:
           java-version: 11
           cache: maven
       - name: Cache test dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: pub-cache
         with:

.github/workflows/samples-dotnet-fx.yaml

@@ -0,0 +1,42 @@
+name: Samples C# .Net Framework Clients
+
+on:
+  push:
+    paths:
+      - samples/client/petstore/csharp/generichost/net4.7/**
+      - samples/client/petstore/csharp/generichost/net4.8/**
+  pull_request:
+    paths:
+      - samples/client/petstore/csharp/generichost/net4.7/**
+      - samples/client/petstore/csharp/generichost/net4.8/**
+jobs:
+  build:
+    name: Build .Net projects
+    runs-on: windows-2019
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          - samples/client/petstore/csharp/generichost/net4.7/AllOf
+          - samples/client/petstore/csharp/generichost/net4.7/AnyOf
+          - samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare
+          - samples/client/petstore/csharp/generichost/net4.7/FormModels
+          - samples/client/petstore/csharp/generichost/net4.7/OneOf
+          - samples/client/petstore/csharp/generichost/net4.7/Petstore
+          - samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate
+
+          - samples/client/petstore/csharp/generichost/net4.8/AllOf
+          - samples/client/petstore/csharp/generichost/net4.8/AnyOf
+          - samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare
+          - samples/client/petstore/csharp/generichost/net4.8/FormModels
+          - samples/client/petstore/csharp/generichost/net4.8/OneOf
+          - samples/client/petstore/csharp/generichost/net4.8/Petstore
+          - samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build
+        working-directory: ${{ matrix.sample }}
+        run: dotnet build Org.OpenAPITools.sln
+      - name: Test
+        working-directory: ${{ matrix.sample }}
+        run: dotnet test Org.OpenAPITools.sln

.github/workflows/samples-dotnet-standard.yaml

@@ -1,12 +1,18 @@
-name: Samples C# .Net Standard
+name: Samples C# .Net Standard Client
 
 on:
   push:
     paths:
-      - 'samples/client/petstore/csharp/**netstandard**/'
+      - samples/client/petstore/csharp/generichost/standard2.0/**
+      - samples/client/petstore/csharp/httpclient/standard2.0/**
+      - samples/client/petstore/csharp/restsharp/standard2.0/**
+      - samples/client/petstore/csharp/unityWebRequest/standard2.0/**
   pull_request:
     paths:
-      - 'samples/client/petstore/csharp/**netstandard**/'
+      - samples/client/petstore/csharp/generichost/standard2.0/**
+      - samples/client/petstore/csharp/httpclient/standard2.0/**
+      - samples/client/petstore/csharp/restsharp/standard2.0/**
+      - samples/client/petstore/csharp/unityWebRequest/standard2.0/**
 jobs:
   build:
     name: Build .Net projects
@@ -15,8 +21,11 @@ jobs:
       fail-fast: false
       matrix:
         sample:
-          # clients
-          - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0
+          - samples/client/petstore/csharp/generichost/standard2.0/Petstore/
+          - samples/client/petstore/csharp/httpclient/standard2.0/Petstore/
+          - samples/client/petstore/csharp/restsharp/standard2.0/Petstore/
+          - samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/
+          # - samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/
     steps:
       - uses: actions/checkout@v4
       - uses: actions/[email protected]
@@ -25,6 +34,8 @@ jobs:
       - name: Build
         working-directory: ${{ matrix.sample }}
         run: dotnet build Org.OpenAPITools.sln
-      - name: Test
-        working-directory: ${{ matrix.sample }}
-        run: dotnet test Org.OpenAPITools.sln
+      # skip tests as petstore server it not running
+      # these tests are run in appveyor instead
+      #- name: Test
+      #  working-directory: ${{ matrix.sample }}
+      #  run: dotnet test Org.OpenAPITools.sln