Merge branch 'refs/heads/master' into feat/x-implements-overrides

Author: Picazsoo

.github/workflows/samples-python-fastapi-server.yaml

@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions/setup-python@v6
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - name: Install dependencies
         working-directory: ${{ matrix.sample }}
         run: |

bin/configs/html.yaml

@@ -0,0 +1,6 @@
+generatorName: html
+outputDir: samples/documentation/html
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/htmlDocs
+additionalProperties:
+  hideGenerationTimestamp: "true"

bin/configs/swift6-vapor.yaml

@@ -7,6 +7,6 @@ generateAliasAsModel: true
 additionalProperties:
   projectName: PetstoreClient
   useSPMFileStructure: true
-  useClasses: true
+  useClasses: false
   useBacktickEscapes: true
   mapFileBinaryToData: true

bin/generate-samples.sh

@@ -47,26 +47,26 @@ For example:
 
 echo "$header"
 
+tmpfile=$(mktemp)
+trap "rm -f $tmpfile" EXIT
+
 if [[ ${#files[@]} -eq 1 && "${files[0]}" != *'*'* ]]; then
-    # shellcheck disable=SC2086
-    # shellcheck disable=SC2068
-    java ${JAVA_OPTS} -jar "$executable" generate -c ${files[0]} ${args[@]}
+  # shellcheck disable=SC2086
+  # shellcheck disable=SC2068
+  java ${JAVA_OPTS} -jar "$executable" generate -c ${files[0]} ${args[@]} 2>&1 | tee "$tmpfile"
+  retcode=${PIPESTATUS[0]}
 else
-    echo "Please press CTRL+C to stop or the script will continue in 5 seconds."
-    #sleep 5
-    if [ ${#files[@]} -eq 0 ]; then
-      files=("${root}"/bin/configs/*.yaml)
-    fi
+  if [ ${#files[@]} -eq 0 ]; then
+    files=("${root}"/bin/configs/*.yaml)
+  fi
 
-    # shellcheck disable=SC2086
-    # shellcheck disable=SC2068
-    if java ${JAVA_OPTS} -jar "$executable" batch ${BATCH_OPTS} --includes-base-dir "${root}" --fail-fast  -- ${files[@]} 2>&1 | tee /dev/pts/0 | grep -q -i "exception"; then
-      echo "Found exception(s) when running the generator(s) to update the samples."
-      export GENERATE_ERROR=1
-    fi
+  # shellcheck disable=SC2086
+  # shellcheck disable=SC2068
+  java ${JAVA_OPTS} -jar "$executable" batch ${BATCH_OPTS} --includes-base-dir "${root}" --fail-fast  -- ${files[@]} 2>&1 | tee "$tmpfile"
+  retcode=${PIPESTATUS[0]}
 fi
 
-if [[ -n "$GENERATE_ERROR" ]]; then
+if [[ $retcode -ne 0 ]] || grep -q -i "at org.openapitools" "$tmpfile"; then
   echo "Found exception(s) when running the generator(s) to update the samples."
   exit 1
 fi

bitrise.yml

@@ -27,15 +27,6 @@ workflows:
             set -e
 
             ./samples/client/petstore/swift6/swift6_test_all.sh
-    - script@1.2.0:
-        title: Run Swift5 tests
-        inputs:
-        - content: |
-            #!/usr/bin/env bash
-
-            set -e
-
-            ./samples/client/petstore/swift5/swift5_test_all.sh
     - script@1.2.0:
         title: Run swift-combine tests
         inputs:

docs/customization.md

@@ -723,3 +723,10 @@ Into this securityScheme:
       scheme: bearer
       type: http
 ```
+
+- `SORT_MODEL_PROPERTIES`: When set to true, model properties will be sorted alphabetically by name. This ensures deterministic code generation output regardless of property ordering in the source spec.
+
+Example:
+```
+java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g java -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -o /tmp/java-okhttp/ --openapi-normalizer SORT_MODEL_PROPERTIES=true
+```

docs/generators.md

@@ -68,7 +68,7 @@ The following generators are available:
 * [scala-sttp4-jsoniter (beta)](generators/scala-sttp4-jsoniter.md)  
 * [scalaz](generators/scalaz.md)  
 * [swift-combine](generators/swift-combine.md)  
-* [swift5](generators/swift5.md)  
+* [swift5 (deprecated)](generators/swift5.md)  
 * [swift6](generators/swift6.md)  
 * [typescript (experimental)](generators/typescript.md)  
 * [typescript-angular](generators/typescript-angular.md)  

docs/generators/python-fastapi.md

@@ -10,7 +10,7 @@ title: Documentation for the python-fastapi Generator
 | generator stability | BETA | |
 | generator type | SERVER | |
 | generator language | Python | |
-| generator language version | 3.7 | |
+| generator language version | 3.10 | |
 | generator default templating engine | mustache | |
 | helpTxt | Generates a Python FastAPI server (beta). Models are defined with the pydantic library | |
 

docs/generators/swift5.md

@@ -7,7 +7,7 @@ title: Documentation for the swift5 Generator
 | Property | Value | Notes |
 | -------- | ----- | ----- |
 | generator name | swift5 | pass this to the generate command after -g |
-| generator stability | STABLE | |
+| generator stability | DEPRECATED | |
 | generator type | CLIENT | |
 | generator language | Swift | |
 | generator default templating engine | mustache | |

modules/openapi-generator/pom.xml

@@ -488,7 +488,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.23.1</version>
+            <version>3.27.7</version>
             <scope>test</scope>
         </dependency>
         <dependency>