Ensure rust-server compiles with no-default-features (#22445)

Author: dsteeley

.github/workflows/samples-rust-server.yaml

@@ -39,7 +39,10 @@ jobs:
 
       - name: Build
         working-directory: ${{ matrix.sample }}
-        run: cargo build --all-targets --all-features
+        run: |
+          set -e
+          cargo build --all-targets --all-features
+          cargo build --all-targets --no-default-features
       - name: Tests
         working-directory: ${{ matrix.sample }}
         run: |

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

@@ -1233,6 +1233,10 @@ public CodegenModel fromModel(String name, Schema model) {
                 additionalProperties.put("apiUsesUuid", true);
             }
 
+            if (prop.isByteArray) {
+                additionalProperties.put("apiUsesByteArray", true);
+            }
+
             String xmlName = modelXmlNames.get(prop.dataType);
             if (xmlName != null) {
                 prop.vendorExtensions.put("x-item-xml-name", xmlName);
@@ -1535,6 +1539,11 @@ private void processParam(CodegenParameter param, CodegenOperation op) {
             additionalProperties.put("apiUsesUuid", true);
         }
 
+        // If a parameter uses byte arrays, we need to set a flag.
+        if (param.isByteArray) {
+            additionalProperties.put("apiUsesByteArray", true);
+        }
+
         if (Boolean.TRUE.equals(param.isFreeFormObject)) {
             param.vendorExtensions.put("x-format-string", "{:?}");
             example = null;

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

@@ -1213,6 +1213,10 @@ public CodegenModel fromModel(String name, Schema model) {
                 additionalProperties.put("apiUsesUuid", true);
             }
 
+            if (prop.isByteArray) {
+                additionalProperties.put("apiUsesByteArray", true);
+            }
+
             String xmlName = modelXmlNames.get(prop.dataType);
             if (xmlName != null) {
                 prop.vendorExtensions.put("x-item-xml-name", xmlName);
@@ -1515,6 +1519,11 @@ private void processParam(CodegenParameter param, CodegenOperation op) {
             additionalProperties.put("apiUsesUuid", true);
         }
 
+        // If a parameter uses byte arrays, we need to set a flag.
+        if (param.isByteArray) {
+            additionalProperties.put("apiUsesByteArray", true);
+        }
+
         if (Boolean.TRUE.equals(param.isFreeFormObject)) {
             param.vendorExtensions.put("x-format-string", "{:?}");
             example = null;

modules/openapi-generator/src/main/resources/rust-server-deprecated/Cargo.mustache

@@ -47,7 +47,7 @@ client = [
     "serde_urlencoded",
 {{/usesUrlEncodedForm}}
 {{#hasCallbacks}}
-    "serde_ignored", "regex", "percent-encoding", "lazy_static",
+    "serde_ignored", "percent-encoding", {{^apiUsesByteArray}}"lazy_static", "regex",{{/apiUsesByteArray}}
 {{/hasCallbacks}}
 {{! Anything added to the list below, should probably be added to the callbacks list below }}
     "hyper", "hyper-openssl", "hyper-tls", "native-tls", "openssl", "url"
@@ -66,7 +66,7 @@ server = [
     "native-tls", "hyper-openssl", "hyper-tls", "openssl",
 {{/hasCallbacks}}
 {{! Anything added to the list below, should probably be added to the callbacks list above }}
-   "serde_ignored", "hyper", "regex", "percent-encoding", "url", "lazy_static"
+   "serde_ignored", "hyper", "percent-encoding", "url" {{^apiUsesByteArray}},"lazy_static", "regex"{{/apiUsesByteArray}}
 ]
 cli = [
 {{#apiHasDeleteMethods}}
@@ -96,6 +96,10 @@ mime = "0.3"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 validator = { version = "0.16", features = ["derive"] }
+{{#apiUsesByteArray}}
+lazy_static = "1.5"
+regex = "1.12"
+{{/apiUsesByteArray}}
 
 # Crates included if required by the API definition
 {{#usesXml}}
@@ -126,9 +130,11 @@ serde_urlencoded = {version = "0.6.1", optional = true}
 {{/usesUrlEncodedForm}}
 
 # Server, and client callback-specific
+{{^apiUsesByteArray}}
 lazy_static = { version = "1.4", optional = true }
-percent-encoding = {version = "2.1.0", optional = true}
 regex = {version = "1.3", optional = true}
+{{/apiUsesByteArray}}
+percent-encoding = {version = "2.1.0", optional = true}
 
 # CLI-specific
 anyhow = { version = "1", optional = true }

modules/openapi-generator/src/main/resources/rust-server-deprecated/auth.mustache

@@ -1,7 +1,6 @@
 use std::collections::BTreeSet;
-use crate::server::Authorization;
 use serde::{Deserialize, Serialize};
-use swagger::{ApiError, auth::{Basic, Bearer}};
+use swagger::{ApiError, auth::{Basic, Bearer, Authorization}};
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Claims {
@@ -24,7 +23,7 @@ pub trait AuthenticationApi {
 
     /// Method should be implemented (see example-code) to map Basic (Username:password) to an Authorization
     fn basic_authorization(&self, basic: &Basic) -> Result<Authorization, ApiError>;
-} 
+}
 
 // Implement it for AllowAllAuthenticator (dummy is needed, but should not used as we have Bearer authorization)
 use swagger::auth::{AllowAllAuthenticator, RcBound, Scopes};

modules/openapi-generator/src/main/resources/rust-server-deprecated/lib.mustache

@@ -6,10 +6,8 @@ use futures::Stream;
 use std::error::Error;
 use std::collections::BTreeSet;
 use std::task::{Poll, Context};
-use swagger::{ApiError, ContextWrapper};
+use swagger::{ApiError, ContextWrapper, auth::Authorization};
 use serde::{Serialize, Deserialize};
-use crate::server::Authorization;
-
 
 type ServiceError = Box<dyn Error + Send + Sync + 'static>;
 

modules/openapi-generator/src/main/resources/rust-server/Cargo.mustache

@@ -44,7 +44,7 @@ client = [
     "serde_urlencoded",
 {{/usesUrlEncodedForm}}
 {{#hasCallbacks}}
-    "serde_ignored", "regex", "percent-encoding", "lazy_static",
+    "serde_ignored", "percent-encoding", {{^apiUsesByteArray}}"lazy_static", "regex"{{/apiUsesByteArray}}
 {{/hasCallbacks}}
 {{! Anything added to the list below, should probably be added to the callbacks list below }}
     "hyper", "hyper-util/http1", "hyper-util/http2", "hyper-openssl", "hyper-tls", "native-tls", "openssl", "url"
@@ -60,7 +60,8 @@ server = [
     "native-tls", "hyper-openssl", "hyper-tls", "openssl",
 {{/hasCallbacks}}
 {{! Anything added to the list below, should probably be added to the callbacks list above }}
-   "serde_ignored", "hyper", "regex", "percent-encoding", "url", "lazy_static"
+   "serde_ignored", "hyper", "percent-encoding", "url",
+   {{^apiUsesByteArray}}"lazy_static", "regex"{{/apiUsesByteArray}}
 ]
 cli = [
 {{#apiHasDeleteMethods}}
@@ -88,8 +89,14 @@ futures = "0.3"
 swagger = { version = "7.0.0", features = ["serdejson", "server", "client", "tls"] }
 headers = "0.4.0"
 log = "0.4.27"
+
 mime = "0.3"
 mockall = { version = "0.13.1", optional = true }
+{{#apiUsesByteArray}}
+lazy_static = "1.5"
+regex = "1.12"
+{{/apiUsesByteArray}}
+
 
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
@@ -124,9 +131,11 @@ serde_urlencoded = { version = "0.7.1", optional = true }
 tower-service = "0.3.3"
 
 # Server, and client callback-specific
+{{^apiUsesByteArray}}
 lazy_static = { version = "1.5", optional = true }
-percent-encoding = { version = "2.3.1", optional = true }
 regex = { version = "1.12", optional = true }
+{{/apiUsesByteArray}}
+percent-encoding = { version = "2.3.1", optional = true }
 
 # CLI-specific
 anyhow = { version = "1", optional = true }

modules/openapi-generator/src/main/resources/rust-server/auth.mustache

@@ -1,7 +1,6 @@
 use std::collections::BTreeSet;
-use crate::server::Authorization;
 use serde::{Deserialize, Serialize};
-use swagger::ApiError;
+use swagger::{ApiError, auth::Authorization};
 use headers::authorization::{Basic, Bearer};
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Claims {

modules/openapi-generator/src/main/resources/rust-server/lib.mustache

@@ -8,11 +8,10 @@ use mockall::automock;
 use std::error::Error;
 use std::collections::BTreeSet;
 use std::task::{Poll, Context};
-use swagger::{ApiError, ContextWrapper};
+use swagger::{ApiError, ContextWrapper, auth::Authorization};
 use serde::{Serialize, Deserialize};
-use crate::server::Authorization;
-
 
+#[cfg(any(feature = "client", feature = "server"))]
 type ServiceError = Box<dyn Error + Send + Sync + 'static>;
 
 pub const BASE_PATH: &str = "{{{basePathWithoutHost}}}";

samples/server/petstore/rust-server-deprecated/output/multipart-v3/Cargo.toml

@@ -19,7 +19,7 @@ server = [
     "mime_0_2",
     "multipart", "multipart/server", "swagger/multipart_form",
     "hyper_0_10", "mime_multipart", "swagger/multipart_related",
-   "serde_ignored", "hyper", "regex", "percent-encoding", "url", "lazy_static"
+   "serde_ignored", "hyper", "percent-encoding", "url" 
 ]
 cli = [
   "anyhow", "clap-verbosity-flag", "simple_logger", "structopt", "tokio"
@@ -46,6 +46,8 @@ mime = "0.3"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 validator = { version = "0.16", features = ["derive"] }
+lazy_static = "1.5"
+regex = "1.12"
 
 # Crates included if required by the API definition
 mime_0_2 = { package = "mime", version = "0.2.6", optional = true }
@@ -61,9 +63,7 @@ url = {version = "2.1", optional = true}
 # Client-specific
 
 # Server, and client callback-specific
-lazy_static = { version = "1.4", optional = true }
 percent-encoding = {version = "2.1.0", optional = true}
-regex = {version = "1.3", optional = true}
 
 # CLI-specific
 anyhow = { version = "1", optional = true }