Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion examples/axum/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ mod error;
mod state;
mod user;

use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4};

use anyhow::Result;
use tokio::net::TcpListener;
use utoipa_axum::router::OpenApiRouter;
Expand All @@ -22,7 +24,10 @@ async fn main() -> Result<()> {
.merge(Scalar::with_url("/api/reference", openapi))
.with_state(AppState::default());

let listener = TcpListener::bind("0.0.0.0:8080").await?;
let addr = SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::new(0, 0, 0, 0), 8080));
let listener = TcpListener::bind(addr).await?;
println!("listening on http://{:?}", addr);

axum::serve(listener, router).await?;

Ok(())
Expand Down
49 changes: 37 additions & 12 deletions packages/breach/src/utoipa.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,47 +16,72 @@ pub fn merge_responses(
.flatten()
.chunk_by(|(code, _)| code.clone())
.into_iter()
.map(|(code, chunk)| {
.filter_map(|(code, chunk)| {
let response = merge_response(
StatusCode::from_bytes(code.as_bytes()).expect("valid status code"),
chunk.map(|(_, response)| response),
);

(code, RefOr::T(response))
response.map(|response| (code, RefOr::T(response)))
})
.collect()
}

/// Merge multiple [`RefOr<Response>`] into a single [`Response`].
fn merge_response(code: StatusCode, responses: impl Iterator<Item = RefOr<Response>>) -> Response {
let responses = responses.filter_map(|response| match response {
RefOr::Ref(_) => None,
RefOr::T(response) => Some(response),
});
fn merge_response(
code: StatusCode,
responses: impl Iterator<Item = RefOr<Response>>,
) -> Option<Response> {
let mut responses = responses
.filter_map(|response| match response {
RefOr::Ref(_) => None,
RefOr::T(response) => Some(response),
})
.collect::<Vec<_>>();

let mut builder = ResponseBuilder::new();

if responses.is_empty() {
return None;
} else if responses.len() == 1 {
return Some(responses.remove(0));
}

if let Some(canonical_reason) = code.canonical_reason() {
builder = builder.description(canonical_reason)
}

builder = responses
.into_iter()
.flat_map(|response| response.content)
.chunk_by(|(content_type, _)| content_type.clone())
.into_iter()
.fold(builder, |builder, (content_type, chunk)| {
let content = merge_content(chunk.map(|(_, content)| content));
let content = merge_content(
chunk
.map(|(_, content)| content)
.collect::<Vec<_>>()
.into_iter(),
);

// TODO: Merge content.
builder.content(content_type, content)
if let Some(content) = content {
builder.content(content_type, content)
} else {
builder
}
});

// TODO: Merge headers, extensions, links.

builder.build()
Some(builder.build())
}

fn merge_content(contents: impl Iterator<Item = Content>) -> Content {
fn merge_content(mut contents: impl ExactSizeIterator<Item = Content>) -> Option<Content> {
if contents.len() <= 1 {
return contents.next();
}

let mut builder = ContentBuilder::new();
let mut one_of_builder = OneOfBuilder::new();

Expand All @@ -83,5 +108,5 @@ fn merge_content(contents: impl Iterator<Item = Content>) -> Content {
builder = builder.schema(Some(Schema::from(one_of)));
}

builder.build()
Some(builder.build())
}