1
0
Fork 0
mirror of https://gitlab.com/msrd0/gotham-restful.git synced 2025-04-20 06:54:46 +00:00

dependency management

This commit is contained in:
Dominic 2020-04-15 23:15:13 +02:00
parent 40e6d1bc03
commit a493071ff8
Signed by: msrd0
GPG key ID: DCC8C247452E98F9
7 changed files with 16 additions and 23 deletions

View file

@ -3,10 +3,10 @@ use cookie::CookieJar;
use futures_util::{future, future::{FutureExt, TryFutureExt}};
use gotham::{
handler::HandlerFuture,
hyper::header::{AUTHORIZATION, HeaderMap},
middleware::{Middleware, NewMiddleware},
state::{FromState, State}
};
use hyper::header::{AUTHORIZATION, HeaderMap};
use jsonwebtoken::{
errors::ErrorKind,
DecodingKey

View file

@ -188,12 +188,12 @@ impl Handler for OpenapiHandler
match serde_json::to_string(&openapi) {
Ok(body) => {
let res = create_response(&state, hyper::StatusCode::OK, APPLICATION_JSON, body);
let res = create_response(&state, crate::StatusCode::OK, APPLICATION_JSON, body);
future::ok((state, res)).boxed()
},
Err(e) => {
error!("Unable to handle OpenAPI request due to error: {}", e);
let res = create_response(&state, hyper::StatusCode::INTERNAL_SERVER_ERROR, TEXT_PLAIN, "");
let res = create_response(&state, crate::StatusCode::INTERNAL_SERVER_ERROR, TEXT_PLAIN, "");
future::ok((state, res)).boxed()
}
}
@ -303,7 +303,7 @@ impl<'a> OperationParams<'a>
fn new_operation(
operation_id : Option<String>,
default_status : hyper::StatusCode,
default_status : crate::StatusCode,
accepted_types : Option<Vec<Mime>>,
schema : ReferenceOr<Schema>,
params : OperationParams,

View file

@ -1,9 +1,9 @@
use crate::{DrawResourceRoutes, RequestBody, ResourceResult, ResourceType};
use gotham::{
extractor::QueryStringExtractor,
hyper::Body,
state::State
};
use hyper::Body;
use serde::de::DeserializeOwned;
use std::{
future::Future,

View file

@ -92,7 +92,7 @@ pub trait DrawResourceRoutes
fn delete<Handler : ResourceDelete>(&mut self);
}
fn response_from(res : Response, state : &State) -> hyper::Response<Body>
fn response_from(res : Response, state : &State) -> gotham::hyper::Response<Body>
{
let mut r = create_empty_response(state, res.status);
if let Some(mime) = res.mime