Upgrade ntex-service to v4

Author: fafhrd91

ntex-cors/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-cors"
-version = "3.0.0"
+version = "3.1.0"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "Cross-origin resource sharing (CORS) for ntex applications."
 readme = "README.md"
@@ -17,9 +17,9 @@ name = "ntex_cors"
 path = "src/lib.rs"
 
 [dependencies]
-ntex = "3.0.0-pre.6"
+ntex = "3.0.0-pre.9"
 derive_more = { version = "2", features = ["from", "display"] }
 futures = "0.3"
 
 [dev-dependencies]
-ntex = { version = "3.0.0-pre.3", features=["neon"] }
+ntex = { version = "3.0.0-pre.9", features=["neon"] }

ntex-cors/src/lib.rs

@@ -52,7 +52,7 @@ use std::{
 use derive_more::Display;
 use ntex::http::header::{self, HeaderName, HeaderValue};
 use ntex::http::{HeaderMap, Method, RequestHead, StatusCode, Uri, error::HttpError};
-use ntex::service::{Middleware2, Service, ServiceCtx};
+use ntex::service::{Middleware, Service, ServiceCtx};
 use ntex::util::{ByteString, Either};
 use ntex::web::{
     DefaultError, ErrorRenderer, HttpResponse, WebRequest, WebResponse, WebResponseError,
@@ -722,7 +722,7 @@ pub struct CorsFactory<Err> {
     _t: PhantomData<Err>,
 }
 
-impl<S, C, Err> Middleware2<S, C> for CorsFactory<Err>
+impl<S, C, Err> Middleware<S, C> for CorsFactory<Err>
 where
     S: Service<WebRequest<Err>, Response = WebResponse>,
 {

ntex-identity/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-identity"
-version = "3.0.0"
+version = "3.1.0"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "Identity service for ntex web framework."
 readme = "README.md"
@@ -22,7 +22,7 @@ default = ["cookie-policy"]
 cookie-policy = ["cookie/secure", "ntex/cookie"]
 
 [dependencies]
-ntex = "3.0.0-pre.6"
+ntex = "3.0.0-pre.9"
 futures = "0.3"
 serde = "1.0"
 serde_json = "1.0"
@@ -31,4 +31,4 @@ cookie = { version = "0.18", features = ["private"] }
 time = { version = "0.3", default-features = false, features = ["std"] }
 
 [dev-dependencies]
-ntex = { version = "3.0.0-pre.6", features=["neon"] }
+ntex = { version = "3.0.0-pre.9", features=["neon"] }

ntex-identity/src/lib.rs

@@ -54,7 +54,7 @@ use time::Duration;
 
 use ntex::http::header::{self, HeaderValue};
 use ntex::http::{HttpMessage, Payload, error::HttpError};
-use ntex::service::{Middleware2, Service, ServiceCtx};
+use ntex::service::{Middleware, Service, ServiceCtx};
 use ntex::util::Extensions;
 use ntex::web::{
     DefaultError, ErrorRenderer, FromRequest, HttpRequest, WebRequest, WebResponse,
@@ -213,7 +213,7 @@ impl<T> IdentityService<T> {
     }
 }
 
-impl<S, C, T> Middleware2<S, C> for IdentityService<T> {
+impl<S, C, T> Middleware<S, C> for IdentityService<T> {
     type Service = IdentityServiceMiddleware<S, T>;
 
     fn create(&self, service: S, _: C) -> Self::Service {

ntex-session/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-session"
-version = "3.0.0"
+version = "3.1.0"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "Session for ntex web framework."
 readme = "README.md"
@@ -23,7 +23,7 @@ default = ["cookie-session"]
 cookie-session = ["cookie/secure", "ntex/cookie"]
 
 [dependencies]
-ntex = "3.0.0-pre.6"
+ntex = "3.0.0-pre.9"
 cookie = "0.18"
 derive_more = { version = "2", features = ["from", "display"] }
 futures = "0.3"
@@ -32,4 +32,4 @@ serde_json = "1.0"
 time = { version = "0.3", default-features = false, features = ["std"] }
 
 [dev-dependencies]
-ntex = { version = "3.0.0-pre.6", features=["neon"] }
+ntex = { version = "3.0.0-pre.9", features=["neon"] }

ntex-session/src/cookie.rs

@@ -20,7 +20,7 @@ use std::{collections::HashMap, convert::Infallible, rc::Rc};
 use cookie::{Cookie, CookieJar, Key, SameSite};
 use derive_more::{Display, From};
 use ntex::http::{HttpMessage, header::HeaderValue, header::SET_COOKIE};
-use ntex::service::{Middleware2, Service, ServiceCtx};
+use ntex::service::{Middleware, Service, ServiceCtx};
 use ntex::web::{DefaultError, ErrorRenderer, WebRequest, WebResponse, WebResponseError};
 use serde_json::error::Error as JsonError;
 use time::{Duration, OffsetDateTime};
@@ -276,7 +276,7 @@ impl CookieSession {
     }
 }
 
-impl<S, C> Middleware2<S, C> for CookieSession {
+impl<S, C> Middleware<S, C> for CookieSession {
     type Service = CookieSessionMiddleware<S>;
 
     fn create(&self, service: S, _: C) -> Self::Service {