Merge branch 'master' into andrew.wilson/protoCustomOptions

Author: Andrew Wilson

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

@@ -74,6 +74,7 @@ jobs:
           - samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter
           - samples/client/petstore/java/apache-httpclient
           - samples/client/petstore/java/feign
+          - samples/client/petstore/java/feign-hc5
           - samples/client/petstore/java/feign-no-nullable
           - samples/client/petstore/java/okhttp-gson-awsv4signature
           - samples/openapi3/client/petstore/java/jersey2-java8-special-characters

.github/workflows/samples-julia.yaml

@@ -30,7 +30,7 @@ jobs:
           # Using develop mode to install package so that it is easier to modify the package test files
           julia -e "using Pkg; Pkg.develop(\"OpenAPI\");"
           cd ~/.julia/dev/OpenAPI
-          git checkout v0.1.25
+          git checkout v0.2.0
           cd $currdir
           rm -rf ~/.julia/dev/OpenAPI/test/client/openapigenerator_petstore_v3/petstore
           rm -rf ~/.julia/dev/OpenAPI/test/server/openapigenerator_petstore_v3/petstore

.github/workflows/samples-scala-jdk8.yaml

@@ -0,0 +1,38 @@
+name: Samples Scala/sbt (JDK8)
+
+on:
+  push:
+    paths:
+      - 'samples/server/petstore/scala-finch/**'
+  pull_request:
+    paths:
+      - 'samples/server/petstore/scala-finch/**'
+jobs:
+  build:
+    name: Build scala-finch servers
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          # servers
+          - samples/server/petstore/scala-finch # cannot be tested with jdk11
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 8
+      - name: Setup sbt launcher
+        uses: sbt/setup-sbt@v1
+      - name: Cache maven dependencies
+        uses: actions/cache@v4
+        env:
+          cache-name: maven-repository
+        with:
+          path: |
+            ~/.ivy2
+          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/build.sbt') }}
+      - name: Build and test
+        working-directory: ${{ matrix.sample }}
+        run: sbt -v +test

.github/workflows/samples-scala.yaml

@@ -20,26 +20,26 @@ jobs:
       matrix:
         sample:
           # clients
-          - 'samples/client/petstore/java/okhttp-gson'
+          - samples/client/petstore/java/okhttp-gson
           - samples/client/petstore/scalaz
           - samples/client/petstore/scala-pekko
           - samples/client/petstore/scala-http4s
-          #- samples/client/petstore/scala-sttp # won't pass while the same tests in circleci pass
+          #- samples/client/petstore/scala-sttp
+          #- samples/client/petstore/scala-sttp-circe
           # servers
           - samples/server/petstore/scala-lagom-server
           - samples/server/petstore/scala-play-server
           - samples/server/petstore/scala-akka-http-server
           - samples/server/petstore/scala-pekko-http-server
           - samples/server/petstore/scalatra
-          - samples/server/petstore/scala-finch # cannot be tested with jdk11
           - samples/server/petstore/scala-http4s-server
           - samples/server/petstore/scala-cask
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 8
+          java-version: 11
       - name: Setup sbt launcher
         uses: sbt/setup-sbt@v1
       - name: Cache maven dependencies

CI/circle_parallel.sh

@@ -122,6 +122,7 @@ else
 
   (cd samples/client/petstore/scala-akka && mvn integration-test)
   (cd samples/client/petstore/scala-sttp && mvn integration-test)
+  (cd samples/client/petstore/scala-sttp-circe && mvn integration-test)
   (cd samples/client/petstore/scala-sttp4 && mvn integration-test)
   (cd samples/client/petstore/clojure && mvn integration-test)
   (cd samples/client/petstore/java/jersey2-java8 && mvn integration-test)

README.md

@@ -1139,7 +1139,7 @@ Here is a list of template creators:
    * Kotlin (Spring Boot): @dr4ke616
    * Kotlin (Vertx): @Wooyme
    * Kotlin (JAX-RS): @anttileppa
-   * Kotlin Misk: @andrewwilsonnew
+   * Kotlin Misk: @andrewwilsonnew @guiarn
    * Kotlin WireMock: @stefankoppier
    * NodeJS Express: @YishTish
    * PHP Flight: @daniel-sc

bin/configs/java-feign-hc5.yaml

@@ -0,0 +1,9 @@
+generatorName: java
+outputDir: samples/client/petstore/java/feign-hc5
+library: feign-hc5
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/Java
+additionalProperties:
+  booleanGetterPrefix: is
+  artifactId: petstore-feign-hc5
+  hideGenerationTimestamp: "true"

bin/configs/manual/rust-axum-array-params.yaml

@@ -0,0 +1,11 @@
+generatorName: rust-axum
+outputDir: samples/server/petstore/rust-axum/output/rust-axum-array-params-test
+inputSpec: modules/openapi-generator/src/test/resources/3_0/rust/rust-axum-array-params-test.yaml
+templateDir: modules/openapi-generator/src/main/resources/rust-axum
+generateAliasAsModel: true
+additionalProperties:
+  hideGenerationTimestamp: "true"
+  packageName: rust-axum-array-params-test
+globalProperties:
+  skipFormModel: false
+enablePostProcessFile: true

bin/configs/protobuf-schema-config.yaml

@@ -8,6 +8,7 @@ additionalProperties:
   numberedFieldNumberList: true
   startEnumsWithUnspecified: true
   wrapComplexType: false
+  supportMultipleResponses: false
   aggregateModelsName: data
   customOptionsApi: |
     option java_multiple_files = true;

bin/configs/scala-sttp-circe.yaml

@@ -0,0 +1,15 @@
+generatorName: scala-sttp
+outputDir: samples/client/petstore/scala-sttp-circe
+inputSpec: modules/openapi-generator/src/test/resources/3_0/scala/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/scala-sttp
+nameMappings:
+  _type: "`underscoreType`"
+  type_: "`typeWithUnderscore`"
+  http_debug_operation: "`httpDebugOperation`"
+parameterNameMappings:
+  _type: underscoreType
+  type_: typeWithUnderscore
+  http_debug_operation: httpDebugOperation
+additionalProperties:
+  artifactId: scala-sttp-petstore
+  jsonLibrary: circe