loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

map any type in rust server generator (#6209)

Browse Source
This commit is contained in:
William Cheng 2020-05-08 10:11:58 +08:00 committed by GitHub
parent 13f329eafe
commit b23ec9a7dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,6 +211,7 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
typeMapping.put("array", "Vec");
typeMapping.put("map", "std::collections::HashMap");
typeMapping.put("object", "serde_json::Value");
typeMapping.put("AnyType", "serde_json::Value");
importMapping = new HashMap<String, String>();

2
pom.xml
View File

@ -1237,7 +1237,7 @@
<module>samples/server/petstore/python-flask-python2</module>
<module>samples/server/petstore/php-slim</module>
<module>samples/server/petstore/php-slim4</module>
<!--<module>samples/server/petstore/rust-server</module>-->
<module>samples/server/petstore/rust-server</module>
<!-- clients -->
<module>samples/client/petstore/bash</module>
<module>samples/client/petstore/c</module>

8
samples/server/petstore/rust-server/output/openapi-v3/docs/ObjectUntypedProps.md
View File

@ -3,10 +3,10 @@
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**required_untyped** | [***AnyType**](.md) | |
**required_untyped_nullable** | [***AnyType**](.md) | |
**not_required_untyped** | [***AnyType**](.md) | | [optional] [default to None]
**not_required_untyped_nullable** | [***AnyType**](.md) | | [optional] [default to None]
**required_untyped** | [***serde_json::Value**](.md) | |
**required_untyped_nullable** | [***serde_json::Value**](.md) | |
**not_required_untyped** | [***serde_json::Value**](.md) | | [optional] [default to None]
**not_required_untyped_nullable** | [***serde_json::Value**](.md) | | [optional] [default to None]
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

24
samples/server/petstore/rust-server/output/openapi-v3/src/models.rs
View File

@ -1443,23 +1443,23 @@ impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderVal
#[cfg_attr(feature = "conversion", derive(frunk::LabelledGeneric))]
pub struct ObjectUntypedProps {
#[serde(rename = "required_untyped")]
pub required_untyped: AnyType,
pub required_untyped: serde_json::Value,
#[serde(rename = "required_untyped_nullable")]
pub required_untyped_nullable: swagger::Nullable<AnyType>,
pub required_untyped_nullable: swagger::Nullable<serde_json::Value>,
#[serde(rename = "not_required_untyped")]
#[serde(skip_serializing_if="Option::is_none")]
pub not_required_untyped: Option<AnyType>,
pub not_required_untyped: Option<serde_json::Value>,
#[serde(rename = "not_required_untyped_nullable")]
#[serde(skip_serializing_if="Option::is_none")]
pub not_required_untyped_nullable: Option<AnyType>,
pub not_required_untyped_nullable: Option<serde_json::Value>,
}
impl ObjectUntypedProps {
pub fn new(required_untyped: AnyType, required_untyped_nullable: swagger::Nullable<AnyType>, ) -> ObjectUntypedProps {
pub fn new(required_untyped: serde_json::Value, required_untyped_nullable: swagger::Nullable<serde_json::Value>, ) -> ObjectUntypedProps {
ObjectUntypedProps {
required_untyped: required_untyped,
required_untyped_nullable: required_untyped_nullable,
@ -1497,10 +1497,10 @@ impl std::str::FromStr for ObjectUntypedProps {
#[derive(Default)]
// An intermediate representation of the struct to use for parsing.
struct IntermediateRep {
pub required_untyped: Vec<AnyType>,
pub required_untyped_nullable: Vec<AnyType>,
pub not_required_untyped: Vec<AnyType>,
pub not_required_untyped_nullable: Vec<AnyType>,
pub required_untyped: Vec<serde_json::Value>,
pub required_untyped_nullable: Vec<serde_json::Value>,
pub not_required_untyped: Vec<serde_json::Value>,
pub not_required_untyped_nullable: Vec<serde_json::Value>,
}
let mut intermediate_rep = IntermediateRep::default();
@ -1517,10 +1517,10 @@ impl std::str::FromStr for ObjectUntypedProps {
if let Some(key) = key_result {
match key {
"required_untyped" => intermediate_rep.required_untyped.push(AnyType::from_str(val).map_err(|x| format!("{}", x))?),
"required_untyped" => intermediate_rep.required_untyped.push(serde_json::Value::from_str(val).map_err(|x| format!("{}", x))?),
"required_untyped_nullable" => return std::result::Result::Err("Parsing a nullable type in this style is not supported in ObjectUntypedProps".to_string()),
"not_required_untyped" => intermediate_rep.not_required_untyped.push(AnyType::from_str(val).map_err(|x| format!("{}", x))?),
"not_required_untyped_nullable" => intermediate_rep.not_required_untyped_nullable.push(AnyType::from_str(val).map_err(|x| format!("{}", x))?),
"not_required_untyped" => intermediate_rep.not_required_untyped.push(serde_json::Value::from_str(val).map_err(|x| format!("{}", x))?),
"not_required_untyped_nullable" => intermediate_rep.not_required_untyped_nullable.push(serde_json::Value::from_str(val).map_err(|x| format!("{}", x))?),
_ => return std::result::Result::Err("Unexpected key while parsing ObjectUntypedProps".to_string())
}
}