Actix 4.0.0-beta.5, et al

Based on cloudevents#140 branch

Author: jcrossley3

Cargo.toml

@@ -33,7 +33,9 @@ snafu = "^0.6"
 bitflags = "^1.2"
 
 # runtime optional deps
-actix-web = { version = "^3", default-features = false, optional = true }
+actix-web = { version = "=4.0.0-beta.5", default-features = false, optional = true }
+actix-http = { version = "=3.0.0-beta.5", default-features = false, optional = true }
+actix-service = { version = "=2.0.0-beta.5", default-features = false, optional = true }
 reqwest-lib = { version = "^0.11", default-features = false, features = ["rustls-tls"], optional = true, package = "reqwest" }
 rdkafka-lib = { version = "^0.25", features = ["cmake-build"], optional = true, package = "rdkafka" }
 warp-lib = { version = "^0.3", optional = true, package = "warp" }

src/binding/actix/headers.rs

@@ -7,9 +7,7 @@ use std::str::FromStr;
 
 macro_rules! unwrap_optional_header {
     ($headers:expr, $name:expr) => {
-        $headers
-            .get::<&'static HeaderName>(&$name)
-            .map(|a| header_value_to_str!(a))
+        $headers.get($name).map(|a| header_value_to_str!(a))
     };
 }
 

src/binding/actix/mod.rs

@@ -24,7 +24,7 @@
 //!
 //! #[get("/")]
 //! async fn get_event() -> Result<HttpResponse, actix_web::Error> {
-//!     Ok(HttpResponse::Ok()
+//!     HttpResponse::Ok()
 //!         .event(
 //!             EventBuilderV10::new()
 //!                 .id("0001")
@@ -34,8 +34,6 @@
 //!                 .build()
 //!                 .expect("No error while building the event"),
 //!         )
-//!         .await?
-//!     )
 //! }
 //! ```
 

src/binding/actix/server_request.rs

@@ -5,7 +5,6 @@ use crate::message::{
     Result, StructuredDeserializer, StructuredSerializer,
 };
 use crate::{message, Event};
-use actix_web::http::HeaderName;
 use actix_web::web::{Bytes, BytesMut};
 use actix_web::{web, HttpMessage, HttpRequest};
 use async_trait::async_trait;
@@ -32,7 +31,8 @@ impl<'a> BinaryDeserializer for HttpRequestDeserializer<'a> {
         }
 
         let spec_version = SpecVersion::try_from(
-            unwrap_optional_header!(self.req.headers(), headers::SPEC_VERSION_HEADER).unwrap()?,
+            unwrap_optional_header!(self.req.headers(), headers::SPEC_VERSION_HEADER.to_owned())
+                .unwrap()?,
         )?;
 
         visitor = visitor.set_spec_version(spec_version.clone())?;
@@ -90,8 +90,7 @@ impl<'a> MessageDeserializer for HttpRequestDeserializer<'a> {
         } else if self
             .req
             .headers()
-            .get::<&'static HeaderName>(&super::headers::SPEC_VERSION_HEADER)
-            .is_some()
+            .contains_key(super::headers::SPEC_VERSION_HEADER.to_owned())
         {
             Encoding::BINARY
         } else {
@@ -173,11 +172,11 @@ mod tests {
             .unwrap();
 
         let (req, payload) = test::TestRequest::post()
-            .header("ce-specversion", "1.0")
-            .header("ce-id", "0001")
-            .header("ce-type", "example.test")
-            .header("ce-source", "http://localhost/")
-            .header("ce-someint", "10")
+            .insert_header(("ce-specversion", "1.0"))
+            .insert_header(("ce-id", "0001"))
+            .insert_header(("ce-type", "example.test"))
+            .insert_header(("ce-source", "http://localhost/"))
+            .insert_header(("ce-someint", "10"))
             .to_http_parts();
 
         let resp = req.to_event(web::Payload(payload)).await.unwrap();
@@ -198,12 +197,12 @@ mod tests {
             .unwrap();
 
         let (req, payload) = test::TestRequest::post()
-            .header("ce-specversion", "1.0")
-            .header("ce-id", "0001")
-            .header("ce-type", "example.test")
-            .header("ce-source", "http://localhost")
-            .header("ce-someint", "10")
-            .header("content-type", "application/json")
+            .insert_header(("ce-specversion", "1.0"))
+            .insert_header(("ce-id", "0001"))
+            .insert_header(("ce-type", "example.test"))
+            .insert_header(("ce-source", "http://localhost"))
+            .insert_header(("ce-someint", "10"))
+            .insert_header(("content-type", "application/json"))
             .set_json(&j)
             .to_http_parts();
 
@@ -235,7 +234,7 @@ mod tests {
             .unwrap();
 
         let (req, payload) = test::TestRequest::post()
-            .header("content-type", "application/cloudevents+json")
+            .insert_header(("content-type", "application/cloudevents+json"))
             .set_payload(bytes)
             .to_http_parts();
 

src/binding/actix/server_response.rs

@@ -7,9 +7,6 @@ use crate::Event;
 use actix_web::dev::HttpResponseBuilder;
 use actix_web::http::{HeaderName, HeaderValue, StatusCode};
 use actix_web::HttpResponse;
-use async_trait::async_trait;
-use futures::future::LocalBoxFuture;
-use futures::FutureExt;
 use std::str::FromStr;
 
 /// Wrapper for [`HttpResponseBuilder`] that implements [`StructuredSerializer`] and [`BinarySerializer`].
@@ -25,26 +22,26 @@ impl HttpResponseSerializer {
 
 impl BinarySerializer<HttpResponse> for HttpResponseSerializer {
     fn set_spec_version(mut self, spec_version: SpecVersion) -> Result<Self> {
-        self.builder.set_header(
+        self.builder.insert_header((
             headers::SPEC_VERSION_HEADER.clone(),
             str_to_header_value!(spec_version.as_str())?,
-        );
+        ));
         Ok(self)
     }
 
     fn set_attribute(mut self, name: &str, value: MessageAttributeValue) -> Result<Self> {
-        self.builder.set_header(
+        self.builder.insert_header((
             headers::ATTRIBUTES_TO_HEADERS.get(name).unwrap().clone(),
             str_to_header_value!(value.to_string().as_str())?,
-        );
+        ));
         Ok(self)
     }
 
     fn set_extension(mut self, name: &str, value: MessageAttributeValue) -> Result<Self> {
-        self.builder.set_header(
+        self.builder.insert_header((
             attribute_name_to_header!(name)?,
             str_to_header_value!(value.to_string().as_str())?,
-        );
+        ));
         Ok(self)
     }
 
@@ -61,16 +58,16 @@ impl StructuredSerializer<HttpResponse> for HttpResponseSerializer {
     fn set_structured_event(mut self, bytes: Vec<u8>) -> Result<HttpResponse> {
         Ok(self
             .builder
-            .set_header(
+            .insert_header((
                 actix_web::http::header::CONTENT_TYPE,
                 headers::CLOUDEVENTS_JSON_HEADER.clone(),
-            )
+            ))
             .body(bytes))
     }
 }
 
 /// Method to fill an [`HttpResponseBuilder`] with an [`Event`].
-pub async fn event_to_response(
+pub fn event_to_response(
     event: Event,
     response: HttpResponseBuilder,
 ) -> std::result::Result<HttpResponse, actix_web::error::Error> {
@@ -80,33 +77,22 @@ pub async fn event_to_response(
 
 /// So that an actix-web handler may return an Event
 impl actix_web::Responder for Event {
-    type Error = actix_web::Error;
-    type Future = LocalBoxFuture<'static, std::result::Result<HttpResponse, Self::Error>>;
-
-    fn respond_to(self, _: &actix_web::HttpRequest) -> Self::Future {
-        async { HttpResponse::build(StatusCode::OK).event(self).await }.boxed_local()
+    fn respond_to(self, _: &actix_web::HttpRequest) -> HttpResponse {
+        HttpResponse::build(StatusCode::OK).event(self).unwrap()
     }
 }
 
 /// Extension Trait for [`HttpResponseBuilder`] which acts as a wrapper for the function [`event_to_response()`].
 ///
 /// This trait is sealed and cannot be implemented for types outside of this crate.
-#[async_trait(?Send)]
 pub trait HttpResponseBuilderExt: private::Sealed {
     /// Fill this [`HttpResponseBuilder`] with an [`Event`].
-    async fn event(
-        self,
-        event: Event,
-    ) -> std::result::Result<HttpResponse, actix_web::error::Error>;
+    fn event(self, event: Event) -> std::result::Result<HttpResponse, actix_web::error::Error>;
 }
 
-#[async_trait(?Send)]
 impl HttpResponseBuilderExt for HttpResponseBuilder {
-    async fn event(
-        self,
-        event: Event,
-    ) -> std::result::Result<HttpResponse, actix_web::error::Error> {
-        event_to_response(event, self).await
+    fn event(self, event: Event) -> std::result::Result<HttpResponse, actix_web::error::Error> {
+        event_to_response(event, self)
     }
 }
 
@@ -138,7 +124,6 @@ mod tests {
 
         let resp = HttpResponseBuilder::new(StatusCode::OK)
             .event(input)
-            .await
             .unwrap();
 
         assert_eq!(
@@ -182,7 +167,6 @@ mod tests {
 
         let mut resp = HttpResponseBuilder::new(StatusCode::OK)
             .event(input)
-            .await
             .unwrap();
 
         assert_eq!(