dsteeley · dsteeley · Jun 10, 2025 · May 27, 2025 · May 27, 2025 · May 27, 2025
diff --git a/.github/workflows/samples-rust.yaml b/.github/workflows/samples-rust.yaml
@@ -26,12 +26,54 @@ jobs:
           - samples/client/others/rust/
           - samples/client/petstore/rust/
           - samples/server/petstore/rust-server/
+          - samples/server/petstore/rust-server-deprecated/
           - samples/server/petstore/rust-axum/
     steps:
       - uses: actions/checkout@v4
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
+
+      - name: Rust cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          cache-targets: false # Don't cache workspace target directories as they don't exist
+          cache-directories:
+            ${{ matrix.sample }}/target
+          workspaces: |
+            ${{ matrix.sample }}/output/*
+
       - name: Build
         working-directory: ${{ matrix.sample }}
         run: cargo build --all-targets --all-features
+      - name: Tests
+        working-directory: ${{ matrix.sample }}
+        run: |
+          set -e
+          # Skip samples/client/petstore/rust/ as it's tests are failing.
+          if [[ "${{ matrix.sample }}" == "samples/client/petstore/rust/" ]]; then
+            echo "Skipping tests for samples/client/petstore/rust/"
+            exit 0
+          fi
+
+          # Iterate through each example and test various features
+          for package in $(find . -maxdepth 1 -mindepth 1 -type d)
+          do
+            # Not all versions have a client example
+            if test -f examples/client/main.rs; then
+              cargo build --example client --features="client"
+            fi
+            # Not all versions have a server example
+            if test -f examples/server/main.rs; then
+              cargo build --example server --features="server"
+            fi
+            # Test the CLI works if present
+            if test -f bin/cli.rs; then
+              cargo build --bin ${package##*/} --features cli
+              target/debug/${package##*/} --help
+            fi
+            cargo fmt
+            cargo test
+            cargo clippy
+            cargo doc
+          done
diff --git a/bin/configs/rust-server-deprecated-multipart-v3.yaml b/bin/configs/rust-server-deprecated-multipart-v3.yaml
@@ -0,0 +1,8 @@
+generatorName: rust-server-deprecated
+outputDir: samples/server/petstore/rust-server-deprecated/output/multipart-v3
+inputSpec: modules/openapi-generator/src/test/resources/3_0/rust-server/multipart-v3.yaml
+templateDir: modules/openapi-generator/src/main/resources/rust-server-deprecated
+generateAliasAsModel: true
+additionalProperties:
+  hideGenerationTimestamp: "true"
+  packageName: multipart-v3
diff --git a/bin/configs/rust-server-deprecated-no-example-v3.yaml b/bin/configs/rust-server-deprecated-no-example-v3.yaml
@@ -0,0 +1,8 @@
+generatorName: rust-server-deprecated
+outputDir: samples/server/petstore/rust-server-deprecated/output/no-example-v3
+inputSpec: modules/openapi-generator/src/test/resources/3_0/rust-server/no-example-v3.yaml
+templateDir: modules/openapi-generator/src/main/resources/rust-server-deprecated
+generateAliasAsModel: true
+additionalProperties:
+  hideGenerationTimestamp: "true"
+  packageName: no-example-v3
diff --git a/bin/configs/rust-server-deprecated-openapi-v3.yaml b/bin/configs/rust-server-deprecated-openapi-v3.yaml
@@ -0,0 +1,8 @@
+generatorName: rust-server-deprecated
+outputDir: samples/server/petstore/rust-server-deprecated/output/openapi-v3
+inputSpec: modules/openapi-generator/src/test/resources/3_0/rust-server/openapi-v3.yaml
+templateDir: modules/openapi-generator/src/main/resources/rust-server-deprecated
+generateAliasAsModel: true
+additionalProperties:
+  hideGenerationTimestamp: "true"
+  packageName: openapi-v3
diff --git a/bin/configs/rust-server-deprecated-ops-v3.yaml b/bin/configs/rust-server-deprecated-ops-v3.yaml
@@ -0,0 +1,8 @@
+generatorName: rust-server-deprecated
+outputDir: samples/server/petstore/rust-server-deprecated/output/ops-v3
+inputSpec: modules/openapi-generator/src/test/resources/3_0/rust-server/ops-v3.yaml
+templateDir: modules/openapi-generator/src/main/resources/rust-server-deprecated
+generateAliasAsModel: true
+additionalProperties:
+  hideGenerationTimestamp: "true"
+  packageName: ops-v3
diff --git a/bin/configs/rust-server-deprecated-petstore-with-fake-endpoints-models-for-testing.yaml b/bin/configs/rust-server-deprecated-petstore-with-fake-endpoints-models-for-testing.yaml
@@ -0,0 +1,9 @@
+generatorName: rust-server-deprecated
+outputDir: samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing
+inputSpec: modules/openapi-generator/src/test/resources/2_0/rust-server/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/rust-server-deprecated
+generateAliasAsModel: true
+additionalProperties:
+  hideGenerationTimestamp: "true"
+  packageName: petstore-with-fake-endpoints-models-for-testing
+  publishRustRegistry: crates-io
diff --git a/bin/configs/rust-server-deprecated-ping-bearer-auth-v3.yaml b/bin/configs/rust-server-deprecated-ping-bearer-auth-v3.yaml
@@ -0,0 +1,8 @@
+generatorName: rust-server-deprecated
+outputDir: samples/server/petstore/rust-server-deprecated/output/ping-bearer-auth
+inputSpec: modules/openapi-generator/src/test/resources/3_0/rust-server/ping-bearer-auth.yaml
+templateDir: modules/openapi-generator/src/main/resources/rust-server-deprecated
+generateAliasAsModel: true
+additionalProperties:
+  hideGenerationTimestamp: "true"
+  packageName: ping-bearer-auth
diff --git a/bin/configs/rust-server-deprecated-test.yaml b/bin/configs/rust-server-deprecated-test.yaml
@@ -0,0 +1,8 @@
+generatorName: rust-server-deprecated
+outputDir: samples/server/petstore/rust-server-deprecated/output/rust-server-test
+inputSpec: modules/openapi-generator/src/test/resources/2_0/rust-server/rust-server-test.yaml
+templateDir: modules/openapi-generator/src/main/resources/rust-server-deprecated
+generateAliasAsModel: true
+additionalProperties:
+  hideGenerationTimestamp: "true"
+  packageName: rust-server-test
diff --git a/docs/generators.md b/docs/generators.md
@@ -142,6 +142,7 @@ The following generators are available:
 * [ruby-sinatra](generators/ruby-sinatra.md)  
 * [rust-axum (beta)](generators/rust-axum.md)  
 * [rust-server](generators/rust-server.md)  
+* [rust-server-deprecated](generators/rust-server-deprecated.md)  
 * [scala-akka-http-server (beta)](generators/scala-akka-http-server.md)  
 * [scala-cask](generators/scala-cask.md)  
 * [scala-finch](generators/scala-finch.md)  

diff --git a/docs/generators/rust-server-deprecated.md b/docs/generators/rust-server-deprecated.md
@@ -0,0 +1,232 @@
+---
+title: Documentation for the rust-server-deprecated Generator
+---
+
+## METADATA
+
+| Property | Value | Notes |
+| -------- | ----- | ----- |
+| generator name | rust-server-deprecated | pass this to the generate command after -g |
+| generator stability | STABLE | |
+| generator type | SERVER | |
+| generator language | Rust | |
+| generator default templating engine | mustache | |
+| helpTxt | Generates a Rust Hyper/Tower server library based on hyper 0.14. Also generates a matching Hyper client library within the same crate that implements the same trait. | |
+
+## CONFIG OPTIONS
+These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.
+
+| Option | Description | Values | Default |
+| ------ | ----------- | ------ | ------- |
+|packageName|Rust crate name (convention: snake_case).| |openapi_client|
+|packageVersion|Rust crate version.| |null|
+
+## IMPORT MAPPING
+
+| Type/Alias | Imports |
+| ---------- | ------- |
+
+
+## INSTANTIATION TYPES
+
+| Type/Alias | Instantiated By |
+| ---------- | --------------- |
+|array|Vec|
+|map|std::collections::HashMap|
+
+
+## LANGUAGE PRIMITIVES
+
+<ul class="column-ul">
+<li>String</li>
+<li>bool</li>
+<li>char</li>
+<li>f32</li>
+<li>f64</li>
+<li>i16</li>
+<li>i32</li>
+<li>i64</li>
+<li>i8</li>
+<li>isize</li>
+<li>str</li>
+<li>u16</li>
+<li>u32</li>
+<li>u64</li>
+<li>u8</li>
+<li>usize</li>
+</ul>
+
+## RESERVED WORDS
+
+<ul class="column-ul">
+<li>Self</li>
+<li>abstract</li>
+<li>as</li>
+<li>async</li>
+<li>await</li>
+<li>become</li>
+<li>box</li>
+<li>break</li>
+<li>const</li>
+<li>continue</li>
+<li>crate</li>
+<li>do</li>
+<li>dyn</li>
+<li>else</li>
+<li>enum</li>
+<li>extern</li>
+<li>false</li>
+<li>final</li>
+<li>fn</li>
+<li>for</li>
+<li>if</li>
+<li>impl</li>
+<li>in</li>
+<li>let</li>
+<li>loop</li>
+<li>macro</li>
+<li>match</li>
+<li>mod</li>
+<li>move</li>
+<li>mut</li>
+<li>override</li>
+<li>priv</li>
+<li>pub</li>
+<li>ref</li>
+<li>return</li>
+<li>self</li>
+<li>static</li>
+<li>struct</li>
+<li>super</li>
+<li>trait</li>
+<li>true</li>
+<li>try</li>
+<li>type</li>
+<li>typeof</li>
+<li>unsafe</li>
+<li>unsized</li>
+<li>use</li>
+<li>virtual</li>
+<li>where</li>
+<li>while</li>
+<li>yield</li>
+</ul>
+
+## FEATURE SET
+
+
+### Client Modification Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|BasePath|✓|ToolingExtension
+|Authorizations|✗|ToolingExtension
+|UserAgent|✗|ToolingExtension
+|MockServer|✗|ToolingExtension
+
+### Data Type Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|Custom|✗|OAS2,OAS3
+|Int32|✓|OAS2,OAS3
+|Int64|✓|OAS2,OAS3
+|Float|✓|OAS2,OAS3
+|Double|✓|OAS2,OAS3
+|Decimal|✓|ToolingExtension
+|String|✓|OAS2,OAS3
+|Byte|✓|OAS2,OAS3
+|Binary|✓|OAS2,OAS3
+|Boolean|✓|OAS2,OAS3
+|Date|✓|OAS2,OAS3
+|DateTime|✓|OAS2,OAS3
+|Password|✓|OAS2,OAS3
+|File|✓|OAS2
+|Uuid|✗|
+|Array|✓|OAS2,OAS3
+|Null|✗|OAS3
+|AnyType|✗|OAS2,OAS3
+|Object|✓|OAS2,OAS3
+|Maps|✓|ToolingExtension
+|CollectionFormat|✓|OAS2
+|CollectionFormatMulti|✓|OAS2
+|Enum|✓|OAS2,OAS3
+|ArrayOfEnum|✓|ToolingExtension
+|ArrayOfModel|✓|ToolingExtension
+|ArrayOfCollectionOfPrimitives|✓|ToolingExtension
+|ArrayOfCollectionOfModel|✓|ToolingExtension
+|ArrayOfCollectionOfEnum|✓|ToolingExtension
+|MapOfEnum|✓|ToolingExtension
+|MapOfModel|✓|ToolingExtension
+|MapOfCollectionOfPrimitives|✓|ToolingExtension
+|MapOfCollectionOfModel|✓|ToolingExtension
+|MapOfCollectionOfEnum|✓|ToolingExtension
+
+### Documentation Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|Readme|✓|ToolingExtension
+|Model|✓|ToolingExtension
+|Api|✓|ToolingExtension
+
+### Global Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|Host|✓|OAS2,OAS3
+|BasePath|✓|OAS2,OAS3
+|Info|✓|OAS2,OAS3
+|Schemes|✗|OAS2,OAS3
+|PartialSchemes|✓|OAS2,OAS3
+|Consumes|✓|OAS2
+|Produces|✓|OAS2
+|ExternalDocumentation|✓|OAS2,OAS3
+|Examples|✓|OAS2,OAS3
+|XMLStructureDefinitions|✗|OAS2,OAS3
+|MultiServer|✗|OAS3
+|ParameterizedServer|✗|OAS3
+|ParameterStyling|✗|OAS3
+|Callbacks|✓|OAS3
+|LinkObjects|✗|OAS3
+
+### Parameter Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|Path|✓|OAS2,OAS3
+|Query|✓|OAS2,OAS3
+|Header|✓|OAS2,OAS3
+|Body|✓|OAS2
+|FormUnencoded|✓|OAS2
+|FormMultipart|✓|OAS2
+|Cookie|✗|OAS3
+
+### Schema Support Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|Simple|✓|OAS2,OAS3
+|Composite|✓|OAS2,OAS3
+|Polymorphism|✗|OAS2,OAS3
+|Union|✗|OAS3
+|allOf|✗|OAS2,OAS3
+|anyOf|✗|OAS3
+|oneOf|✗|OAS3
+|not|✗|OAS3
+
+### Security Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|BasicAuth|✓|OAS2,OAS3
+|ApiKey|✓|OAS2,OAS3
+|OpenIDConnect|✗|OAS3
+|BearerToken|✓|OAS3
+|OAuth2_Implicit|✓|OAS2,OAS3
+|OAuth2_Password|✗|OAS2,OAS3
+|OAuth2_ClientCredentials|✗|OAS2,OAS3
+|OAuth2_AuthorizationCode|✗|OAS2,OAS3
+|SignatureAuth|✗|OAS3
+|AWSV4Signature|✗|ToolingExtension
+
+### Wire Format Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|JSON|✓|OAS2,OAS3
+|XML|✓|OAS2,OAS3
+|PROTOBUF|✗|ToolingExtension
+|Custom|✓|OAS2,OAS3
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -54,6 +54,7 @@
 import org.openapitools.codegen.languages.PhpNextgenClientCodegen;
 import org.openapitools.codegen.languages.RustAxumServerCodegen;
 import org.openapitools.codegen.languages.RustServerCodegen;
+import org.openapitools.codegen.languages.RustServerCodegenDeprecated;
 import org.openapitools.codegen.meta.FeatureSet;
 import org.openapitools.codegen.meta.GeneratorMetadata;
 import org.openapitools.codegen.meta.Stability;
@@ -5328,7 +5329,7 @@ public CodegenParameter fromParameter(Parameter parameter, Set<String> imports)
             parameterSchema = unaliasSchema(parameter.getSchema());
             parameterModelName = getParameterDataType(parameter, parameterSchema);
             CodegenProperty prop;
-            if (this instanceof RustServerCodegen) {
+            if (this instanceof RustServerCodegen || this instanceof RustServerCodegenDeprecated) {
                 // for rust server, we need to do something special as it uses
                 // $ref (e.g. #components/schemas/Pet) to determine whether it's a model
                 prop = fromProperty(parameter.getName(), parameterSchema, false);