feat: Comprehensive improvements to cpp-httplib-server generator

.github/ISSUE_TEMPLATE.md

@@ -1,6 +1,6 @@
 <!--
 Please follow the issue template below for bug reports and feature requests.
-Also please indicate in the issue title which language/library is concerned. Eg:  [JAVA] Bug generating foo with bar 
+Also please indicate in the issue title which language/library is concerned. E.g.:  [JAVA] Bug generating foo with bar 
 -->
 
 ##### Description

.github/ISSUE_TEMPLATE/bug_report.md

@@ -18,7 +18,7 @@ assignees: ''
 
 <!--
 Please follow the issue template below for bug reports.
-Also please indicate in the issue title which language/library is concerned. Eg:  [BUG][JAVA] Bug generating foo with bar 
+Also please indicate in the issue title which language/library is concerned. E.g.:  [BUG][JAVA] Bug generating foo with bar 
 -->
 
 ##### Description

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

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

.github/workflows/gradle-test.yaml

@@ -37,6 +37,7 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: 11
+          cache: gradle
       # Cache Gradle Dependencies
       - name: Setup Gradle Dependencies Cache
         uses: actions/cache@v4

.github/workflows/linux.yaml

@@ -27,6 +27,7 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
+          cache: gradle
 
       - uses: actions/cache@v4
         with:
@@ -44,12 +45,12 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      - uses: gradle/actions/setup-gradle@v4
+      - uses: gradle/actions/setup-gradle@v5
         with:
           gradle-version: '8.14.3'
 
       - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.18.0
+        uses: s4u/setup-maven-action@v1.19.0
         with:
           java-version: ${{ matrix.java }}
           maven-version: 3.8.8
@@ -61,7 +62,7 @@ jobs:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
       - name: Upload Maven build artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: matrix.java == '11' && matrix.os == 'ubuntu-latest'
         with:
           name: artifact
@@ -91,12 +92,13 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v5
       - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.18.0
+        uses: s4u/setup-maven-action@v1.19.0
         with:
           java-version: 11
           maven-version: 3.8.8
+          cache: gradle
       - name: Download build artifact
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: artifact
       - name: Run Ensures Script

.github/workflows/openapi-generator.yaml

@@ -21,6 +21,7 @@ jobs:
         with:
           java-version: 11
           distribution: 'temurin'
+          cache: gradle
       - name: Cache maven dependencies
         uses: actions/cache@v4
         env:
@@ -41,7 +42,7 @@ jobs:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
       - run: ls -la  modules/openapi-generator-cli/target
       - name: Upload openapi-generator-cli.jar artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: openapi-generator-cli.jar
           path: modules/openapi-generator-cli/target/openapi-generator-cli.jar
@@ -59,6 +60,7 @@ jobs:
         with:
           java-version: 11
           distribution: 'temurin'
+          cache: gradle
       - name: Cache maven dependencies
         uses: actions/cache@v4
         env:
@@ -79,7 +81,7 @@ jobs:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
       - name: Publish unit test reports
         if: ${{ always() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: surefire-test-results
           path: '**/surefire-reports/TEST-*.xml'
@@ -97,7 +99,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Download openapi-generator-cli.jar artifact
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: openapi-generator-cli.jar
           path: modules/openapi-generator-cli/target
@@ -136,7 +138,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Download openapi-generator-cli.jar artifact
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: openapi-generator-cli.jar
           path: modules/openapi-generator-cli/target

.github/workflows/samples-clojure.yaml

@@ -0,0 +1,51 @@
+name: Samples Clojure Client
+
+on:
+  push:
+    paths:
+      - samples/client/petstore/clojure/**
+  pull_request:
+    paths:
+      - samples/client/petstore/clojure/**
+jobs:
+  build:
+    name: Build Clojure Client (JDK11)
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          - samples/client/petstore/clojure/
+    services:
+      petstore-api:
+        image: swaggerapi/petstore
+        ports:
+          - 80:8080
+        env:
+          SWAGGER_HOST: http://petstore.swagger.io
+          SWAGGER_BASE_PATH: /v2
+    steps:
+      - uses: actions/checkout@v5
+      - name: Add hosts to /etc/hosts
+        run: |
+            sudo echo "127.0.0.1 petstore.swagger.io" | sudo tee -a /etc/hosts
+      - uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 11
+      - 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: Install Leiningen (if using Leiningen)
+        run: |
+          curl https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein > lein
+          chmod +x lein
+          sudo mv lein /usr/local/bin/
+      - name: Run tests (Leiningen)
+        working-directory: ${{ matrix.sample }}
+        run: lein test

.github/workflows/samples-cpp-httplib-server.yaml

@@ -0,0 +1,59 @@
+name: Samples cpp httplib server
+
+on:
+  push:
+    branches:
+      - "samples/server/petstore/cpp-httplib-server/**"
+  pull_request:
+    paths:
+      - "samples/server/petstore/cpp-httplib-server/**"
+
+env:
+  GRADLE_VERSION: 6.9
+
+jobs:
+  build:
+    name: Build cpp httplib server
+    strategy:
+      matrix:
+        sample:
+          - samples/server/petstore/cpp-httplib-server
+        os:
+          - ubuntu-latest
+          - macOS-latest
+          - windows-latest
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install dependencies (Linux)
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y nlohmann-json3-dev libssl-dev zlib1g-dev
+          # Install httplib from source since it's not in Ubuntu repos
+          git clone https://github.com/yhirose/cpp-httplib.git
+          cd cpp-httplib
+          mkdir build && cd build
+          cmake .. -DCMAKE_BUILD_TYPE=Release
+          make -j$(nproc)
+          sudo make install
+      - name: Install dependencies (macOS)
+        if: matrix.os == 'macOS-latest'
+        run: |
+          brew install nlohmann-json openssl zlib
+          # Install httplib via Homebrew
+          brew install cpp-httplib
+      - name: Install vcpkg (Windows)
+        if: matrix.os == 'windows-latest'
+        run: |
+          git clone https://github.com/microsoft/vcpkg.git
+          .\vcpkg\bootstrap-vcpkg.bat
+        shell: cmd
+      - name: Install dependencies (Windows)
+        if: matrix.os == 'windows-latest'
+        run: |
+          .\vcpkg\vcpkg.exe install nlohmann-json:x64-windows openssl:x64-windows cpp-httplib:x64-windows zlib:x64-windows
+        shell: cmd
+      - name: Build
+        working-directory: ${{ matrix.sample }}
+        run: cmake -B build && cmake --build build --verbose

.github/workflows/samples-dart-build-test.yaml

@@ -4,20 +4,24 @@ on:
   push:
     branches:
     paths:
-      #- samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/**
+      #- samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/**
       #- samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake_tests/**
-      #- samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/**
+      #- samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/**
+      - samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/**
       - samples/openapi3/client/petstore/dart-dio/oneof/**
       - samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/**
       - samples/openapi3/client/petstore/dart-dio/binary_response/**
+      - samples/openapi3/client/petstore/dart-dio/petstore-timemachine/**
   pull_request:
     paths:
-      #- samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/**
+      #- samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/**
       #- samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake_tests/**
-      #- samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/**
+      #- samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/**
+      - samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/**
       - samples/openapi3/client/petstore/dart-dio/oneof/**
       - samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/**
       - samples/openapi3/client/petstore/dart-dio/binary_response/**
+      - samples/openapi3/client/petstore/dart-dio/petstore-timemachine/**
 
 jobs:
   test:
@@ -27,12 +31,14 @@ jobs:
         os: [ubuntu-latest, windows-latest]
         sdk: ["3.9.0"]
         sample:
-          #- samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/
+          #- samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/
           #- samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake_tests/
-          #- samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/
+          #- samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/
+          - samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/
           - samples/openapi3/client/petstore/dart-dio/oneof/
           - samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/
           - samples/openapi3/client/petstore/dart-dio/binary_response/
+          - samples/openapi3/client/petstore/dart-dio/petstore-timemachine/
     steps:
       - uses: actions/checkout@v5
 

.github/workflows/samples-dotnet-petstore.yml

@@ -0,0 +1,37 @@
+name: Samples C# .Net Client (Petstore)
+
+on:
+  push:
+    paths:
+      - samples/client/petstore/csharp/restsharp/standard2.0/Petstore/**
+  pull_request:
+    paths:
+      - samples/client/petstore/csharp/restsharp/standard2.0/Petstore/**
+jobs:
+  build:
+    name: Build clients
+    runs-on: ubuntu-latest
+    services:
+      petstore-api:
+        image: swaggerapi/petstore
+        ports:
+          - 80:8080
+        env:
+          SWAGGER_HOST: http://petstore.swagger.io
+          SWAGGER_BASE_PATH: /v2
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          - samples/client/petstore/csharp/restsharp/standard2.0/Petstore/
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions/[email protected]
+        with:
+          dotnet-version: '7.0.x'
+      - 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-dotnet7-client.yml

@@ -0,0 +1,54 @@
+name: Samples C# .Net 7 Client
+
+on:
+  push:
+    paths:
+      # the .NET Core 3.0 runtime is no longer supported as it reached its end-of-life on March 3, 2020
+      #- samples/client/petstore/csharp/httpclient/standard2.0/Petstore/**
+      - samples/client/petstore/csharp/restsharp/net4.7/MultipleFrameworks/**
+      - samples/client/petstore/csharp/restsharp/net4.7/Petstore/**
+      - samples/client/petstore/csharp/restsharp/net4.8/Petstore/**
+      - samples/client/petstore/csharp/restsharp/net8/ParameterMappings/**
+      - samples/client/petstore/csharp/restsharp/net8/EnumMappings/**
+      - samples/client/petstore/csharp/restsharp/net8/Petstore/**
+      - samples/client/petstore/csharp/restsharp/net8/UseDateTimeForDate/**
+      - samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/**
+  pull_request:
+    paths:
+      #- samples/client/petstore/csharp/httpclient/standard2.0/Petstore/**
+      - samples/client/petstore/csharp/restsharp/net4.7/MultipleFrameworks/**
+      - samples/client/petstore/csharp/restsharp/net4.7/Petstore/**
+      - samples/client/petstore/csharp/restsharp/net4.8/Petstore/**
+      - samples/client/petstore/csharp/restsharp/net8/ParameterMappings/**
+      - samples/client/petstore/csharp/restsharp/net8/EnumMappings/**
+      - samples/client/petstore/csharp/restsharp/net8/Petstore/**
+      - samples/client/petstore/csharp/restsharp/net8/UseDateTimeForDate/**
+      - samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/**
+jobs:
+  build:
+    name: Build clients
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          #- samples/client/petstore/csharp/httpclient/standard2.0/Petstore/
+          - samples/client/petstore/csharp/restsharp/net4.7/MultipleFrameworks/
+          - samples/client/petstore/csharp/restsharp/net4.7/Petstore/
+          - samples/client/petstore/csharp/restsharp/net4.8/Petstore/
+          - samples/client/petstore/csharp/restsharp/net8/ParameterMappings/
+          - samples/client/petstore/csharp/restsharp/net8/EnumMappings/
+          - samples/client/petstore/csharp/restsharp/net8/Petstore/
+          - samples/client/petstore/csharp/restsharp/net8/UseDateTimeForDate/
+          - samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions/[email protected]
+        with:
+          dotnet-version: '7.0.x'
+      - 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-dotnet9.yaml

@@ -43,6 +43,7 @@ jobs:
           - samples/client/petstore/csharp/restsharp/net9/EnumMappings
           # httpclient
           - samples/client/petstore/csharp/httpclient/net9/Petstore
+          - samples/client/petstore/csharp/httpclient/net9/Petstore-nonPublicApi
           # unity
           #- samples/client/petstore/csharp/unityWebRequest/net9/Petstore
     steps: