Merge pull request #49 from michiel/feature/update-for-axum-deprecations

chore: update deprecated axum struct
async-graphql · Mar 22, 2022 · 49451c2 · 49451c2
2 parents 61384c8 + 81abd07
commit 49451c2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/axum/starwars/src/main.rs b/axum/starwars/src/main.rs
@@ -4,7 +4,7 @@ use async_graphql_axum::{GraphQLRequest, GraphQLResponse};
 use axum::extract::Extension;
 use axum::response::{self, IntoResponse};
 use axum::routing::get;
-use axum::{AddExtensionLayer, Router, Server};
+use axum::{Router, Server};
 use starwars::{QueryRoot, StarWars, StarWarsSchema};
 
 async fn graphql_handler(
@@ -26,7 +26,7 @@ async fn main() {
 
     let app = Router::new()
         .route("/", get(graphql_playground).post(graphql_handler))
-        .layer(AddExtensionLayer::new(schema));
+        .layer(Extension(schema));
 
     println!("Playground: http://localhost:8000");
 

diff --git a/axum/subscription/src/main.rs b/axum/subscription/src/main.rs
@@ -3,11 +3,11 @@ use async_graphql::Schema;
 use async_graphql_axum::{GraphQLRequest, GraphQLResponse, GraphQLSubscription};
 use axum::response::{self, IntoResponse};
 use axum::routing::get;
-use axum::{extract, AddExtensionLayer, Router, Server};
+use axum::{extract::Extension, Router, Server};
 use books::{BooksSchema, MutationRoot, QueryRoot, Storage, SubscriptionRoot};
 
 async fn graphql_handler(
-    schema: extract::Extension<BooksSchema>,
+    schema: Extension<BooksSchema>,
     req: GraphQLRequest,
 ) -> GraphQLResponse {
     schema.execute(req.into_inner()).await.into()
@@ -28,7 +28,7 @@ async fn main() {
     let app = Router::new()
         .route("/", get(graphql_playground).post(graphql_handler))
         .route("/ws", GraphQLSubscription::new(schema.clone()))
-        .layer(AddExtensionLayer::new(schema));
+        .layer(Extension(schema));
 
     println!("Playground: http://localhost:8000");
 

diff --git a/axum/upload/src/main.rs b/axum/upload/src/main.rs
@@ -4,7 +4,7 @@ use async_graphql_axum::{GraphQLRequest, GraphQLResponse};
 use axum::extract::Extension;
 use axum::response::{Html, IntoResponse};
 use axum::routing::get;
-use axum::{AddExtensionLayer, Router};
+use axum::Router;
 use files::{FilesSchema, MutationRoot, QueryRoot, Storage};
 use hyper::{Method, Server};
 use tower_http::cors::{CorsLayer, Origin};
@@ -27,7 +27,7 @@ async fn main() {
 
     let app = Router::new()
         .route("/", get(graphql_playground).post(graphql_handler))
-        .layer(AddExtensionLayer::new(schema))
+        .layer(Extension(schema))
         .layer(
             CorsLayer::new()
                 .allow_origin(Origin::predicate(|_, _| true))