From bcc9243206ae7a1ca1130a15885fa680c77aad08 Mon Sep 17 00:00:00 2001
From: Christopher Gubbin <44929740+cgubbin@users.noreply.github.com>
Date: Sun, 30 Jan 2022 21:51:32 +0000
Subject: [PATCH] Updated basics/nested-routing to v4. (#483)

---
 basics/nested-routing/Cargo.toml               | 12 +++---------
 basics/nested-routing/src/handlers/products.rs |  8 ++++----
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/basics/nested-routing/Cargo.toml b/basics/nested-routing/Cargo.toml
index 60964b80..349841ee 100644
--- a/basics/nested-routing/Cargo.toml
+++ b/basics/nested-routing/Cargo.toml
@@ -2,17 +2,11 @@
 name = "async_ex2"
 version = "0.1.0"
 authors = ["dowwie <dkcdkg@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
-actix-web = { version = "3", features = ["openssl"] }
-actix-service = "1.0.0"
-bytes = "0.5.3"
-env_logger = "0.8"
-futures = "0.3.1"
+actix-web = { version = "4.0.0-beta.21", features = ["openssl"] }
+env_logger = "0.9"
 serde = { version = "^1.0", features = ["derive"] }
 serde_json = "1.0.39"
-time = "0.1.42"
 
-[dev-dependencies]
-actix-rt = "1"
diff --git a/basics/nested-routing/src/handlers/products.rs b/basics/nested-routing/src/handlers/products.rs
index 7f65fd61..67385528 100644
--- a/basics/nested-routing/src/handlers/products.rs
+++ b/basics/nested-routing/src/handlers/products.rs
@@ -25,21 +25,21 @@ pub async fn remove_product(_id: web::Path<String>) -> Result<HttpResponse, Erro
 #[cfg(test)]
 mod tests {
     use crate::appconfig::config_app;
-    use actix_service::Service;
+    use actix_web::dev::Service;
     use actix_web::{
         http::{header, StatusCode},
         test, App,
     };
 
-    #[actix_rt::test]
+    #[actix_web::test]
     async fn test_add_product() {
-        let mut app = test::init_service(App::new().configure(config_app)).await;
+        let app = test::init_service(App::new().configure(config_app)).await;
 
         let payload = r#"{"id":12345,"product_type":"fancy","name":"test"}"#.as_bytes();
 
         let req = test::TestRequest::post()
             .uri("/products")
-            .header(header::CONTENT_TYPE, "application/json")
+            .insert_header((header::CONTENT_TYPE, "application/json"))
             .set_payload(payload)
             .to_request();