Removed XML serialization.

Author: horned-sphere

example_apps/transit/src/main.rs

@@ -16,13 +16,14 @@ use std::{error::Error, net::SocketAddr, pin::pin, sync::Arc, time::Duration};
 
 use clap::Parser;
 
+use example_util::example_filter;
 use futures::future::{select, Either};
 use swim::{
     route::RouteUri,
     server::{Server, ServerBuilder},
 };
 use tokio::sync::{oneshot, Notify};
-use tracing_subscriber::{filter::LevelFilter, EnvFilter};
+use tracing_subscriber::filter::LevelFilter;
 use transit::start_agencies_and_wait;
 use transit::{buses_api::BusesApi, create_plane, ui::ui_server_router};
 use transit_model::agency::Agency;
@@ -146,23 +147,14 @@ struct Params {
     ui_port: Option<u16>,
 }
 
-fn example_filter() -> Result<EnvFilter, Box<dyn std::error::Error + Send + Sync>> {
-    let filter = if let Ok(filter) = EnvFilter::try_from_default_env() {
-        filter
-    } else {
-        EnvFilter::new("")
-            .add_directive("swim_server_app=info".parse()?)
-            .add_directive("swim_runtime=info".parse()?)
-            .add_directive("swim_agent=warn".parse()?)
-            .add_directive("swim_messages=warn".parse()?)
-            .add_directive("swim_remote=warn".parse()?)
-    };
-    Ok(filter)
-}
-
 fn configure_logging() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     let filter = example_filter()?
-        .add_directive("transit=warn".parse()?)
+        .add_directive("swim_server_app=info".parse()?)
+        .add_directive("swim_runtime=warn".parse()?)
+        .add_directive("swim_agent=info".parse()?)
+        .add_directive("swim_messages=warn".parse()?)
+        .add_directive("swim_remote=warn".parse()?)
+        .add_directive("transit=info".parse()?)
         .add_directive(LevelFilter::WARN.into());
 
     tracing_subscriber::fmt().with_env_filter(filter).init();

example_apps/transit/transit-model/src/model/agency.rs

@@ -38,6 +38,7 @@ fn enc(s: &str) -> PercentEncode<'_> {
 }
 
 impl Agency {
+    
     pub fn uri(&self) -> String {
         format!(
             "/agency/{}/{}/{}",

example_apps/transit/transit-model/src/model/mod.rs

@@ -20,10 +20,6 @@ pub mod counts;
 pub mod route;
 pub mod vehicle;
 
-const XML_HEADER: &str = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n";
-const XML_INDENT_CHAR: char = ' ';
-const XML_INDENT: usize = 4;
-
 pub const URL_ENCODE: &AsciiSet = &NON_ALPHANUMERIC
     .remove(b'-')
     .remove(b'_')

example_apps/transit/transit-model/src/model/route.rs

@@ -14,12 +14,10 @@
 
 use std::io::BufRead;
 
-use quick_xml::{se::Serializer, DeError};
+use quick_xml::DeError;
 use serde::{Deserialize, Serialize};
 use swim::form::Form;
 
-use super::{XML_HEADER, XML_INDENT, XML_INDENT_CHAR};
-
 #[derive(Deserialize, Serialize)]
 #[serde(rename = "body")]
 struct Body {
@@ -42,18 +40,6 @@ pub fn load_xml_routes<R: BufRead>(read: R) -> Result<Vec<Route>, DeError> {
     quick_xml::de::from_reader::<R, Body>(read).map(|body| body.route)
 }
 
-pub fn produce_xml(copyright: String, routes: Vec<Route>) -> String {
-    let body = Body {
-        copyright,
-        route: routes,
-    };
-    let mut out = XML_HEADER.to_string();
-    let mut ser = Serializer::new(&mut out);
-    ser.indent(XML_INDENT_CHAR, XML_INDENT);
-    body.serialize(ser).expect("Invalid routes.");
-    out
-}
-
 #[cfg(test)]
 mod tests {
 
@@ -85,10 +71,4 @@ mod tests {
         assert_eq!(result, expected);
     }
 
-    #[test]
-    fn produce_routes() {
-        let routes = routes();
-        let xml = super::produce_xml("NStream 2023".to_string(), routes);
-        assert_eq!(xml.as_bytes(), ROUTES_EXAMPLE);
-    }
 }

example_apps/transit/transit-model/src/model/vehicle.rs

@@ -14,7 +14,7 @@
 
 use std::io::BufRead;
 
-use quick_xml::{se::Serializer, DeError};
+use quick_xml::DeError;
 use serde::{Deserialize, Deserializer, Serialize};
 use swim::{
     form::{
@@ -34,8 +34,6 @@ use swim::{
 };
 use thiserror::Error;
 
-use super::{XML_HEADER, XML_INDENT, XML_INDENT_CHAR};
-
 #[derive(Deserialize, Serialize)]
 #[serde(rename = "body")]
 struct Body {
@@ -103,19 +101,6 @@ pub fn load_xml_vehicles<R: BufRead>(
     )
 }
 
-pub fn produce_xml(copyright: String, vehicles: Vec<VehicleResponse>, last_time: u64) -> String {
-    let body = Body {
-        copyright,
-        vehicle: vehicles,
-        last_time: Some(LastTime { time: last_time }),
-    };
-    let mut out = XML_HEADER.to_string();
-    let mut ser = Serializer::new(&mut out);
-    ser.indent(XML_INDENT_CHAR, XML_INDENT);
-    body.serialize(ser).expect("Invalid vehicles.");
-    out
-}
-
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Tag)]
 pub enum Heading {
     N,
@@ -306,10 +291,4 @@ mod tests {
         assert_eq!(time, Some(TIMESTAMP));
     }
 
-    #[test]
-    fn produce_vehicle_xml() {
-        let vehicles = vehicles();
-        let xml = super::produce_xml("NStream 2023".to_string(), vehicles, TIMESTAMP);
-        assert_eq!(xml.as_bytes(), VEHICLES_EXAMPLE);
-    }
 }