Merge branch 'master' into 8.0.x

.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:

.devcontainer/devcontainer.json

@@ -26,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
  }
@@ -50,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-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:

.github/workflows/linux.yaml

@@ -45,7 +45,7 @@ jobs:
  ${{ runner.os }}-gradle-
 
  - name: Setup Maven
- uses: s4u/setup-maven-action@v1.12.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.12.0
+ uses: s4u/setup-maven-action@v1.13.0
  with:
  java-version: 11
  maven-version: 3.8.8

.github/workflows/openapi-generator.yaml

@@ -140,8 +140,23 @@ 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
  - 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-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-go.yaml

@@ -1,20 +1,22 @@
-name: Samples Go 
+name: Samples Go
 
 on:
  push:
  paths:
  - 'samples/server/petstore/go-echo-server/**'
  - 'samples/server/petstore/go-api-server/**'
  - 'samples/server/petstore/go-chi-server/**'
+ - 'samples/server/others/go-server/no-body-path-params/**'
  pull_request:
  paths:
  - 'samples/server/petstore/go-echo-server/**'
  - 'samples/server/petstore/go-api-server/**'
  - 'samples/server/petstore/go-chi-server/**'
+ - 'samples/server/others/go-server/no-body-path-params/**'
 
 jobs:
  build:
- name: Build Go 
+ name: Build Go
  runs-on: ubuntu-latest
  strategy:
  fail-fast: false
@@ -23,6 +25,7 @@ jobs:
  - samples/server/petstore/go-echo-server/
  - samples/server/petstore/go-api-server/
  - samples/server/petstore/go-chi-server/
+ - samples/server/others/go-server/no-body-path-params/
  steps:
  - uses: actions/checkout@v4
  - uses: actions/setup-go@v5

.github/workflows/samples-java-client-echo-api-jdk17.yaml

@@ -0,0 +1,42 @@
+name: Java Client (Echo API) JDK17
+
+on:
+ push:
+ paths:
+ - samples/client/echo_api/java/restclient
+ pull_request:
+ paths:
+ - samples/client/echo_api/java/restclient
+jobs:
+ build:
+ name: Build Java Client JDK17
+ runs-on: ubuntu-latest
+ strategy:
+ fail-fast: false
+ matrix:
+ sample:
+ # clients
+ - samples/client/echo_api/java/restclient
+ steps:
+ - uses: actions/checkout@v4
+ - uses: actions/setup-java@v4
+ with:
+ distribution: 'temurin'
+ java-version: 17
+ - name: Cache maven dependencies
+ uses: actions/cache@v4
+ env:
+ cache-name: maven-repository
+ with:
+ path: |
+ ~/.m2
+ key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
+ - name: Setup node.js
+ uses: actions/setup-node@v4
+ - name: Run echo server
+ run: |
+ git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server
+ (cd http-echo-server && npm install && npm start &)
+ - name: Build
+ working-directory: ${{ matrix.sample }}
+ run: mvn clean package

.github/workflows/samples-java-client-jdk11.yaml

@@ -15,6 +15,7 @@ on:
  - samples/client/others/java/webclient-useAbstractionForFiles/**
  - samples/client/others/java/jersey2-oneOf-duplicates/**
  - samples/client/others/java/jersey2-oneOf-Mixed/**
+ - samples/client/others/java/resttemplate-list-schema-validation/**
  pull_request:
  paths:
  - 'samples/client/petstore/java/**'
@@ -29,6 +30,7 @@ on:
  - samples/client/others/java/webclient-useAbstractionForFiles/**
  - samples/client/others/java/jersey2-oneOf-duplicates/**
  - samples/client/others/java/jersey2-oneOf-Mixed/**
+ - samples/client/others/java/resttemplate-list-schema-validation/**
 jobs:
  build:
  name: Build Java Client JDK11
@@ -73,10 +75,12 @@ jobs:
  - samples/client/petstore/java/resttemplate-swagger2/
  - samples/openapi3/client/petstore/java/jersey2-java8-swagger2/
  - samples/client/others/java/okhttp-gson-oneOf/
+ - samples/client/echo_api/java/okhttp-gson-user-defined-templates/
  - samples/client/others/java/resttemplate-useAbstractionForFiles/
  - samples/client/others/java/webclient-useAbstractionForFiles/
  - samples/client/others/java/jersey2-oneOf-duplicates/
  - samples/client/others/java/jersey2-oneOf-Mixed/
+ - samples/client/others/java/resttemplate-list-schema-validation/
  steps:
  - uses: actions/checkout@v4
  - uses: actions/setup-java@v4

.github/workflows/samples-java-client-jdk17.yaml

@@ -5,10 +5,12 @@ on:
  paths:
  - samples/client/petstore/java/resttemplate-jakarta/**
  - samples/client/petstore/java/webclient-jakarta/**
+ - samples/client/petstore/java/restclient-*/** 
  pull_request:
  paths:
  - samples/client/petstore/java/resttemplate-jakarta/**
  - samples/client/petstore/java/webclient-jakarta/**
+ - samples/client/petstore/java/restclient-*/** 
 jobs:
  build:
  name: Build Java Client JDK17
@@ -20,6 +22,9 @@ jobs:
  # clients
  - samples/client/petstore/java/resttemplate-jakarta
  - samples/client/petstore/java/webclient-jakarta
+ - samples/client/petstore/java/restclient
+ - samples/client/petstore/java/restclient-nullable-arrays
+ - samples/client/petstore/java/restclient-swagger2
  steps:
  - uses: actions/checkout@v4
  - uses: actions/setup-java@v4
@@ -34,9 +39,27 @@ jobs:
  path: |
  ~/.m2
  key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
+
  - name: Build with Maven
  working-directory: ${{ matrix.sample }}
  run: mvn clean package
- - name: Build with Gradle
+
+ - name: Cache gradle dependencies
+ uses: actions/cache@v4
+ env:
+ cache-name: gradle-caches
+ with:
+ path: ~/.gradle/caches
+ key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/*.gradle', '**/*.gradle.kts') }}
+
+ - name: Cache gradle wrapper
+ uses: actions/cache@v4
+ env:
+ cache-name: gradle-wrapper
+ with:
+ path: ~/.gradle/wrapper
+ key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
+
+ - name: Build
  working-directory: ${{ matrix.sample }}
- run: gradle clean build
+ run: ./gradlew build -x test

.github/workflows/samples-java-helidon-v3.yaml

@@ -0,0 +1,41 @@
+name: Samples Java Helidon v3
+
+on:
+ push:
+ paths:
+ - samples/client/petstore/java-helidon-client/v3/**
+ - samples/server/petstore/java-helidon-server/v3/**
+ pull_request:
+ paths:
+ - samples/client/petstore/java-helidon-client/v3/**
+ - samples/server/petstore/java-helidon-server/v3/**
+jobs:
+ build:
+ name: Build Java Helidon 
+ runs-on: ubuntu-latest
+ strategy:
+ fail-fast: false
+ matrix:
+ sample:
+ - samples/client/petstore/java-helidon-client/v3/mp
+ - samples/client/petstore/java-helidon-client/v3/se
+ - samples/server/petstore/java-helidon-server/v3/mp
+ - samples/server/petstore/java-helidon-server/v3/se
+ version: [17]
+ steps:
+ - uses: actions/checkout@v4
+ - uses: actions/setup-java@v4
+ with:
+ distribution: 'temurin'
+ java-version: ${{ matrix.version }}
+ - name: Cache maven dependencies
+ uses: actions/cache@v4
+ env:
+ cache-name: maven-repository
+ with:
+ path: |
+ ~/.m2
+ key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
+ - name: Build
+ working-directory: ${{ matrix.sample }}
+ run: mvn clean package

.github/workflows/samples-java-helidon-v4.yaml

@@ -0,0 +1,39 @@
+name: Samples Java Helidon v4
+
+on:
+ push:
+ paths:
+ - samples/client/petstore/java-helidon-client/v4/**
+ - samples/server/petstore/java-helidon-server/v4/**
+ pull_request:
+ paths:
+ - samples/client/petstore/java-helidon-client/v4/**
+ - samples/server/petstore/java-helidon-server/v4/**
+jobs:
+ build:
+ name: Build Java Helidon 
+ runs-on: ubuntu-latest
+ strategy:
+ fail-fast: false
+ matrix:
+ sample:
+ - samples/client/petstore/java-helidon-client/v4/mp
+ - samples/server/petstore/java-helidon-server/v4/mp
+ version: [21]
+ steps:
+ - uses: actions/checkout@v4
+ - uses: actions/setup-java@v4
+ with:
+ distribution: 'temurin'
+ java-version: ${{ matrix.version }}
+ - name: Cache maven dependencies
+ uses: actions/cache@v4
+ env:
+ cache-name: maven-repository
+ with:
+ path: |
+ ~/.m2
+ key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
+ - name: Build
+ working-directory: ${{ matrix.sample }}
+ run: mvn clean package