Use model as body param for generateAliasAsModel#4569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 2 commits into from
Apr 17, 2020
Merged

Use model as body param for generateAliasAsModel #4569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc15a02
generateAliasAsModel: Use model name as body param
bodograumann Nov 21, 2019
efafcf1
Update samples
bodograumann Apr 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
288 changes: 149 additions & 139 deletions modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion samples/client/petstore/dart2/openapi/.openapi-generator/VERSION
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
4.3.1-SNAPSHOT
4.3.1-SNAPSHOT
1 change: 1 addition & 0 deletions samples/client/petstore/dart2/openapi/lib/api.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ part 'auth/authentication.dart';
part 'auth/api_key_auth.dart';
part 'auth/oauth.dart';
part 'auth/http_basic_auth.dart';
part 'auth/http_bearer_auth.dart';

part 'api/pet_api.dart';
part 'api/store_api.dart';
Expand Down
25 changes: 25 additions & 0 deletions samples/client/petstore/dart2/openapi/lib/auth/http_bearer_auth.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
part of openapi.api;

class HttpBearerAuth implements Authentication {
dynamic _accessToken;

HttpBearerAuth() { }

@override
void applyToParams(List<QueryParam> queryParams, Map<String, String> headerParams) {
if (_accessToken is String) {
headerParams["Authorization"] = "Bearer " + _accessToken;
} else if (_accessToken is String Function()){
headerParams["Authorization"] = "Bearer " + _accessToken();
} else {
throw ArgumentError('Type of Bearer accessToken should be String or String Function().');
}
}

void setAccessToken(dynamic accessToken) {
if (!((accessToken is String) | (accessToken is String Function()))){
throw ArgumentError('Type of Bearer accessToken should be String or String Function().');
}
this._accessToken = accessToken;
}
}
4 changes: 2 additions & 2 deletions samples/server/petstore/rust-server/output/openapi-v3/docs/default_api.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -231,7 +231,7 @@ Optional parameters are passed through a map[string]interface{}.

Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
**string** | [**string**](string.md)| |
**another_xml_array** | [**AnotherXmlArray**](AnotherXmlArray.md)| |

### Return type

Expand DownExpand Up@@ -263,7 +263,7 @@ Optional parameters are passed through a map[string]interface{}.

Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
**string** | [**string**](string.md)| |
**xml_array** | [**XmlArray**](XmlArray.md)| |

### Return type

Expand Down
8 changes: 4 additions & 4 deletions samples/server/petstore/rust-server/output/openapi-v3/examples/server_lib/server.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,16 +95,16 @@ impl<C> Api<C> for Server<C> where C: Has<XSpanIdString>{
}


fn xml_other_put(&self, string: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
let context = context.clone();
println!("xml_other_put({:?}) - X-Span-ID: {:?}", string, context.get().0.clone());
println!("xml_other_put({:?}) - X-Span-ID: {:?}", another_xml_array, context.get().0.clone());
Box::new(futures::failed("Generic failure".into()))
}

/// Post an array
fn xml_post(&self, string: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
fn xml_post(&self, xml_array: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
let context = context.clone();
println!("xml_post({:?}) - X-Span-ID: {:?}", string, context.get().0.clone());
println!("xml_post({:?}) - X-Span-ID: {:?}", xml_array, context.get().0.clone());
Box::new(futures::failed("Generic failure".into()))
}

Expand Down
8 changes: 4 additions & 4 deletions samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -987,7 +987,7 @@ impl<F, C> Api<C> for Client<F> where

}

fn xml_other_put(&self, param_string: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
fn xml_other_put(&self, param_another_xml_array: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
let mut uri = format!(
"{}/xml_other",
self.base_path
Expand All@@ -1009,7 +1009,7 @@ impl<F, C> Api<C> for Client<F> where

let mut request = hyper::Request::new(hyper::Method::Put, uri);

let body = param_string.map(|ref body| {
let body = param_another_xml_array.map(|ref body| {
body.to_xml()
});

Expand DownExpand Up@@ -1066,7 +1066,7 @@ impl<F, C> Api<C> for Client<F> where

}

fn xml_post(&self, param_string: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
fn xml_post(&self, param_xml_array: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
let mut uri = format!(
"{}/xml",
self.base_path
Expand All@@ -1088,7 +1088,7 @@ impl<F, C> Api<C> for Client<F> where

let mut request = hyper::Request::new(hyper::Method::Post, uri);

let body = param_string.map(|ref body| {
let body = param_xml_array.map(|ref body| {
body.to_xml()
});

Expand Down
16 changes: 8 additions & 8 deletions samples/server/petstore/rust-server/output/openapi-v3/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -199,10 +199,10 @@ pub trait Api<C> {
fn xml_other_post(&self, another_xml_object: Option<models::AnotherXmlObject>, context: &C) -> Box<dyn Future<Item=XmlOtherPostResponse, Error=ApiError>>;


fn xml_other_put(&self, string: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;
fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;

/// Post an array
fn xml_post(&self, string: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;
fn xml_post(&self, xml_array: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;


fn xml_put(&self, xml_object: Option<models::XmlObject>, context: &C) -> Box<dyn Future<Item=XmlPutResponse, Error=ApiError>>;
Expand DownExpand Up@@ -237,10 +237,10 @@ pub trait ApiNoContext {
fn xml_other_post(&self, another_xml_object: Option<models::AnotherXmlObject>) -> Box<dyn Future<Item=XmlOtherPostResponse, Error=ApiError>>;


fn xml_other_put(&self, string: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;
fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;

/// Post an array
fn xml_post(&self, string: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;
fn xml_post(&self, xml_array: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;


fn xml_put(&self, xml_object: Option<models::XmlObject>) -> Box<dyn Future<Item=XmlPutResponse, Error=ApiError>>;
Expand DownExpand Up@@ -302,13 +302,13 @@ impl<'a, T: Api<C>, C> ApiNoContext for ContextWrapper<'a, T, C> {
}


fn xml_other_put(&self, string: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
self.api().xml_other_put(string, &self.context())
fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
self.api().xml_other_put(another_xml_array, &self.context())
}

/// Post an array
fn xml_post(&self, string: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
self.api().xml_post(string, &self.context())
fn xml_post(&self, xml_array: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
self.api().xml_post(xml_array, &self.context())
}


Expand Down
16 changes: 8 additions & 8 deletions samples/server/petstore/rust-server/output/openapi-v3/src/server/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -687,19 +687,19 @@ where
match result {
Ok(body) => {
let mut unused_elements = Vec::new();
let param_string: Option<models::AnotherXmlArray> = if !body.is_empty() {
let param_another_xml_array: Option<models::AnotherXmlArray> = if !body.is_empty() {
let deserializer = &mut serde_xml_rs::de::Deserializer::new_from_reader(&*body);
match serde_ignored::deserialize(deserializer, |path| {
warn!("Ignoring unknown field in body: {}", path);
unused_elements.push(path.to_string());
}) {
Ok(param_string) => param_string,
Ok(param_another_xml_array) => param_another_xml_array,
Err(_) => None,
}
} else {
None
};
Box::new(api_impl.xml_other_put(param_string, &context)
Box::new(api_impl.xml_other_put(param_another_xml_array, &context)
.then(move |result| {
let mut response = Response::new();
response.headers_mut().set(XSpanId((&context as &dyn Has<XSpanIdString>).get().0.to_string()));
Expand DownExpand Up@@ -737,7 +737,7 @@ where
}
))
},
Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter string: {}", e)))),
Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter AnotherXmlArray: {}", e)))),
}
})
) as Box<dyn Future<Item=Response, Error=Error>>
Expand All@@ -753,19 +753,19 @@ where
match result {
Ok(body) => {
let mut unused_elements = Vec::new();
let param_string: Option<models::XmlArray> = if !body.is_empty() {
let param_xml_array: Option<models::XmlArray> = if !body.is_empty() {
let deserializer = &mut serde_xml_rs::de::Deserializer::new_from_reader(&*body);
match serde_ignored::deserialize(deserializer, |path| {
warn!("Ignoring unknown field in body: {}", path);
unused_elements.push(path.to_string());
}) {
Ok(param_string) => param_string,
Ok(param_xml_array) => param_xml_array,
Err(_) => None,
}
} else {
None
};
Box::new(api_impl.xml_post(param_string, &context)
Box::new(api_impl.xml_post(param_xml_array, &context)
.then(move |result| {
let mut response = Response::new();
response.headers_mut().set(XSpanId((&context as &dyn Has<XSpanIdString>).get().0.to_string()));
Expand DownExpand Up@@ -803,7 +803,7 @@ where
}
))
},
Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter string: {}", e)))),
Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter XmlArray: {}", e)))),
}
})
) as Box<dyn Future<Item=Response, Error=Error>>
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
 Use model as body param for generateAliasAsModel#4569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 2 commits into

from

Apr 17, 2020
 Merged


Use model as body param for generateAliasAsModel
#4569
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bc15a02

generateAliasAsModel: Use model name as body param


bodograumann Nov 21, 2019
efafcf1

Update samples


bodograumann Apr 13, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


288 changes: 149 additions & 139 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

View file


Open in desktop


Large diffs are not rendered by default.


2 changes: 1 addition & 1 deletion
samples/client/petstore/dart2/openapi/.openapi-generator/VERSION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
4.3.1-SNAPSHOT
4.3.1-SNAPSHOT

1 change: 1 addition & 0 deletions
samples/client/petstore/dart2/openapi/lib/api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ part 'auth/authentication.dart';
part 'auth/api_key_auth.dart';
part 'auth/oauth.dart';
part 'auth/http_basic_auth.dart';
part 'auth/http_bearer_auth.dart';

part 'api/pet_api.dart';
part 'api/store_api.dart';
Expand Down

25 changes: 25 additions & 0 deletions
samples/client/petstore/dart2/openapi/lib/auth/http_bearer_auth.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
part of openapi.api;

class HttpBearerAuth implements Authentication {
 dynamic _accessToken;

 HttpBearerAuth() { }

 @override
 void applyToParams(List<QueryParam> queryParams, Map<String, String> headerParams) {
 if (_accessToken is String) {
 headerParams["Authorization"] = "Bearer " + _accessToken;
 } else if (_accessToken is String Function()){
 headerParams["Authorization"] = "Bearer " + _accessToken();
 } else {
 throw ArgumentError('Type of Bearer accessToken should be String or String Function().');
 }
 }

 void setAccessToken(dynamic accessToken) {
 if (!((accessToken is String) | (accessToken is String Function()))){
 throw ArgumentError('Type of Bearer accessToken should be String or String Function().');
 } 
 this._accessToken = accessToken;
 }
}

4 changes: 2 additions & 2 deletions
samples/server/petstore/rust-server/output/openapi-v3/docs/default_api.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,7 +231,7 @@ Optional parameters are passed through a map[string]interface{}.

Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
 **string** | [**string**](string.md)| | 
 **another_xml_array** | [**AnotherXmlArray**](AnotherXmlArray.md)| | 

### Return type

Expand DownExpand Up@@ -263,7 +263,7 @@ Optional parameters are passed through a map[string]interface{}.

Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
 **string** | [**string**](string.md)| | 
 **xml_array** | [**XmlArray**](XmlArray.md)| | 

### Return type

Expand Down

8 changes: 4 additions & 4 deletions
samples/server/petstore/rust-server/output/openapi-v3/examples/server_lib/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,16 +95,16 @@ impl<C> Api<C> for Server<C> where C: Has<XSpanIdString>{
 }


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 let context = context.clone();
 println!("xml_other_put({:?}) - X-Span-ID: {:?}", string, context.get().0.clone());
 println!("xml_other_put({:?}) - X-Span-ID: {:?}", another_xml_array, context.get().0.clone());
 Box::new(futures::failed("Generic failure".into()))
 }

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 fn xml_post(&self, xml_array: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 let context = context.clone();
 println!("xml_post({:?}) - X-Span-ID: {:?}", string, context.get().0.clone());
 println!("xml_post({:?}) - X-Span-ID: {:?}", xml_array, context.get().0.clone());
 Box::new(futures::failed("Generic failure".into()))
 }

Expand Down

8 changes: 4 additions & 4 deletions
samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -987,7 +987,7 @@ impl<F, C> Api<C> for Client<F> where

 }

 fn xml_other_put(&self, param_string: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 fn xml_other_put(&self, param_another_xml_array: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 let mut uri = format!(
 "{}/xml_other",
 self.base_path
Expand All@@ -1009,7 +1009,7 @@ impl<F, C> Api<C> for Client<F> where

 let mut request = hyper::Request::new(hyper::Method::Put, uri);

 let body = param_string.map(|ref body| {
 let body = param_another_xml_array.map(|ref body| {
 body.to_xml()
 });

Expand DownExpand Up@@ -1066,7 +1066,7 @@ impl<F, C> Api<C> for Client<F> where

 }

 fn xml_post(&self, param_string: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 fn xml_post(&self, param_xml_array: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 let mut uri = format!(
 "{}/xml",
 self.base_path
Expand All@@ -1088,7 +1088,7 @@ impl<F, C> Api<C> for Client<F> where

 let mut request = hyper::Request::new(hyper::Method::Post, uri);

 let body = param_string.map(|ref body| {
 let body = param_xml_array.map(|ref body| {
 body.to_xml()
 });

Expand Down

16 changes: 8 additions & 8 deletions
samples/server/petstore/rust-server/output/openapi-v3/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,10 +199,10 @@ pub trait Api<C> {
 fn xml_other_post(&self, another_xml_object: Option<models::AnotherXmlObject>, context: &C) -> Box<dyn Future<Item=XmlOtherPostResponse, Error=ApiError>>;


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;
 fn xml_post(&self, xml_array: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;


 fn xml_put(&self, xml_object: Option<models::XmlObject>, context: &C) -> Box<dyn Future<Item=XmlPutResponse, Error=ApiError>>;
Expand DownExpand Up@@ -237,10 +237,10 @@ pub trait ApiNoContext {
 fn xml_other_post(&self, another_xml_object: Option<models::AnotherXmlObject>) -> Box<dyn Future<Item=XmlOtherPostResponse, Error=ApiError>>;


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;
 fn xml_post(&self, xml_array: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;


 fn xml_put(&self, xml_object: Option<models::XmlObject>) -> Box<dyn Future<Item=XmlPutResponse, Error=ApiError>>;
Expand DownExpand Up@@ -302,13 +302,13 @@ impl<'a, T: Api<C>, C> ApiNoContext for ContextWrapper<'a, T, C> {
 }


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 self.api().xml_other_put(string, &self.context())
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 self.api().xml_other_put(another_xml_array, &self.context())
 }

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 self.api().xml_post(string, &self.context())
 fn xml_post(&self, xml_array: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 self.api().xml_post(xml_array, &self.context())
 }


Expand Down

16 changes: 8 additions & 8 deletions
samples/server/petstore/rust-server/output/openapi-v3/src/server/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -687,19 +687,19 @@ where
 match result {
 Ok(body) => {
 let mut unused_elements = Vec::new();
 let param_string: Option<models::AnotherXmlArray> = if !body.is_empty() {
 let param_another_xml_array: Option<models::AnotherXmlArray> = if !body.is_empty() {
 let deserializer = &mut serde_xml_rs::de::Deserializer::new_from_reader(&*body);
 match serde_ignored::deserialize(deserializer, |path| {
 warn!("Ignoring unknown field in body: {}", path);
 unused_elements.push(path.to_string());
 }) {
 Ok(param_string) => param_string,
 Ok(param_another_xml_array) => param_another_xml_array,
 Err(_) => None,
 }
 } else {
 None
 };
 Box::new(api_impl.xml_other_put(param_string, &context)
 Box::new(api_impl.xml_other_put(param_another_xml_array, &context)
 .then(move |result| {
 let mut response = Response::new();
 response.headers_mut().set(XSpanId((&context as &dyn Has<XSpanIdString>).get().0.to_string()));
Expand DownExpand Up@@ -737,7 +737,7 @@ where
 }
 ))
 },
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter string: {}", e)))),
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter AnotherXmlArray: {}", e)))),
 }
 })
 ) as Box<dyn Future<Item=Response, Error=Error>>
Expand All@@ -753,19 +753,19 @@ where
 match result {
 Ok(body) => {
 let mut unused_elements = Vec::new();
 let param_string: Option<models::XmlArray> = if !body.is_empty() {
 let param_xml_array: Option<models::XmlArray> = if !body.is_empty() {
 let deserializer = &mut serde_xml_rs::de::Deserializer::new_from_reader(&*body);
 match serde_ignored::deserialize(deserializer, |path| {
 warn!("Ignoring unknown field in body: {}", path);
 unused_elements.push(path.to_string());
 }) {
 Ok(param_string) => param_string,
 Ok(param_xml_array) => param_xml_array,
 Err(_) => None,
 }
 } else {
 None
 };
 Box::new(api_impl.xml_post(param_string, &context)
 Box::new(api_impl.xml_post(param_xml_array, &context)
 .then(move |result| {
 let mut response = Response::new();
 response.headers_mut().set(XSpanId((&context as &dyn Has<XSpanIdString>).get().0.to_string()));
Expand DownExpand Up@@ -803,7 +803,7 @@ where
 }
 ))
 },
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter string: {}", e)))),
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter XmlArray: {}", e)))),
 }
 })
 ) as Box<dyn Future<Item=Response, Error=Error>>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
 Use model as body param for generateAliasAsModel#4569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 2 commits into

from

Apr 17, 2020
 Merged


Use model as body param for generateAliasAsModel
#4569
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bc15a02

generateAliasAsModel: Use model name as body param


bodograumann Nov 21, 2019
efafcf1

Update samples


bodograumann Apr 13, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


288 changes: 149 additions & 139 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

View file


Open in desktop


Large diffs are not rendered by default.


2 changes: 1 addition & 1 deletion
samples/client/petstore/dart2/openapi/.openapi-generator/VERSION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
4.3.1-SNAPSHOT
4.3.1-SNAPSHOT

1 change: 1 addition & 0 deletions
samples/client/petstore/dart2/openapi/lib/api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ part 'auth/authentication.dart';
part 'auth/api_key_auth.dart';
part 'auth/oauth.dart';
part 'auth/http_basic_auth.dart';
part 'auth/http_bearer_auth.dart';

part 'api/pet_api.dart';
part 'api/store_api.dart';
Expand Down

25 changes: 25 additions & 0 deletions
samples/client/petstore/dart2/openapi/lib/auth/http_bearer_auth.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
part of openapi.api;

class HttpBearerAuth implements Authentication {
 dynamic _accessToken;

 HttpBearerAuth() { }

 @override
 void applyToParams(List<QueryParam> queryParams, Map<String, String> headerParams) {
 if (_accessToken is String) {
 headerParams["Authorization"] = "Bearer " + _accessToken;
 } else if (_accessToken is String Function()){
 headerParams["Authorization"] = "Bearer " + _accessToken();
 } else {
 throw ArgumentError('Type of Bearer accessToken should be String or String Function().');
 }
 }

 void setAccessToken(dynamic accessToken) {
 if (!((accessToken is String) | (accessToken is String Function()))){
 throw ArgumentError('Type of Bearer accessToken should be String or String Function().');
 } 
 this._accessToken = accessToken;
 }
}

4 changes: 2 additions & 2 deletions
samples/server/petstore/rust-server/output/openapi-v3/docs/default_api.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,7 +231,7 @@ Optional parameters are passed through a map[string]interface{}.

Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
 **string** | [**string**](string.md)| | 
 **another_xml_array** | [**AnotherXmlArray**](AnotherXmlArray.md)| | 

### Return type

Expand DownExpand Up@@ -263,7 +263,7 @@ Optional parameters are passed through a map[string]interface{}.

Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
 **string** | [**string**](string.md)| | 
 **xml_array** | [**XmlArray**](XmlArray.md)| | 

### Return type

Expand Down

8 changes: 4 additions & 4 deletions
samples/server/petstore/rust-server/output/openapi-v3/examples/server_lib/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,16 +95,16 @@ impl<C> Api<C> for Server<C> where C: Has<XSpanIdString>{
 }


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 let context = context.clone();
 println!("xml_other_put({:?}) - X-Span-ID: {:?}", string, context.get().0.clone());
 println!("xml_other_put({:?}) - X-Span-ID: {:?}", another_xml_array, context.get().0.clone());
 Box::new(futures::failed("Generic failure".into()))
 }

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 fn xml_post(&self, xml_array: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 let context = context.clone();
 println!("xml_post({:?}) - X-Span-ID: {:?}", string, context.get().0.clone());
 println!("xml_post({:?}) - X-Span-ID: {:?}", xml_array, context.get().0.clone());
 Box::new(futures::failed("Generic failure".into()))
 }

Expand Down

8 changes: 4 additions & 4 deletions
samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -987,7 +987,7 @@ impl<F, C> Api<C> for Client<F> where

 }

 fn xml_other_put(&self, param_string: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 fn xml_other_put(&self, param_another_xml_array: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 let mut uri = format!(
 "{}/xml_other",
 self.base_path
Expand All@@ -1009,7 +1009,7 @@ impl<F, C> Api<C> for Client<F> where

 let mut request = hyper::Request::new(hyper::Method::Put, uri);

 let body = param_string.map(|ref body| {
 let body = param_another_xml_array.map(|ref body| {
 body.to_xml()
 });

Expand DownExpand Up@@ -1066,7 +1066,7 @@ impl<F, C> Api<C> for Client<F> where

 }

 fn xml_post(&self, param_string: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 fn xml_post(&self, param_xml_array: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 let mut uri = format!(
 "{}/xml",
 self.base_path
Expand All@@ -1088,7 +1088,7 @@ impl<F, C> Api<C> for Client<F> where

 let mut request = hyper::Request::new(hyper::Method::Post, uri);

 let body = param_string.map(|ref body| {
 let body = param_xml_array.map(|ref body| {
 body.to_xml()
 });

Expand Down

16 changes: 8 additions & 8 deletions
samples/server/petstore/rust-server/output/openapi-v3/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,10 +199,10 @@ pub trait Api<C> {
 fn xml_other_post(&self, another_xml_object: Option<models::AnotherXmlObject>, context: &C) -> Box<dyn Future<Item=XmlOtherPostResponse, Error=ApiError>>;


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;
 fn xml_post(&self, xml_array: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;


 fn xml_put(&self, xml_object: Option<models::XmlObject>, context: &C) -> Box<dyn Future<Item=XmlPutResponse, Error=ApiError>>;
Expand DownExpand Up@@ -237,10 +237,10 @@ pub trait ApiNoContext {
 fn xml_other_post(&self, another_xml_object: Option<models::AnotherXmlObject>) -> Box<dyn Future<Item=XmlOtherPostResponse, Error=ApiError>>;


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;
 fn xml_post(&self, xml_array: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;


 fn xml_put(&self, xml_object: Option<models::XmlObject>) -> Box<dyn Future<Item=XmlPutResponse, Error=ApiError>>;
Expand DownExpand Up@@ -302,13 +302,13 @@ impl<'a, T: Api<C>, C> ApiNoContext for ContextWrapper<'a, T, C> {
 }


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 self.api().xml_other_put(string, &self.context())
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 self.api().xml_other_put(another_xml_array, &self.context())
 }

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 self.api().xml_post(string, &self.context())
 fn xml_post(&self, xml_array: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 self.api().xml_post(xml_array, &self.context())
 }


Expand Down

16 changes: 8 additions & 8 deletions
samples/server/petstore/rust-server/output/openapi-v3/src/server/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -687,19 +687,19 @@ where
 match result {
 Ok(body) => {
 let mut unused_elements = Vec::new();
 let param_string: Option<models::AnotherXmlArray> = if !body.is_empty() {
 let param_another_xml_array: Option<models::AnotherXmlArray> = if !body.is_empty() {
 let deserializer = &mut serde_xml_rs::de::Deserializer::new_from_reader(&*body);
 match serde_ignored::deserialize(deserializer, |path| {
 warn!("Ignoring unknown field in body: {}", path);
 unused_elements.push(path.to_string());
 }) {
 Ok(param_string) => param_string,
 Ok(param_another_xml_array) => param_another_xml_array,
 Err(_) => None,
 }
 } else {
 None
 };
 Box::new(api_impl.xml_other_put(param_string, &context)
 Box::new(api_impl.xml_other_put(param_another_xml_array, &context)
 .then(move |result| {
 let mut response = Response::new();
 response.headers_mut().set(XSpanId((&context as &dyn Has<XSpanIdString>).get().0.to_string()));
Expand DownExpand Up@@ -737,7 +737,7 @@ where
 }
 ))
 },
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter string: {}", e)))),
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter AnotherXmlArray: {}", e)))),
 }
 })
 ) as Box<dyn Future<Item=Response, Error=Error>>
Expand All@@ -753,19 +753,19 @@ where
 match result {
 Ok(body) => {
 let mut unused_elements = Vec::new();
 let param_string: Option<models::XmlArray> = if !body.is_empty() {
 let param_xml_array: Option<models::XmlArray> = if !body.is_empty() {
 let deserializer = &mut serde_xml_rs::de::Deserializer::new_from_reader(&*body);
 match serde_ignored::deserialize(deserializer, |path| {
 warn!("Ignoring unknown field in body: {}", path);
 unused_elements.push(path.to_string());
 }) {
 Ok(param_string) => param_string,
 Ok(param_xml_array) => param_xml_array,
 Err(_) => None,
 }
 } else {
 None
 };
 Box::new(api_impl.xml_post(param_string, &context)
 Box::new(api_impl.xml_post(param_xml_array, &context)
 .then(move |result| {
 let mut response = Response::new();
 response.headers_mut().set(XSpanId((&context as &dyn Has<XSpanIdString>).get().0.to_string()));
Expand DownExpand Up@@ -803,7 +803,7 @@ where
 }
 ))
 },
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter string: {}", e)))),
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter XmlArray: {}", e)))),
 }
 })
 ) as Box<dyn Future<Item=Response, Error=Error>>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
 Use model as body param for generateAliasAsModel#4569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 2 commits into

from

Apr 17, 2020
 Merged


Use model as body param for generateAliasAsModel
#4569
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bc15a02

generateAliasAsModel: Use model name as body param


bodograumann Nov 21, 2019
efafcf1

Update samples


bodograumann Apr 13, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


288 changes: 149 additions & 139 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

View file


Open in desktop


Large diffs are not rendered by default.


2 changes: 1 addition & 1 deletion
samples/client/petstore/dart2/openapi/.openapi-generator/VERSION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
4.3.1-SNAPSHOT
4.3.1-SNAPSHOT

1 change: 1 addition & 0 deletions
samples/client/petstore/dart2/openapi/lib/api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ part 'auth/authentication.dart';
part 'auth/api_key_auth.dart';
part 'auth/oauth.dart';
part 'auth/http_basic_auth.dart';
part 'auth/http_bearer_auth.dart';

part 'api/pet_api.dart';
part 'api/store_api.dart';
Expand Down

25 changes: 25 additions & 0 deletions
samples/client/petstore/dart2/openapi/lib/auth/http_bearer_auth.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
part of openapi.api;

class HttpBearerAuth implements Authentication {
 dynamic _accessToken;

 HttpBearerAuth() { }

 @override
 void applyToParams(List<QueryParam> queryParams, Map<String, String> headerParams) {
 if (_accessToken is String) {
 headerParams["Authorization"] = "Bearer " + _accessToken;
 } else if (_accessToken is String Function()){
 headerParams["Authorization"] = "Bearer " + _accessToken();
 } else {
 throw ArgumentError('Type of Bearer accessToken should be String or String Function().');
 }
 }

 void setAccessToken(dynamic accessToken) {
 if (!((accessToken is String) | (accessToken is String Function()))){
 throw ArgumentError('Type of Bearer accessToken should be String or String Function().');
 } 
 this._accessToken = accessToken;
 }
}

4 changes: 2 additions & 2 deletions
samples/server/petstore/rust-server/output/openapi-v3/docs/default_api.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,7 +231,7 @@ Optional parameters are passed through a map[string]interface{}.

Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
 **string** | [**string**](string.md)| | 
 **another_xml_array** | [**AnotherXmlArray**](AnotherXmlArray.md)| | 

### Return type

Expand DownExpand Up@@ -263,7 +263,7 @@ Optional parameters are passed through a map[string]interface{}.

Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
 **string** | [**string**](string.md)| | 
 **xml_array** | [**XmlArray**](XmlArray.md)| | 

### Return type

Expand Down

8 changes: 4 additions & 4 deletions
samples/server/petstore/rust-server/output/openapi-v3/examples/server_lib/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,16 +95,16 @@ impl<C> Api<C> for Server<C> where C: Has<XSpanIdString>{
 }


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 let context = context.clone();
 println!("xml_other_put({:?}) - X-Span-ID: {:?}", string, context.get().0.clone());
 println!("xml_other_put({:?}) - X-Span-ID: {:?}", another_xml_array, context.get().0.clone());
 Box::new(futures::failed("Generic failure".into()))
 }

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 fn xml_post(&self, xml_array: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 let context = context.clone();
 println!("xml_post({:?}) - X-Span-ID: {:?}", string, context.get().0.clone());
 println!("xml_post({:?}) - X-Span-ID: {:?}", xml_array, context.get().0.clone());
 Box::new(futures::failed("Generic failure".into()))
 }

Expand Down

8 changes: 4 additions & 4 deletions
samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -987,7 +987,7 @@ impl<F, C> Api<C> for Client<F> where

 }

 fn xml_other_put(&self, param_string: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 fn xml_other_put(&self, param_another_xml_array: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 let mut uri = format!(
 "{}/xml_other",
 self.base_path
Expand All@@ -1009,7 +1009,7 @@ impl<F, C> Api<C> for Client<F> where

 let mut request = hyper::Request::new(hyper::Method::Put, uri);

 let body = param_string.map(|ref body| {
 let body = param_another_xml_array.map(|ref body| {
 body.to_xml()
 });

Expand DownExpand Up@@ -1066,7 +1066,7 @@ impl<F, C> Api<C> for Client<F> where

 }

 fn xml_post(&self, param_string: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 fn xml_post(&self, param_xml_array: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 let mut uri = format!(
 "{}/xml",
 self.base_path
Expand All@@ -1088,7 +1088,7 @@ impl<F, C> Api<C> for Client<F> where

 let mut request = hyper::Request::new(hyper::Method::Post, uri);

 let body = param_string.map(|ref body| {
 let body = param_xml_array.map(|ref body| {
 body.to_xml()
 });

Expand Down

16 changes: 8 additions & 8 deletions
samples/server/petstore/rust-server/output/openapi-v3/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,10 +199,10 @@ pub trait Api<C> {
 fn xml_other_post(&self, another_xml_object: Option<models::AnotherXmlObject>, context: &C) -> Box<dyn Future<Item=XmlOtherPostResponse, Error=ApiError>>;


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;
 fn xml_post(&self, xml_array: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;


 fn xml_put(&self, xml_object: Option<models::XmlObject>, context: &C) -> Box<dyn Future<Item=XmlPutResponse, Error=ApiError>>;
Expand DownExpand Up@@ -237,10 +237,10 @@ pub trait ApiNoContext {
 fn xml_other_post(&self, another_xml_object: Option<models::AnotherXmlObject>) -> Box<dyn Future<Item=XmlOtherPostResponse, Error=ApiError>>;


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;
 fn xml_post(&self, xml_array: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;


 fn xml_put(&self, xml_object: Option<models::XmlObject>) -> Box<dyn Future<Item=XmlPutResponse, Error=ApiError>>;
Expand DownExpand Up@@ -302,13 +302,13 @@ impl<'a, T: Api<C>, C> ApiNoContext for ContextWrapper<'a, T, C> {
 }


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 self.api().xml_other_put(string, &self.context())
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 self.api().xml_other_put(another_xml_array, &self.context())
 }

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 self.api().xml_post(string, &self.context())
 fn xml_post(&self, xml_array: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 self.api().xml_post(xml_array, &self.context())
 }


Expand Down

16 changes: 8 additions & 8 deletions
samples/server/petstore/rust-server/output/openapi-v3/src/server/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -687,19 +687,19 @@ where
 match result {
 Ok(body) => {
 let mut unused_elements = Vec::new();
 let param_string: Option<models::AnotherXmlArray> = if !body.is_empty() {
 let param_another_xml_array: Option<models::AnotherXmlArray> = if !body.is_empty() {
 let deserializer = &mut serde_xml_rs::de::Deserializer::new_from_reader(&*body);
 match serde_ignored::deserialize(deserializer, |path| {
 warn!("Ignoring unknown field in body: {}", path);
 unused_elements.push(path.to_string());
 }) {
 Ok(param_string) => param_string,
 Ok(param_another_xml_array) => param_another_xml_array,
 Err(_) => None,
 }
 } else {
 None
 };
 Box::new(api_impl.xml_other_put(param_string, &context)
 Box::new(api_impl.xml_other_put(param_another_xml_array, &context)
 .then(move |result| {
 let mut response = Response::new();
 response.headers_mut().set(XSpanId((&context as &dyn Has<XSpanIdString>).get().0.to_string()));
Expand DownExpand Up@@ -737,7 +737,7 @@ where
 }
 ))
 },
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter string: {}", e)))),
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter AnotherXmlArray: {}", e)))),
 }
 })
 ) as Box<dyn Future<Item=Response, Error=Error>>
Expand All@@ -753,19 +753,19 @@ where
 match result {
 Ok(body) => {
 let mut unused_elements = Vec::new();
 let param_string: Option<models::XmlArray> = if !body.is_empty() {
 let param_xml_array: Option<models::XmlArray> = if !body.is_empty() {
 let deserializer = &mut serde_xml_rs::de::Deserializer::new_from_reader(&*body);
 match serde_ignored::deserialize(deserializer, |path| {
 warn!("Ignoring unknown field in body: {}", path);
 unused_elements.push(path.to_string());
 }) {
 Ok(param_string) => param_string,
 Ok(param_xml_array) => param_xml_array,
 Err(_) => None,
 }
 } else {
 None
 };
 Box::new(api_impl.xml_post(param_string, &context)
 Box::new(api_impl.xml_post(param_xml_array, &context)
 .then(move |result| {
 let mut response = Response::new();
 response.headers_mut().set(XSpanId((&context as &dyn Has<XSpanIdString>).get().0.to_string()));
Expand DownExpand Up@@ -803,7 +803,7 @@ where
 }
 ))
 },
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter string: {}", e)))),
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter XmlArray: {}", e)))),
 }
 })
 ) as Box<dyn Future<Item=Response, Error=Error>>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
 Use model as body param for generateAliasAsModel#4569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 2 commits into

from

Apr 17, 2020
 Merged


Use model as body param for generateAliasAsModel
#4569
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bc15a02

generateAliasAsModel: Use model name as body param


bodograumann Nov 21, 2019
efafcf1

Update samples


bodograumann Apr 13, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


288 changes: 149 additions & 139 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

View file


Open in desktop


Large diffs are not rendered by default.


2 changes: 1 addition & 1 deletion
samples/client/petstore/dart2/openapi/.openapi-generator/VERSION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
4.3.1-SNAPSHOT
4.3.1-SNAPSHOT

1 change: 1 addition & 0 deletions
samples/client/petstore/dart2/openapi/lib/api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ part 'auth/authentication.dart';
part 'auth/api_key_auth.dart';
part 'auth/oauth.dart';
part 'auth/http_basic_auth.dart';
part 'auth/http_bearer_auth.dart';

part 'api/pet_api.dart';
part 'api/store_api.dart';
Expand Down

25 changes: 25 additions & 0 deletions
samples/client/petstore/dart2/openapi/lib/auth/http_bearer_auth.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
part of openapi.api;

class HttpBearerAuth implements Authentication {
 dynamic _accessToken;

 HttpBearerAuth() { }

 @override
 void applyToParams(List<QueryParam> queryParams, Map<String, String> headerParams) {
 if (_accessToken is String) {
 headerParams["Authorization"] = "Bearer " + _accessToken;
 } else if (_accessToken is String Function()){
 headerParams["Authorization"] = "Bearer " + _accessToken();
 } else {
 throw ArgumentError('Type of Bearer accessToken should be String or String Function().');
 }
 }

 void setAccessToken(dynamic accessToken) {
 if (!((accessToken is String) | (accessToken is String Function()))){
 throw ArgumentError('Type of Bearer accessToken should be String or String Function().');
 } 
 this._accessToken = accessToken;
 }
}

4 changes: 2 additions & 2 deletions
samples/server/petstore/rust-server/output/openapi-v3/docs/default_api.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,7 +231,7 @@ Optional parameters are passed through a map[string]interface{}.

Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
 **string** | [**string**](string.md)| | 
 **another_xml_array** | [**AnotherXmlArray**](AnotherXmlArray.md)| | 

### Return type

Expand DownExpand Up@@ -263,7 +263,7 @@ Optional parameters are passed through a map[string]interface{}.

Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
 **string** | [**string**](string.md)| | 
 **xml_array** | [**XmlArray**](XmlArray.md)| | 

### Return type

Expand Down

8 changes: 4 additions & 4 deletions
samples/server/petstore/rust-server/output/openapi-v3/examples/server_lib/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,16 +95,16 @@ impl<C> Api<C> for Server<C> where C: Has<XSpanIdString>{
 }


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 let context = context.clone();
 println!("xml_other_put({:?}) - X-Span-ID: {:?}", string, context.get().0.clone());
 println!("xml_other_put({:?}) - X-Span-ID: {:?}", another_xml_array, context.get().0.clone());
 Box::new(futures::failed("Generic failure".into()))
 }

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 fn xml_post(&self, xml_array: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 let context = context.clone();
 println!("xml_post({:?}) - X-Span-ID: {:?}", string, context.get().0.clone());
 println!("xml_post({:?}) - X-Span-ID: {:?}", xml_array, context.get().0.clone());
 Box::new(futures::failed("Generic failure".into()))
 }

Expand Down

8 changes: 4 additions & 4 deletions
samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -987,7 +987,7 @@ impl<F, C> Api<C> for Client<F> where

 }

 fn xml_other_put(&self, param_string: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 fn xml_other_put(&self, param_another_xml_array: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 let mut uri = format!(
 "{}/xml_other",
 self.base_path
Expand All@@ -1009,7 +1009,7 @@ impl<F, C> Api<C> for Client<F> where

 let mut request = hyper::Request::new(hyper::Method::Put, uri);

 let body = param_string.map(|ref body| {
 let body = param_another_xml_array.map(|ref body| {
 body.to_xml()
 });

Expand DownExpand Up@@ -1066,7 +1066,7 @@ impl<F, C> Api<C> for Client<F> where

 }

 fn xml_post(&self, param_string: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 fn xml_post(&self, param_xml_array: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 let mut uri = format!(
 "{}/xml",
 self.base_path
Expand All@@ -1088,7 +1088,7 @@ impl<F, C> Api<C> for Client<F> where

 let mut request = hyper::Request::new(hyper::Method::Post, uri);

 let body = param_string.map(|ref body| {
 let body = param_xml_array.map(|ref body| {
 body.to_xml()
 });

Expand Down

16 changes: 8 additions & 8 deletions
samples/server/petstore/rust-server/output/openapi-v3/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,10 +199,10 @@ pub trait Api<C> {
 fn xml_other_post(&self, another_xml_object: Option<models::AnotherXmlObject>, context: &C) -> Box<dyn Future<Item=XmlOtherPostResponse, Error=ApiError>>;


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;
 fn xml_post(&self, xml_array: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;


 fn xml_put(&self, xml_object: Option<models::XmlObject>, context: &C) -> Box<dyn Future<Item=XmlPutResponse, Error=ApiError>>;
Expand DownExpand Up@@ -237,10 +237,10 @@ pub trait ApiNoContext {
 fn xml_other_post(&self, another_xml_object: Option<models::AnotherXmlObject>) -> Box<dyn Future<Item=XmlOtherPostResponse, Error=ApiError>>;


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;
 fn xml_post(&self, xml_array: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;


 fn xml_put(&self, xml_object: Option<models::XmlObject>) -> Box<dyn Future<Item=XmlPutResponse, Error=ApiError>>;
Expand DownExpand Up@@ -302,13 +302,13 @@ impl<'a, T: Api<C>, C> ApiNoContext for ContextWrapper<'a, T, C> {
 }


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 self.api().xml_other_put(string, &self.context())
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 self.api().xml_other_put(another_xml_array, &self.context())
 }

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 self.api().xml_post(string, &self.context())
 fn xml_post(&self, xml_array: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 self.api().xml_post(xml_array, &self.context())
 }


Expand Down

16 changes: 8 additions & 8 deletions
samples/server/petstore/rust-server/output/openapi-v3/src/server/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -687,19 +687,19 @@ where
 match result {
 Ok(body) => {
 let mut unused_elements = Vec::new();
 let param_string: Option<models::AnotherXmlArray> = if !body.is_empty() {
 let param_another_xml_array: Option<models::AnotherXmlArray> = if !body.is_empty() {
 let deserializer = &mut serde_xml_rs::de::Deserializer::new_from_reader(&*body);
 match serde_ignored::deserialize(deserializer, |path| {
 warn!("Ignoring unknown field in body: {}", path);
 unused_elements.push(path.to_string());
 }) {
 Ok(param_string) => param_string,
 Ok(param_another_xml_array) => param_another_xml_array,
 Err(_) => None,
 }
 } else {
 None
 };
 Box::new(api_impl.xml_other_put(param_string, &context)
 Box::new(api_impl.xml_other_put(param_another_xml_array, &context)
 .then(move |result| {
 let mut response = Response::new();
 response.headers_mut().set(XSpanId((&context as &dyn Has<XSpanIdString>).get().0.to_string()));
Expand DownExpand Up@@ -737,7 +737,7 @@ where
 }
 ))
 },
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter string: {}", e)))),
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter AnotherXmlArray: {}", e)))),
 }
 })
 ) as Box<dyn Future<Item=Response, Error=Error>>
Expand All@@ -753,19 +753,19 @@ where
 match result {
 Ok(body) => {
 let mut unused_elements = Vec::new();
 let param_string: Option<models::XmlArray> = if !body.is_empty() {
 let param_xml_array: Option<models::XmlArray> = if !body.is_empty() {
 let deserializer = &mut serde_xml_rs::de::Deserializer::new_from_reader(&*body);
 match serde_ignored::deserialize(deserializer, |path| {
 warn!("Ignoring unknown field in body: {}", path);
 unused_elements.push(path.to_string());
 }) {
 Ok(param_string) => param_string,
 Ok(param_xml_array) => param_xml_array,
 Err(_) => None,
 }
 } else {
 None
 };
 Box::new(api_impl.xml_post(param_string, &context)
 Box::new(api_impl.xml_post(param_xml_array, &context)
 .then(move |result| {
 let mut response = Response::new();
 response.headers_mut().set(XSpanId((&context as &dyn Has<XSpanIdString>).get().0.to_string()));
Expand DownExpand Up@@ -803,7 +803,7 @@ where
 }
 ))
 },
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter string: {}", e)))),
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter XmlArray: {}", e)))),
 }
 })
 ) as Box<dyn Future<Item=Response, Error=Error>>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
 Use model as body param for generateAliasAsModel#4569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 2 commits into

from

Apr 17, 2020
 Merged


Use model as body param for generateAliasAsModel
#4569
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bc15a02

generateAliasAsModel: Use model name as body param


bodograumann Nov 21, 2019
efafcf1

Update samples


bodograumann Apr 13, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


288 changes: 149 additions & 139 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

View file


Open in desktop


Large diffs are not rendered by default.


2 changes: 1 addition & 1 deletion
samples/client/petstore/dart2/openapi/.openapi-generator/VERSION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
4.3.1-SNAPSHOT
4.3.1-SNAPSHOT

1 change: 1 addition & 0 deletions
samples/client/petstore/dart2/openapi/lib/api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ part 'auth/authentication.dart';
part 'auth/api_key_auth.dart';
part 'auth/oauth.dart';
part 'auth/http_basic_auth.dart';
part 'auth/http_bearer_auth.dart';

part 'api/pet_api.dart';
part 'api/store_api.dart';
Expand Down

25 changes: 25 additions & 0 deletions
samples/client/petstore/dart2/openapi/lib/auth/http_bearer_auth.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
part of openapi.api;

class HttpBearerAuth implements Authentication {
 dynamic _accessToken;

 HttpBearerAuth() { }

 @override
 void applyToParams(List<QueryParam> queryParams, Map<String, String> headerParams) {
 if (_accessToken is String) {
 headerParams["Authorization"] = "Bearer " + _accessToken;
 } else if (_accessToken is String Function()){
 headerParams["Authorization"] = "Bearer " + _accessToken();
 } else {
 throw ArgumentError('Type of Bearer accessToken should be String or String Function().');
 }
 }

 void setAccessToken(dynamic accessToken) {
 if (!((accessToken is String) | (accessToken is String Function()))){
 throw ArgumentError('Type of Bearer accessToken should be String or String Function().');
 } 
 this._accessToken = accessToken;
 }
}

4 changes: 2 additions & 2 deletions
samples/server/petstore/rust-server/output/openapi-v3/docs/default_api.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,7 +231,7 @@ Optional parameters are passed through a map[string]interface{}.

Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
 **string** | [**string**](string.md)| | 
 **another_xml_array** | [**AnotherXmlArray**](AnotherXmlArray.md)| | 

### Return type

Expand DownExpand Up@@ -263,7 +263,7 @@ Optional parameters are passed through a map[string]interface{}.

Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
 **string** | [**string**](string.md)| | 
 **xml_array** | [**XmlArray**](XmlArray.md)| | 

### Return type

Expand Down

8 changes: 4 additions & 4 deletions
samples/server/petstore/rust-server/output/openapi-v3/examples/server_lib/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,16 +95,16 @@ impl<C> Api<C> for Server<C> where C: Has<XSpanIdString>{
 }


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 let context = context.clone();
 println!("xml_other_put({:?}) - X-Span-ID: {:?}", string, context.get().0.clone());
 println!("xml_other_put({:?}) - X-Span-ID: {:?}", another_xml_array, context.get().0.clone());
 Box::new(futures::failed("Generic failure".into()))
 }

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 fn xml_post(&self, xml_array: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 let context = context.clone();
 println!("xml_post({:?}) - X-Span-ID: {:?}", string, context.get().0.clone());
 println!("xml_post({:?}) - X-Span-ID: {:?}", xml_array, context.get().0.clone());
 Box::new(futures::failed("Generic failure".into()))
 }

Expand Down

8 changes: 4 additions & 4 deletions
samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -987,7 +987,7 @@ impl<F, C> Api<C> for Client<F> where

 }

 fn xml_other_put(&self, param_string: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 fn xml_other_put(&self, param_another_xml_array: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 let mut uri = format!(
 "{}/xml_other",
 self.base_path
Expand All@@ -1009,7 +1009,7 @@ impl<F, C> Api<C> for Client<F> where

 let mut request = hyper::Request::new(hyper::Method::Put, uri);

 let body = param_string.map(|ref body| {
 let body = param_another_xml_array.map(|ref body| {
 body.to_xml()
 });

Expand DownExpand Up@@ -1066,7 +1066,7 @@ impl<F, C> Api<C> for Client<F> where

 }

 fn xml_post(&self, param_string: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 fn xml_post(&self, param_xml_array: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 let mut uri = format!(
 "{}/xml",
 self.base_path
Expand All@@ -1088,7 +1088,7 @@ impl<F, C> Api<C> for Client<F> where

 let mut request = hyper::Request::new(hyper::Method::Post, uri);

 let body = param_string.map(|ref body| {
 let body = param_xml_array.map(|ref body| {
 body.to_xml()
 });

Expand Down

16 changes: 8 additions & 8 deletions
samples/server/petstore/rust-server/output/openapi-v3/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,10 +199,10 @@ pub trait Api<C> {
 fn xml_other_post(&self, another_xml_object: Option<models::AnotherXmlObject>, context: &C) -> Box<dyn Future<Item=XmlOtherPostResponse, Error=ApiError>>;


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;
 fn xml_post(&self, xml_array: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;


 fn xml_put(&self, xml_object: Option<models::XmlObject>, context: &C) -> Box<dyn Future<Item=XmlPutResponse, Error=ApiError>>;
Expand DownExpand Up@@ -237,10 +237,10 @@ pub trait ApiNoContext {
 fn xml_other_post(&self, another_xml_object: Option<models::AnotherXmlObject>) -> Box<dyn Future<Item=XmlOtherPostResponse, Error=ApiError>>;


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;
 fn xml_post(&self, xml_array: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;


 fn xml_put(&self, xml_object: Option<models::XmlObject>) -> Box<dyn Future<Item=XmlPutResponse, Error=ApiError>>;
Expand DownExpand Up@@ -302,13 +302,13 @@ impl<'a, T: Api<C>, C> ApiNoContext for ContextWrapper<'a, T, C> {
 }


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 self.api().xml_other_put(string, &self.context())
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 self.api().xml_other_put(another_xml_array, &self.context())
 }

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 self.api().xml_post(string, &self.context())
 fn xml_post(&self, xml_array: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 self.api().xml_post(xml_array, &self.context())
 }


Expand Down

16 changes: 8 additions & 8 deletions
samples/server/petstore/rust-server/output/openapi-v3/src/server/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -687,19 +687,19 @@ where
 match result {
 Ok(body) => {
 let mut unused_elements = Vec::new();
 let param_string: Option<models::AnotherXmlArray> = if !body.is_empty() {
 let param_another_xml_array: Option<models::AnotherXmlArray> = if !body.is_empty() {
 let deserializer = &mut serde_xml_rs::de::Deserializer::new_from_reader(&*body);
 match serde_ignored::deserialize(deserializer, |path| {
 warn!("Ignoring unknown field in body: {}", path);
 unused_elements.push(path.to_string());
 }) {
 Ok(param_string) => param_string,
 Ok(param_another_xml_array) => param_another_xml_array,
 Err(_) => None,
 }
 } else {
 None
 };
 Box::new(api_impl.xml_other_put(param_string, &context)
 Box::new(api_impl.xml_other_put(param_another_xml_array, &context)
 .then(move |result| {
 let mut response = Response::new();
 response.headers_mut().set(XSpanId((&context as &dyn Has<XSpanIdString>).get().0.to_string()));
Expand DownExpand Up@@ -737,7 +737,7 @@ where
 }
 ))
 },
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter string: {}", e)))),
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter AnotherXmlArray: {}", e)))),
 }
 })
 ) as Box<dyn Future<Item=Response, Error=Error>>
Expand All@@ -753,19 +753,19 @@ where
 match result {
 Ok(body) => {
 let mut unused_elements = Vec::new();
 let param_string: Option<models::XmlArray> = if !body.is_empty() {
 let param_xml_array: Option<models::XmlArray> = if !body.is_empty() {
 let deserializer = &mut serde_xml_rs::de::Deserializer::new_from_reader(&*body);
 match serde_ignored::deserialize(deserializer, |path| {
 warn!("Ignoring unknown field in body: {}", path);
 unused_elements.push(path.to_string());
 }) {
 Ok(param_string) => param_string,
 Ok(param_xml_array) => param_xml_array,
 Err(_) => None,
 }
 } else {
 None
 };
 Box::new(api_impl.xml_post(param_string, &context)
 Box::new(api_impl.xml_post(param_xml_array, &context)
 .then(move |result| {
 let mut response = Response::new();
 response.headers_mut().set(XSpanId((&context as &dyn Has<XSpanIdString>).get().0.to_string()));
Expand DownExpand Up@@ -803,7 +803,7 @@ where
 }
 ))
 },
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter string: {}", e)))),
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter XmlArray: {}", e)))),
 }
 })
 ) as Box<dyn Future<Item=Response, Error=Error>>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
 Use model as body param for generateAliasAsModel#4569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 2 commits into

from

Apr 17, 2020
 Merged


Use model as body param for generateAliasAsModel
#4569
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bc15a02

generateAliasAsModel: Use model name as body param


bodograumann Nov 21, 2019
efafcf1

Update samples


bodograumann Apr 13, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


288 changes: 149 additions & 139 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

View file


Open in desktop


Large diffs are not rendered by default.


2 changes: 1 addition & 1 deletion
samples/client/petstore/dart2/openapi/.openapi-generator/VERSION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
4.3.1-SNAPSHOT
4.3.1-SNAPSHOT

1 change: 1 addition & 0 deletions
samples/client/petstore/dart2/openapi/lib/api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ part 'auth/authentication.dart';
part 'auth/api_key_auth.dart';
part 'auth/oauth.dart';
part 'auth/http_basic_auth.dart';
part 'auth/http_bearer_auth.dart';

part 'api/pet_api.dart';
part 'api/store_api.dart';
Expand Down

25 changes: 25 additions & 0 deletions
samples/client/petstore/dart2/openapi/lib/auth/http_bearer_auth.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
part of openapi.api;

class HttpBearerAuth implements Authentication {
 dynamic _accessToken;

 HttpBearerAuth() { }

 @override
 void applyToParams(List<QueryParam> queryParams, Map<String, String> headerParams) {
 if (_accessToken is String) {
 headerParams["Authorization"] = "Bearer " + _accessToken;
 } else if (_accessToken is String Function()){
 headerParams["Authorization"] = "Bearer " + _accessToken();
 } else {
 throw ArgumentError('Type of Bearer accessToken should be String or String Function().');
 }
 }

 void setAccessToken(dynamic accessToken) {
 if (!((accessToken is String) | (accessToken is String Function()))){
 throw ArgumentError('Type of Bearer accessToken should be String or String Function().');
 } 
 this._accessToken = accessToken;
 }
}

4 changes: 2 additions & 2 deletions
samples/server/petstore/rust-server/output/openapi-v3/docs/default_api.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,7 +231,7 @@ Optional parameters are passed through a map[string]interface{}.

Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
 **string** | [**string**](string.md)| | 
 **another_xml_array** | [**AnotherXmlArray**](AnotherXmlArray.md)| | 

### Return type

Expand DownExpand Up@@ -263,7 +263,7 @@ Optional parameters are passed through a map[string]interface{}.

Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
 **string** | [**string**](string.md)| | 
 **xml_array** | [**XmlArray**](XmlArray.md)| | 

### Return type

Expand Down

8 changes: 4 additions & 4 deletions
samples/server/petstore/rust-server/output/openapi-v3/examples/server_lib/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,16 +95,16 @@ impl<C> Api<C> for Server<C> where C: Has<XSpanIdString>{
 }


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 let context = context.clone();
 println!("xml_other_put({:?}) - X-Span-ID: {:?}", string, context.get().0.clone());
 println!("xml_other_put({:?}) - X-Span-ID: {:?}", another_xml_array, context.get().0.clone());
 Box::new(futures::failed("Generic failure".into()))
 }

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 fn xml_post(&self, xml_array: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 let context = context.clone();
 println!("xml_post({:?}) - X-Span-ID: {:?}", string, context.get().0.clone());
 println!("xml_post({:?}) - X-Span-ID: {:?}", xml_array, context.get().0.clone());
 Box::new(futures::failed("Generic failure".into()))
 }

Expand Down

8 changes: 4 additions & 4 deletions
samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -987,7 +987,7 @@ impl<F, C> Api<C> for Client<F> where

 }

 fn xml_other_put(&self, param_string: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 fn xml_other_put(&self, param_another_xml_array: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 let mut uri = format!(
 "{}/xml_other",
 self.base_path
Expand All@@ -1009,7 +1009,7 @@ impl<F, C> Api<C> for Client<F> where

 let mut request = hyper::Request::new(hyper::Method::Put, uri);

 let body = param_string.map(|ref body| {
 let body = param_another_xml_array.map(|ref body| {
 body.to_xml()
 });

Expand DownExpand Up@@ -1066,7 +1066,7 @@ impl<F, C> Api<C> for Client<F> where

 }

 fn xml_post(&self, param_string: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 fn xml_post(&self, param_xml_array: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 let mut uri = format!(
 "{}/xml",
 self.base_path
Expand All@@ -1088,7 +1088,7 @@ impl<F, C> Api<C> for Client<F> where

 let mut request = hyper::Request::new(hyper::Method::Post, uri);

 let body = param_string.map(|ref body| {
 let body = param_xml_array.map(|ref body| {
 body.to_xml()
 });

Expand Down

16 changes: 8 additions & 8 deletions
samples/server/petstore/rust-server/output/openapi-v3/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,10 +199,10 @@ pub trait Api<C> {
 fn xml_other_post(&self, another_xml_object: Option<models::AnotherXmlObject>, context: &C) -> Box<dyn Future<Item=XmlOtherPostResponse, Error=ApiError>>;


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;
 fn xml_post(&self, xml_array: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;


 fn xml_put(&self, xml_object: Option<models::XmlObject>, context: &C) -> Box<dyn Future<Item=XmlPutResponse, Error=ApiError>>;
Expand DownExpand Up@@ -237,10 +237,10 @@ pub trait ApiNoContext {
 fn xml_other_post(&self, another_xml_object: Option<models::AnotherXmlObject>) -> Box<dyn Future<Item=XmlOtherPostResponse, Error=ApiError>>;


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;
 fn xml_post(&self, xml_array: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;


 fn xml_put(&self, xml_object: Option<models::XmlObject>) -> Box<dyn Future<Item=XmlPutResponse, Error=ApiError>>;
Expand DownExpand Up@@ -302,13 +302,13 @@ impl<'a, T: Api<C>, C> ApiNoContext for ContextWrapper<'a, T, C> {
 }


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 self.api().xml_other_put(string, &self.context())
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 self.api().xml_other_put(another_xml_array, &self.context())
 }

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 self.api().xml_post(string, &self.context())
 fn xml_post(&self, xml_array: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 self.api().xml_post(xml_array, &self.context())
 }


Expand Down

16 changes: 8 additions & 8 deletions
samples/server/petstore/rust-server/output/openapi-v3/src/server/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -687,19 +687,19 @@ where
 match result {
 Ok(body) => {
 let mut unused_elements = Vec::new();
 let param_string: Option<models::AnotherXmlArray> = if !body.is_empty() {
 let param_another_xml_array: Option<models::AnotherXmlArray> = if !body.is_empty() {
 let deserializer = &mut serde_xml_rs::de::Deserializer::new_from_reader(&*body);
 match serde_ignored::deserialize(deserializer, |path| {
 warn!("Ignoring unknown field in body: {}", path);
 unused_elements.push(path.to_string());
 }) {
 Ok(param_string) => param_string,
 Ok(param_another_xml_array) => param_another_xml_array,
 Err(_) => None,
 }
 } else {
 None
 };
 Box::new(api_impl.xml_other_put(param_string, &context)
 Box::new(api_impl.xml_other_put(param_another_xml_array, &context)
 .then(move |result| {
 let mut response = Response::new();
 response.headers_mut().set(XSpanId((&context as &dyn Has<XSpanIdString>).get().0.to_string()));
Expand DownExpand Up@@ -737,7 +737,7 @@ where
 }
 ))
 },
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter string: {}", e)))),
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter AnotherXmlArray: {}", e)))),
 }
 })
 ) as Box<dyn Future<Item=Response, Error=Error>>
Expand All@@ -753,19 +753,19 @@ where
 match result {
 Ok(body) => {
 let mut unused_elements = Vec::new();
 let param_string: Option<models::XmlArray> = if !body.is_empty() {
 let param_xml_array: Option<models::XmlArray> = if !body.is_empty() {
 let deserializer = &mut serde_xml_rs::de::Deserializer::new_from_reader(&*body);
 match serde_ignored::deserialize(deserializer, |path| {
 warn!("Ignoring unknown field in body: {}", path);
 unused_elements.push(path.to_string());
 }) {
 Ok(param_string) => param_string,
 Ok(param_xml_array) => param_xml_array,
 Err(_) => None,
 }
 } else {
 None
 };
 Box::new(api_impl.xml_post(param_string, &context)
 Box::new(api_impl.xml_post(param_xml_array, &context)
 .then(move |result| {
 let mut response = Response::new();
 response.headers_mut().set(XSpanId((&context as &dyn Has<XSpanIdString>).get().0.to_string()));
Expand DownExpand Up@@ -803,7 +803,7 @@ where
 }
 ))
 },
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter string: {}", e)))),
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter XmlArray: {}", e)))),
 }
 })
 ) as Box<dyn Future<Item=Response, Error=Error>>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
 Use model as body param for generateAliasAsModel#4569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wing328
merged 2 commits into

from

Apr 17, 2020
 Merged


Use model as body param for generateAliasAsModel
#4569
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bc15a02

generateAliasAsModel: Use model name as body param


bodograumann Nov 21, 2019
efafcf1

Update samples


bodograumann Apr 13, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


288 changes: 149 additions & 139 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

View file


Open in desktop


Large diffs are not rendered by default.


2 changes: 1 addition & 1 deletion
samples/client/petstore/dart2/openapi/.openapi-generator/VERSION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
4.3.1-SNAPSHOT
4.3.1-SNAPSHOT

1 change: 1 addition & 0 deletions
samples/client/petstore/dart2/openapi/lib/api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ part 'auth/authentication.dart';
part 'auth/api_key_auth.dart';
part 'auth/oauth.dart';
part 'auth/http_basic_auth.dart';
part 'auth/http_bearer_auth.dart';

part 'api/pet_api.dart';
part 'api/store_api.dart';
Expand Down

25 changes: 25 additions & 0 deletions
samples/client/petstore/dart2/openapi/lib/auth/http_bearer_auth.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
part of openapi.api;

class HttpBearerAuth implements Authentication {
 dynamic _accessToken;

 HttpBearerAuth() { }

 @override
 void applyToParams(List<QueryParam> queryParams, Map<String, String> headerParams) {
 if (_accessToken is String) {
 headerParams["Authorization"] = "Bearer " + _accessToken;
 } else if (_accessToken is String Function()){
 headerParams["Authorization"] = "Bearer " + _accessToken();
 } else {
 throw ArgumentError('Type of Bearer accessToken should be String or String Function().');
 }
 }

 void setAccessToken(dynamic accessToken) {
 if (!((accessToken is String) | (accessToken is String Function()))){
 throw ArgumentError('Type of Bearer accessToken should be String or String Function().');
 } 
 this._accessToken = accessToken;
 }
}

4 changes: 2 additions & 2 deletions
samples/server/petstore/rust-server/output/openapi-v3/docs/default_api.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,7 +231,7 @@ Optional parameters are passed through a map[string]interface{}.

Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
 **string** | [**string**](string.md)| | 
 **another_xml_array** | [**AnotherXmlArray**](AnotherXmlArray.md)| | 

### Return type

Expand DownExpand Up@@ -263,7 +263,7 @@ Optional parameters are passed through a map[string]interface{}.

Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
 **string** | [**string**](string.md)| | 
 **xml_array** | [**XmlArray**](XmlArray.md)| | 

### Return type

Expand Down

8 changes: 4 additions & 4 deletions
samples/server/petstore/rust-server/output/openapi-v3/examples/server_lib/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,16 +95,16 @@ impl<C> Api<C> for Server<C> where C: Has<XSpanIdString>{
 }


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 let context = context.clone();
 println!("xml_other_put({:?}) - X-Span-ID: {:?}", string, context.get().0.clone());
 println!("xml_other_put({:?}) - X-Span-ID: {:?}", another_xml_array, context.get().0.clone());
 Box::new(futures::failed("Generic failure".into()))
 }

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 fn xml_post(&self, xml_array: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 let context = context.clone();
 println!("xml_post({:?}) - X-Span-ID: {:?}", string, context.get().0.clone());
 println!("xml_post({:?}) - X-Span-ID: {:?}", xml_array, context.get().0.clone());
 Box::new(futures::failed("Generic failure".into()))
 }

Expand Down

8 changes: 4 additions & 4 deletions
samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -987,7 +987,7 @@ impl<F, C> Api<C> for Client<F> where

 }

 fn xml_other_put(&self, param_string: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 fn xml_other_put(&self, param_another_xml_array: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 let mut uri = format!(
 "{}/xml_other",
 self.base_path
Expand All@@ -1009,7 +1009,7 @@ impl<F, C> Api<C> for Client<F> where

 let mut request = hyper::Request::new(hyper::Method::Put, uri);

 let body = param_string.map(|ref body| {
 let body = param_another_xml_array.map(|ref body| {
 body.to_xml()
 });

Expand DownExpand Up@@ -1066,7 +1066,7 @@ impl<F, C> Api<C> for Client<F> where

 }

 fn xml_post(&self, param_string: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 fn xml_post(&self, param_xml_array: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 let mut uri = format!(
 "{}/xml",
 self.base_path
Expand All@@ -1088,7 +1088,7 @@ impl<F, C> Api<C> for Client<F> where

 let mut request = hyper::Request::new(hyper::Method::Post, uri);

 let body = param_string.map(|ref body| {
 let body = param_xml_array.map(|ref body| {
 body.to_xml()
 });

Expand Down

16 changes: 8 additions & 8 deletions
samples/server/petstore/rust-server/output/openapi-v3/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,10 +199,10 @@ pub trait Api<C> {
 fn xml_other_post(&self, another_xml_object: Option<models::AnotherXmlObject>, context: &C) -> Box<dyn Future<Item=XmlOtherPostResponse, Error=ApiError>>;


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>, context: &C) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;
 fn xml_post(&self, xml_array: Option<models::XmlArray>, context: &C) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;


 fn xml_put(&self, xml_object: Option<models::XmlObject>, context: &C) -> Box<dyn Future<Item=XmlPutResponse, Error=ApiError>>;
Expand DownExpand Up@@ -237,10 +237,10 @@ pub trait ApiNoContext {
 fn xml_other_post(&self, another_xml_object: Option<models::AnotherXmlObject>) -> Box<dyn Future<Item=XmlOtherPostResponse, Error=ApiError>>;


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>>;

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;
 fn xml_post(&self, xml_array: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>>;


 fn xml_put(&self, xml_object: Option<models::XmlObject>) -> Box<dyn Future<Item=XmlPutResponse, Error=ApiError>>;
Expand DownExpand Up@@ -302,13 +302,13 @@ impl<'a, T: Api<C>, C> ApiNoContext for ContextWrapper<'a, T, C> {
 }


 fn xml_other_put(&self, string: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 self.api().xml_other_put(string, &self.context())
 fn xml_other_put(&self, another_xml_array: Option<models::AnotherXmlArray>) -> Box<dyn Future<Item=XmlOtherPutResponse, Error=ApiError>> {
 self.api().xml_other_put(another_xml_array, &self.context())
 }

 /// Post an array
 fn xml_post(&self, string: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 self.api().xml_post(string, &self.context())
 fn xml_post(&self, xml_array: Option<models::XmlArray>) -> Box<dyn Future<Item=XmlPostResponse, Error=ApiError>> {
 self.api().xml_post(xml_array, &self.context())
 }


Expand Down

16 changes: 8 additions & 8 deletions
samples/server/petstore/rust-server/output/openapi-v3/src/server/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -687,19 +687,19 @@ where
 match result {
 Ok(body) => {
 let mut unused_elements = Vec::new();
 let param_string: Option<models::AnotherXmlArray> = if !body.is_empty() {
 let param_another_xml_array: Option<models::AnotherXmlArray> = if !body.is_empty() {
 let deserializer = &mut serde_xml_rs::de::Deserializer::new_from_reader(&*body);
 match serde_ignored::deserialize(deserializer, |path| {
 warn!("Ignoring unknown field in body: {}", path);
 unused_elements.push(path.to_string());
 }) {
 Ok(param_string) => param_string,
 Ok(param_another_xml_array) => param_another_xml_array,
 Err(_) => None,
 }
 } else {
 None
 };
 Box::new(api_impl.xml_other_put(param_string, &context)
 Box::new(api_impl.xml_other_put(param_another_xml_array, &context)
 .then(move |result| {
 let mut response = Response::new();
 response.headers_mut().set(XSpanId((&context as &dyn Has<XSpanIdString>).get().0.to_string()));
Expand DownExpand Up@@ -737,7 +737,7 @@ where
 }
 ))
 },
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter string: {}", e)))),
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter AnotherXmlArray: {}", e)))),
 }
 })
 ) as Box<dyn Future<Item=Response, Error=Error>>
Expand All@@ -753,19 +753,19 @@ where
 match result {
 Ok(body) => {
 let mut unused_elements = Vec::new();
 let param_string: Option<models::XmlArray> = if !body.is_empty() {
 let param_xml_array: Option<models::XmlArray> = if !body.is_empty() {
 let deserializer = &mut serde_xml_rs::de::Deserializer::new_from_reader(&*body);
 match serde_ignored::deserialize(deserializer, |path| {
 warn!("Ignoring unknown field in body: {}", path);
 unused_elements.push(path.to_string());
 }) {
 Ok(param_string) => param_string,
 Ok(param_xml_array) => param_xml_array,
 Err(_) => None,
 }
 } else {
 None
 };
 Box::new(api_impl.xml_post(param_string, &context)
 Box::new(api_impl.xml_post(param_xml_array, &context)
 .then(move |result| {
 let mut response = Response::new();
 response.headers_mut().set(XSpanId((&context as &dyn Has<XSpanIdString>).get().0.to_string()));
Expand DownExpand Up@@ -803,7 +803,7 @@ where
 }
 ))
 },
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter string: {}", e)))),
 Err(e) => Box::new(future::ok(Response::new().with_status(StatusCode::BadRequest).with_body(format!("Couldn't read body parameter XmlArray: {}", e)))),
 }
 })
 ) as Box<dyn Future<Item=Response, Error=Error>>
Expand Down