From 84d7320f42d17dc8c14b2f93d9058013b87a1742 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Tue, 14 Dec 2021 22:21:36 +0000
Subject: [PATCH] rename default_service to simple_service

---
 actix-test/src/lib.rs             |  4 ++--
 src/middleware/default_headers.rs |  7 +++----
 src/middleware/err_handlers.rs    |  6 +++---
 src/test.rs                       | 16 ++++++++++++----
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/actix-test/src/lib.rs b/actix-test/src/lib.rs
index 9dc136894..5f247b11a 100644
--- a/actix-test/src/lib.rs
+++ b/actix-test/src/lib.rs
@@ -42,8 +42,8 @@ use actix_http::{header::HeaderMap, ws, HttpService, Method, Request, Response};
 pub use actix_http_test::unused_addr;
 use actix_service::{map_config, IntoServiceFactory, ServiceFactory, ServiceFactoryExt as _};
 pub use actix_web::test::{
-    call_service, default_service, init_service, ok_service, read_body, read_body_json,
-    read_response, read_response_json, TestRequest,
+    call_service, init_service, ok_service, read_body, read_body_json, read_response,
+    read_response_json, simple_service, TestRequest,
 };
 use actix_web::{
     body::MessageBody,
diff --git a/src/middleware/default_headers.rs b/src/middleware/default_headers.rs
index 257467710..89210b156 100644
--- a/src/middleware/default_headers.rs
+++ b/src/middleware/default_headers.rs
@@ -194,7 +194,7 @@ mod tests {
     use crate::{
         dev::ServiceRequest,
         http::header::CONTENT_TYPE,
-        test::{ok_service, TestRequest},
+        test::{self, TestRequest},
         HttpResponse,
     };
 
@@ -203,7 +203,7 @@ mod tests {
         let mw = DefaultHeaders::new()
             .add(("X-TEST", "0001"))
             .add(("X-TEST-TWO", HeaderValue::from_static("123")))
-            .new_transform(ok_service())
+            .new_transform(test::ok_service())
             .await
             .unwrap();
 
@@ -234,10 +234,9 @@ mod tests {
 
     #[actix_rt::test]
     async fn adding_content_type() {
-        let srv = |req: ServiceRequest| ok(req.into_response(HttpResponse::Ok().finish()));
         let mw = DefaultHeaders::new()
             .add_content_type()
-            .new_transform(srv.into_service())
+            .new_transform(test::ok_service())
             .await
             .unwrap();
 
diff --git a/src/middleware/err_handlers.rs b/src/middleware/err_handlers.rs
index fedefa6fa..6d064372f 100644
--- a/src/middleware/err_handlers.rs
+++ b/src/middleware/err_handlers.rs
@@ -209,7 +209,7 @@ mod tests {
             Ok(ErrorHandlerResponse::Response(res.map_into_left_body()))
         }
 
-        let srv = test::default_service(StatusCode::INTERNAL_SERVER_ERROR);
+        let srv = test::simple_service(StatusCode::INTERNAL_SERVER_ERROR);
 
         let mw = ErrorHandlers::new()
             .handler(StatusCode::INTERNAL_SERVER_ERROR, error_handler)
@@ -236,7 +236,7 @@ mod tests {
             ))
         }
 
-        let srv = test::default_service(StatusCode::INTERNAL_SERVER_ERROR);
+        let srv = test::simple_service(StatusCode::INTERNAL_SERVER_ERROR);
 
         let mw = ErrorHandlers::new()
             .handler(StatusCode::INTERNAL_SERVER_ERROR, error_handler)
@@ -264,7 +264,7 @@ mod tests {
             Ok(ErrorHandlerResponse::Response(res))
         }
 
-        let srv = test::default_service(StatusCode::INTERNAL_SERVER_ERROR);
+        let srv = test::simple_service(StatusCode::INTERNAL_SERVER_ERROR);
 
         let mw = ErrorHandlers::new()
             .handler(StatusCode::INTERNAL_SERVER_ERROR, error_handler)
diff --git a/src/test.rs b/src/test.rs
index 4b9c71ca1..13a049089 100644
--- a/src/test.rs
+++ b/src/test.rs
@@ -27,14 +27,14 @@ use crate::{
     Error, HttpRequest, HttpResponse, HttpResponseBuilder,
 };
 
-/// Create service that always responds with `HttpResponse::Ok()` and no body.
+/// Creates service that always responds with `200 OK` and no body.
 pub fn ok_service(
 ) -> impl Service<ServiceRequest, Response = ServiceResponse<BoxBody>, Error = Error> {
-    default_service(StatusCode::OK)
+    simple_service(StatusCode::OK)
 }
 
-/// Create service that always responds with given status code and no body.
-pub fn default_service(
+/// Creates service that always responds with given status code and no body.
+pub fn simple_service(
     status_code: StatusCode,
 ) -> impl Service<ServiceRequest, Response = ServiceResponse<BoxBody>, Error = Error> {
     (move |req: ServiceRequest| {
@@ -43,6 +43,14 @@ pub fn default_service(
     .into_service()
 }
 
+#[doc(hidden)]
+#[deprecated(since = "4.0.0", note = "Renamed to `simple_service`.")]
+pub fn default_service(
+    status_code: StatusCode,
+) -> impl Service<ServiceRequest, Response = ServiceResponse<BoxBody>, Error = Error> {
+    simple_service(status_code)
+}
+
 /// Initialize service from application builder instance.
 ///
 /// ```