From b51536fb0a933d25d9fcc91a08c2a53daf74daf8 Mon Sep 17 00:00:00 2001 From: Sunli Date: Fri, 4 Dec 2020 12:33:48 +0800 Subject: [PATCH] Update examples --- actix-web/subscription/src/main.rs | 8 +----- actix-web/token-from-header/src/main.rs | 32 +++++++++------------- federation/federation-accounts/Cargo.toml | 4 +-- federation/federation-accounts/src/main.rs | 2 -- federation/federation-products/Cargo.toml | 3 +- federation/federation-products/src/main.rs | 2 -- federation/federation-reviews/Cargo.toml | 3 +- federation/federation-reviews/src/main.rs | 2 -- models/books/Cargo.toml | 2 +- warp/starwars/Cargo.toml | 3 +- warp/starwars/src/main.rs | 3 +- warp/subscription/Cargo.toml | 3 +- warp/subscription/src/main.rs | 3 +- warp/token-from-header/Cargo.toml | 3 +- warp/token-from-header/src/main.rs | 3 +- 15 files changed, 25 insertions(+), 51 deletions(-) diff --git a/actix-web/subscription/src/main.rs b/actix-web/subscription/src/main.rs index 5d7faf1..dc53f83 100644 --- a/actix-web/subscription/src/main.rs +++ b/actix-web/subscription/src/main.rs @@ -1,5 +1,4 @@ use actix_web::{guard, web, App, HttpRequest, HttpResponse, HttpServer, Result}; -use actix_web_actors::ws; use async_graphql::http::{playground_source, GraphQLPlaygroundConfig}; use async_graphql::Schema; use async_graphql_actix_web::{Request, Response, WSSubscription}; @@ -22,12 +21,7 @@ async fn index_ws( req: HttpRequest, payload: web::Payload, ) -> Result { - ws::start_with_protocols( - WSSubscription::new(Schema::clone(&*schema)), - &["graphql-ws"], - &req, - payload, - ) + WSSubscription::start(Schema::clone(&*schema), &req, payload) } #[actix_rt::main] diff --git a/actix-web/token-from-header/src/main.rs b/actix-web/token-from-header/src/main.rs index bc74d07..5258039 100644 --- a/actix-web/token-from-header/src/main.rs +++ b/actix-web/token-from-header/src/main.rs @@ -1,5 +1,4 @@ use actix_web::{guard, web, App, HttpRequest, HttpResponse, HttpServer, Result}; -use actix_web_actors::ws; use async_graphql::http::{playground_source, GraphQLPlaygroundConfig}; use async_graphql::{Context, Data, EmptyMutation, Object, Schema, Subscription}; use async_graphql_actix_web::{Request, Response, WSSubscription}; @@ -55,25 +54,20 @@ async fn index_ws( req: HttpRequest, payload: web::Payload, ) -> Result { - ws::start_with_protocols( - WSSubscription::new(Schema::clone(&*schema)).initializer(|value| { - #[derive(serde_derive::Deserialize)] - struct Payload { - token: String, - } + WSSubscription::start_with_initializer(Schema::clone(&*schema), &req, payload, |value| { + #[derive(serde_derive::Deserialize)] + struct Payload { + token: String, + } - if let Ok(payload) = serde_json::from_value::(value) { - let mut data = Data::default(); - data.insert(MyToken(payload.token)); - Ok(data) - } else { - Err("Token is required".into()) - } - }), - &["graphql-ws"], - &req, - payload, - ) + if let Ok(payload) = serde_json::from_value::(value) { + let mut data = Data::default(); + data.insert(MyToken(payload.token)); + Ok(data) + } else { + Err("Token is required".into()) + } + }) } #[actix_rt::main] diff --git a/federation/federation-accounts/Cargo.toml b/federation/federation-accounts/Cargo.toml index 80d7815..c08cdce 100644 --- a/federation/federation-accounts/Cargo.toml +++ b/federation/federation-accounts/Cargo.toml @@ -7,6 +7,6 @@ edition = "2018" [dependencies] async-graphql = { path = "../../.." } async-graphql-warp = { path = "../../../integrations/warp" } -tokio = { version = "0.3.0", features = ["macros", "rt-multi-thread"] } -tokio-compat-02 = "0.1.2" +tokio = { version = "0.2.0", features = ["macros", "rt-threaded"] } warp = "0.2" + diff --git a/federation/federation-accounts/src/main.rs b/federation/federation-accounts/src/main.rs index 994bfeb..b902d54 100644 --- a/federation/federation-accounts/src/main.rs +++ b/federation/federation-accounts/src/main.rs @@ -1,7 +1,6 @@ use async_graphql::{EmptyMutation, EmptySubscription, Object, Schema, SimpleObject, ID}; use async_graphql_warp::graphql; use std::convert::Infallible; -use tokio_compat_02::FutureExt; use warp::{Filter, Reply}; #[derive(SimpleObject)] @@ -45,6 +44,5 @@ async fn main() { }, )) .run(([0, 0, 0, 0], 4001)) - .compat() .await; } diff --git a/federation/federation-products/Cargo.toml b/federation/federation-products/Cargo.toml index 601d6e2..c545cb1 100644 --- a/federation/federation-products/Cargo.toml +++ b/federation/federation-products/Cargo.toml @@ -7,6 +7,5 @@ edition = "2018" [dependencies] async-graphql = { path = "../../.." } async-graphql-warp = { path = "../../../integrations/warp" } -tokio = { version = "0.3.0", features = ["macros", "rt-multi-thread"] } -tokio-compat-02 = "0.1.2" +tokio = { version = "0.2.0", features = ["macros", "rt-threaded"] } warp = "0.2" diff --git a/federation/federation-products/src/main.rs b/federation/federation-products/src/main.rs index 7cc1ffb..c452b96 100644 --- a/federation/federation-products/src/main.rs +++ b/federation/federation-products/src/main.rs @@ -1,7 +1,6 @@ use async_graphql::{Context, EmptyMutation, EmptySubscription, Object, Schema, SimpleObject}; use async_graphql_warp::graphql; use std::convert::Infallible; -use tokio_compat_02::FutureExt; use warp::{Filter, Reply}; #[derive(SimpleObject)] @@ -63,6 +62,5 @@ async fn main() { }, )) .run(([0, 0, 0, 0], 4002)) - .compat() .await; } diff --git a/federation/federation-reviews/Cargo.toml b/federation/federation-reviews/Cargo.toml index 5932529..492b7f5 100644 --- a/federation/federation-reviews/Cargo.toml +++ b/federation/federation-reviews/Cargo.toml @@ -7,6 +7,5 @@ edition = "2018" [dependencies] async-graphql = { path = "../../.." } async-graphql-warp = { path = "../../../integrations/warp" } -tokio = { version = "0.3.0", features = ["macros", "rt-multi-thread"] } -tokio-compat-02 = "0.1.2" +tokio = { version = "0.2.0", features = ["macros", "rt-threaded"] } warp = "0.2" diff --git a/federation/federation-reviews/src/main.rs b/federation/federation-reviews/src/main.rs index 32c89d9..f85a1ac 100644 --- a/federation/federation-reviews/src/main.rs +++ b/federation/federation-reviews/src/main.rs @@ -1,7 +1,6 @@ use async_graphql::{Context, EmptyMutation, EmptySubscription, Object, Schema, SimpleObject, ID}; use async_graphql_warp::graphql; use std::convert::Infallible; -use tokio_compat_02::FutureExt; use warp::{Filter, Reply}; struct User { @@ -105,6 +104,5 @@ async fn main() { }, )) .run(([0, 0, 0, 0], 4003)) - .compat() .await; } diff --git a/models/books/Cargo.toml b/models/books/Cargo.toml index d2b6641..6aee7b9 100644 --- a/models/books/Cargo.toml +++ b/models/books/Cargo.toml @@ -7,6 +7,6 @@ edition = "2018" [dependencies] async-graphql = { path = "../../.." } slab = "0.4.2" -tokio = { version = "0.3.0", features = ["time", "stream"] } +tokio = { version = "0.2.0", features = ["time", "stream"] } futures = "0.3.0" once_cell = "1.0" diff --git a/warp/starwars/Cargo.toml b/warp/starwars/Cargo.toml index 8f4d785..e78afdc 100644 --- a/warp/starwars/Cargo.toml +++ b/warp/starwars/Cargo.toml @@ -7,8 +7,7 @@ edition = "2018" [dependencies] async-graphql = { path = "../../.." } async-graphql-warp = { path = "../../../integrations/warp" } -tokio = { version = "0.3.0", features = ["macros", "rt-multi-thread"] } -tokio-compat-02 = "0.1.2" +tokio = { version = "0.2.0", features = ["macros", "rt-threaded"] } warp = "0.2" starwars = { path = "../../models/starwars" } http = "0.2" diff --git a/warp/starwars/src/main.rs b/warp/starwars/src/main.rs index f0aa734..92d266d 100644 --- a/warp/starwars/src/main.rs +++ b/warp/starwars/src/main.rs @@ -4,7 +4,6 @@ use async_graphql_warp::{BadRequest, Response}; use http::StatusCode; use starwars::{QueryRoot, StarWars}; use std::convert::Infallible; -use tokio_compat_02::FutureExt; use warp::{http::Response as HttpResponse, Filter, Rejection}; #[tokio::main] @@ -44,5 +43,5 @@ async fn main() { )) }); - warp::serve(routes).run(([0, 0, 0, 0], 8000)).compat().await; + warp::serve(routes).run(([0, 0, 0, 0], 8000)).await; } diff --git a/warp/subscription/Cargo.toml b/warp/subscription/Cargo.toml index 64bc9d0..ba8e2c1 100644 --- a/warp/subscription/Cargo.toml +++ b/warp/subscription/Cargo.toml @@ -7,7 +7,6 @@ edition = "2018" [dependencies] async-graphql = { path = "../../.." } async-graphql-warp = { path = "../../../integrations/warp" } -tokio = { version = "0.3.0", features = ["macros", "rt-multi-thread"] } -tokio-compat-02 = "0.1.2" +tokio = { version = "0.2.0", features = ["macros", "rt-threaded"] } warp = "0.2" books = { path = "../../models/books" } diff --git a/warp/subscription/src/main.rs b/warp/subscription/src/main.rs index 247bfc0..a2c5b85 100644 --- a/warp/subscription/src/main.rs +++ b/warp/subscription/src/main.rs @@ -3,7 +3,6 @@ use async_graphql::Schema; use async_graphql_warp::{graphql_subscription, Response}; use books::{MutationRoot, QueryRoot, Storage, SubscriptionRoot}; use std::convert::Infallible; -use tokio_compat_02::FutureExt; use warp::{http::Response as HttpResponse, Filter}; #[tokio::main] @@ -32,5 +31,5 @@ async fn main() { let routes = graphql_subscription(schema) .or(graphql_playground) .or(graphql_post); - warp::serve(routes).run(([0, 0, 0, 0], 8000)).compat().await; + warp::serve(routes).run(([0, 0, 0, 0], 8000)).await; } diff --git a/warp/token-from-header/Cargo.toml b/warp/token-from-header/Cargo.toml index da272f3..8a14185 100644 --- a/warp/token-from-header/Cargo.toml +++ b/warp/token-from-header/Cargo.toml @@ -7,8 +7,7 @@ edition = "2018" [dependencies] async-graphql = { path = "../../.." } async-graphql-warp = { path = "../../../integrations/warp" } -tokio = { version = "0.3.0", features = ["macros", "rt-multi-thread"] } -tokio-compat-02 = "0.1.2" +tokio = { version = "0.2.0", features = ["macros", "rt-threaded"] } warp = "0.2" serde_json = "1.0" serde_derive = "1.0" diff --git a/warp/token-from-header/src/main.rs b/warp/token-from-header/src/main.rs index 93d6d1e..6a999cf 100644 --- a/warp/token-from-header/src/main.rs +++ b/warp/token-from-header/src/main.rs @@ -3,7 +3,6 @@ use async_graphql::{Context, Data, EmptyMutation, Object, Schema, Subscription}; use async_graphql_warp::{graphql_subscription_with_data, Response}; use futures::{stream, Stream}; use std::convert::Infallible; -use tokio_compat_02::FutureExt; use warp::{http::Response as HttpResponse, Filter}; struct MyToken(String); @@ -78,5 +77,5 @@ async fn main() { ) .or(graphql_playground) .or(graphql_post); - warp::serve(routes).run(([0, 0, 0, 0], 8000)).compat().await; + warp::serve(routes).run(([0, 0, 0, 0], 8000)).await; }