Hyper1 fixup compilation errors in all examples

* Add tests to all examples, clippy, tests, cli-bin, run examples
* Use headers Auth structs
* Fixup various clippy lints
* Move more Service impl to use BoxBody
* Reduce generic restriction on some Service impl where possible

Author: dsteeley

.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

bin/configs/rust-server-deprecated-multipart-v3.yaml

@@ -1,7 +1,7 @@
 generatorName: rust-server-deprecated
-outputDir: samples/server/petstore/rust-server/output/multipart-v3
+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
+templateDir: modules/openapi-generator/src/main/resources/rust-server-deprecated
 generateAliasAsModel: true
 additionalProperties:
   hideGenerationTimestamp: "true"

bin/configs/rust-server-deprecated-no-example-v3.yaml

@@ -1,7 +1,7 @@
 generatorName: rust-server-deprecated
-outputDir: samples/server/petstore/rust-server/output/no-example-v3
+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
+templateDir: modules/openapi-generator/src/main/resources/rust-server-deprecated
 generateAliasAsModel: true
 additionalProperties:
   hideGenerationTimestamp: "true"

bin/configs/rust-server-deprecated-openapi-v3.yaml

@@ -1,7 +1,7 @@
 generatorName: rust-server-deprecated
-outputDir: samples/server/petstore/rust-server/output/openapi-v3
+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
+templateDir: modules/openapi-generator/src/main/resources/rust-server-deprecated
 generateAliasAsModel: true
 additionalProperties:
   hideGenerationTimestamp: "true"

bin/configs/rust-server-deprecated-ops-v3.yaml

@@ -1,7 +1,7 @@
 generatorName: rust-server-deprecated
-outputDir: samples/server/petstore/rust-server/output/ops-v3
+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
+templateDir: modules/openapi-generator/src/main/resources/rust-server-deprecated
 generateAliasAsModel: true
 additionalProperties:
   hideGenerationTimestamp: "true"

bin/configs/rust-server-deprecated-petstore-with-fake-endpoints-models-for-testing.yaml

@@ -1,7 +1,7 @@
 generatorName: rust-server-deprecated
-outputDir: samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing
+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
+templateDir: modules/openapi-generator/src/main/resources/rust-server-deprecated
 generateAliasAsModel: true
 additionalProperties:
   hideGenerationTimestamp: "true"

bin/configs/rust-server-deprecated-ping-bearer-auth-v3.yaml

@@ -1,7 +1,7 @@
 generatorName: rust-server-deprecated
-outputDir: samples/server/petstore/rust-server/output/ping-bearer-auth
+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
+templateDir: modules/openapi-generator/src/main/resources/rust-server-deprecated
 generateAliasAsModel: true
 additionalProperties:
   hideGenerationTimestamp: "true"

bin/configs/rust-server-deprecated-test.yaml

@@ -1,7 +1,7 @@
 generatorName: rust-server-deprecated
-outputDir: samples/server/petstore/rust-server/output/rust-server-test
+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
+templateDir: modules/openapi-generator/src/main/resources/rust-server-deprecated
 generateAliasAsModel: true
 additionalProperties:
   hideGenerationTimestamp: "true"

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)  

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java

@@ -46,6 +46,7 @@
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import static org.openapitools.codegen.utils.StringUtils.camelize;
 import static org.openapitools.codegen.utils.StringUtils.underscore;
@@ -222,7 +223,7 @@ public RustServerCodegen() {
          */
         supportingFiles.add(new SupportingFile("openapi.mustache", "api", "openapi.yaml"));
         supportingFiles.add(new SupportingFile("Cargo.mustache", "", "Cargo.toml"));
-        supportingFiles.add(new SupportingFile("cargo-config", ".cargo", "config"));
+        supportingFiles.add(new SupportingFile("cargo-config", ".cargo", "config.toml"));
         supportingFiles.add(new SupportingFile("gitignore", "", ".gitignore"));
         supportingFiles.add(new SupportingFile("lib.mustache", "src", "lib.rs"));
         supportingFiles.add(new SupportingFile("context.mustache", "src", "context.rs"));
@@ -233,7 +234,6 @@ public RustServerCodegen() {
         supportingFiles.add(new SupportingFile("server-server_auth.mustache", "src/server", "server_auth.rs"));
         supportingFiles.add(new SupportingFile("client-mod.mustache", "src/client", "mod.rs"));
         supportingFiles.add(new SupportingFile("example-server-main.mustache", "examples/server", "main.rs"));
-        supportingFiles.add(new SupportingFile("example-server-tokio-io.rs", "examples/server", "tokio_io.rs"));
         supportingFiles.add(new SupportingFile("example-server-server.mustache", "examples/server", "server.rs"));
         supportingFiles.add(new SupportingFile("example-server-auth.mustache", "examples/server", "server_auth.rs"));
         supportingFiles.add(new SupportingFile("example-client-main.mustache", "examples/client", "main.rs"));
@@ -1532,7 +1532,16 @@ private void processParam(CodegenParameter param, CodegenOperation op) {
             }
         } else if (param.isArray) {
             param.vendorExtensions.put("x-format-string", "{:?}");
-            example = (param.example != null) ? param.example : "&Vec::new()";
+            if (param.items.isString) {
+                // We iterate through the list of string and ensure they end up in the format vec!["example".to_string()]
+                example = (param.example != null)
+                    ? "&vec![" + Arrays.stream(param.example.replace("[", "").replace("]", "").split(","))
+                        .map(item -> item + ".to_string()")
+                        .collect(Collectors.joining(", ")) + "]"
+                    : "&Vec::new()";
+            } else {
+                example = (param.example != null) ? param.example : "&Vec::new()";
+            }
         } else {
             param.vendorExtensions.put("x-format-string", "{:?}");
             if (param.example != null) {