update for axum07

Author: sunli829

axum/starwars/Cargo.toml

@@ -8,5 +8,4 @@ async-graphql = { path = "../../.." }
 async-graphql-axum = { path = "../../../integrations/axum" }
 tokio = { version = "1.8", features = ["macros", "rt-multi-thread"] }
 starwars = { path = "../../models/starwars" }
-hyper = "0.14"
 axum = { version = "0.7.0" }

axum/subscription/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "subscription"
+name = "axum-subscription"
 version = "0.1.0"
 edition = "2021"
 
@@ -8,5 +8,4 @@ async-graphql = { path = "../../.." }
 async-graphql-axum = { path = "../../../integrations/axum" }
 tokio = { version = "1.8", features = ["macros", "rt-multi-thread"] }
 books = { path = "../../models/books" }
-hyper = "0.14"
 axum = { version = "0.7.0", features = ["ws"] }

axum/subscription/src/main.rs

@@ -3,9 +3,10 @@ use async_graphql_axum::{GraphQL, GraphQLSubscription};
 use axum::{
     response::{self, IntoResponse},
     routing::get,
-    Router, Server,
+    Router,
 };
 use books::{MutationRoot, QueryRoot, Storage, SubscriptionRoot};
+use tokio::net::TcpListener;
 
 async fn graphiql() -> impl IntoResponse {
     response::Html(
@@ -31,8 +32,7 @@ async fn main() {
 
     println!("GraphiQL IDE: http://localhost:8000");
 
-    Server::bind(&"127.0.0.1:8000".parse().unwrap())
-        .serve(app.into_make_service())
+    axum::serve(TcpListener::bind("127.0.0.1:8000").await.unwrap(), app)
         .await
         .unwrap();
 }

axum/token-from-header/Cargo.toml

@@ -8,5 +8,4 @@ async-graphql = { path = "../../.." }
 async-graphql-axum = { path = "../../../integrations/axum" }
 tokio = { version = "1.8", features = ["macros", "rt-multi-thread"] }
 token = { path = "../../models/token" }
-hyper = "0.14"
 axum = { version = "0.7.0", features = ["ws"] }

axum/token-from-header/src/main.rs

@@ -61,8 +61,7 @@ async fn main() {
 
     println!("Playground: http://localhost:8000");
 
-    Server::bind(&"127.0.0.1:8000".parse().unwrap())
-        .serve(app.into_make_service())
+    axum::serve(TcpListener::bind("127.0.0.1:8000").await.unwrap(), app)
         .await
         .unwrap();
 }

axum/upload/Cargo.toml

@@ -10,5 +10,4 @@ async-graphql-axum = { path = "../../../integrations/axum" }
 axum = "0.7.0"
 files = { path = "../../models/files" }
 tokio = { version = "1.8", features = ["macros", "rt-multi-thread"] }
-hyper = "0.14"
 tower-http = { version = "0.5.0", features = ["cors"] }

axum/upload/src/main.rs

@@ -1,13 +1,14 @@
 use async_graphql::{http::GraphiQLSource, EmptySubscription, Schema};
 use async_graphql_axum::GraphQL;
 use axum::{
+    http::Method,
     response::{Html, IntoResponse},
     routing::get,
     Router,
 };
 use files::{MutationRoot, QueryRoot, Storage};
-use hyper::{Method, Server};
-use tower_http::cors::{CorsLayer, Origin};
+use tokio::net::TcpListener;
+use tower_http::cors::{AllowOrigin, CorsLayer};
 
 async fn graphiql() -> impl IntoResponse {
     Html(GraphiQLSource::build().endpoint("/").finish())
@@ -25,12 +26,11 @@ async fn main() {
         .route("/", get(graphiql).post_service(GraphQL::new(schema)))
         .layer(
             CorsLayer::new()
-                .allow_origin(Origin::predicate(|_, _| true))
-                .allow_methods(vec![Method::GET, Method::POST]),
+                .allow_origin(AllowOrigin::predicate(|_, _| true))
+                .allow_methods([Method::GET, Method::POST]),
         );
 
-    Server::bind(&"127.0.0.1:8000".parse().unwrap())
-        .serve(app.into_make_service())
+    axum::serve(TcpListener::bind("127.0.0.1:8000").await.unwrap(), app)
         .await
         .unwrap();
 }