Refactor Builder Adapter common to both warp and axum

jcrossley3 · jcrossley3 · commit 0aeebac01010 · 2021-09-09T13:27:05.000-04:00
Resulted in some minor code re-org as well

Signed-off-by: Jim Crossley &lt;jim@crossleys.org&gt;
diff --git a/src/binding/axum/mod.rs b/src/binding/axum/mod.rs
@@ -77,7 +77,6 @@
 
 pub mod extract;
 pub mod response;
-mod server_response;
 
 #[cfg(test)]
 mod tests {
diff --git a/src/binding/axum/response.rs b/src/binding/axum/response.rs
@@ -3,15 +3,15 @@ use axum_lib as axum;
 use axum::{body::Body, http::Response, response::IntoResponse};
 use http::{header, StatusCode};
 
-use super::server_response::event_to_response;
+use crate::binding::http::builder::adapter::to_response;
 use crate::event::Event;
 
 impl IntoResponse for Event {
     type Body = Body;
     type BodyError = <Self::Body as axum::body::HttpBody>::Error;
 
     fn into_response(self) -> Response<Body> {
-        match event_to_response(self) {
+        match to_response(self) {
             Ok(resp) => resp,
             Err(err) => Response::builder()
                 .status(StatusCode::INTERNAL_SERVER_ERROR)
diff --git a/src/binding/http/builder/adapter.rs b/src/binding/http/builder/adapter.rs
@@ -1,6 +1,5 @@
-use axum_lib as axum;
-
-use axum::{body::Body, http::Response};
+use http::Response;
+use hyper::body::Body;
 use std::cell::Cell;
 
 use crate::binding::http::{Builder, Serializer};
@@ -28,7 +27,7 @@ impl Builder<Response<Body>> for Adapter {
     }
 }
 
-pub fn event_to_response(event: Event) -> std::result::Result<Response<Body>, Error> {
+pub fn to_response(event: Event) -> std::result::Result<Response<Body>, Error> {
     BinaryDeserializer::deserialize_binary(
         event,
         Serializer::new(Adapter {
diff --git a/src/binding/http/builder/mod.rs b/src/binding/http/builder/mod.rs
@@ -0,0 +1,10 @@
+#[cfg(feature = "hyper")]
+pub mod adapter;
+
+use crate::message::Result;
+
+pub trait Builder<R> {
+    fn header(&mut self, key: &str, value: http::header::HeaderValue);
+    fn body(&mut self, bytes: Vec<u8>) -> Result<R>;
+    fn finish(&mut self) -> Result<R>;
+}
diff --git a/src/binding/http/mod.rs b/src/binding/http/mod.rs
@@ -1,3 +1,4 @@
+pub mod builder;
 mod deserializer;
 mod headers;
 
@@ -9,7 +10,7 @@ use deserializer::Deserializer;
 pub use headers::Headers;
 mod serializer;
 
-pub use serializer::Builder;
+pub use builder::Builder;
 pub use serializer::Serializer;
 
 pub static SPEC_VERSION_HEADER: &str = "ce-specversion";
diff --git a/src/binding/http/serializer.rs b/src/binding/http/serializer.rs
@@ -1,5 +1,6 @@
 use std::{cell::RefCell, rc::Rc};
 
+use crate::binding::http::builder::Builder;
 use crate::binding::{
     http::{header_prefix, SPEC_VERSION_HEADER},
     CLOUDEVENTS_JSON_HEADER,
@@ -17,12 +18,6 @@ macro_rules! str_to_header_value {
     };
 }
 
-pub trait Builder<R> {
-    fn header(&mut self, key: &str, value: http::header::HeaderValue);
-    fn body(&mut self, bytes: Vec<u8>) -> Result<R>;
-    fn finish(&mut self) -> Result<R>;
-}
-
 pub struct Serializer<T> {
     builder: Rc<RefCell<dyn Builder<T>>>,
 }
diff --git a/src/binding/warp/mod.rs b/src/binding/warp/mod.rs
@@ -61,7 +61,5 @@
 //! warp::serve(routes).run(([127, 0, 0, 1], 3030));
 //! ```
 
-mod server_response;
-
 pub mod filter;
 pub mod reply;
diff --git a/src/binding/warp/reply.rs b/src/binding/warp/reply.rs
@@ -1,6 +1,6 @@
 use warp_lib as warp;
 
-use super::server_response::event_to_response;
+use crate::binding::http::builder::adapter::to_response;
 
 use crate::Event;
 use http::StatusCode;
@@ -20,7 +20,7 @@ use warp::reply::Response;
 ///    .map(|| from_event(Event::default()));
 /// ```
 pub fn from_event(event: Event) -> Response {
-    match event_to_response(event) {
+    match to_response(event) {
         Ok(response) => response,
         Err(e) => warp::http::response::Response::builder()
             .status(StatusCode::INTERNAL_SERVER_ERROR)
diff --git a/src/binding/warp/server_response.rs b/src/binding/warp/server_response.rs
