refactor: renamed TransportType -> ApiInterface

Ghamza-Jd · Sep 20, 2024 · b9cd3e3 · b9cd3e3
1 parent b329399
commit b9cd3e3
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 22 deletions.
diff --git a/jarust/examples/raw_echotest.rs b/jarust/examples/raw_echotest.rs
@@ -1,5 +1,5 @@
+use jarust::jaconfig::ApiInterface;
 use jarust::jaconfig::JaConfig;
-use jarust::jaconfig::TransportType;
 use jarust::jaconnection::CreateConnectionParams;
 use jarust::japlugin::Attach;
 use jarust::japlugin::AttachHandleParams;
@@ -20,7 +20,7 @@ async fn main() -> anyhow::Result<()> {
         .build();
     let mut connection = jarust::connect(
         config,
-        TransportType::Ws,
+        ApiInterface::WebSocket,
         TransactionGenerationStrategy::Random,
     )
     .await?;

diff --git a/jarust/examples/restful.rs b/jarust/examples/restful.rs
@@ -1,5 +1,5 @@
+use jarust::jaconfig::ApiInterface;
 use jarust::jaconfig::JaConfig;
-use jarust::jaconfig::TransportType;
 use jarust::jaconnection::CreateConnectionParams;
 use jarust::japlugin::Attach;
 use jarust::japlugin::AttachHandleParams;
@@ -28,7 +28,7 @@ async fn main() -> anyhow::Result<()> {
         .build();
     let mut connection = jarust::connect(
         config,
-        TransportType::Http,
+        ApiInterface::Restful,
         TransactionGenerationStrategy::Random,
     )
     .await?;

diff --git a/jarust/examples/secure_ws.rs b/jarust/examples/secure_ws.rs
@@ -1,5 +1,5 @@
+use jarust::jaconfig::ApiInterface;
 use jarust::jaconfig::JaConfig;
-use jarust::jaconfig::TransportType;
 use jarust::jaconnection::CreateConnectionParams;
 use jarust::japlugin::Attach;
 use jarust::japlugin::AttachHandleParams;
@@ -28,7 +28,7 @@ async fn main() -> anyhow::Result<()> {
         .build();
     let mut connection = jarust::connect(
         config,
-        TransportType::Ws,
+        ApiInterface::WebSocket,
         TransactionGenerationStrategy::Random,
     )
     .await?;

diff --git a/jarust/src/jaconfig.rs b/jarust/src/jaconfig.rs
@@ -7,9 +7,9 @@ pub struct JaConfig {
 }
 
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
-pub enum TransportType {
-    Ws,
-    Http,
+pub enum ApiInterface {
+    WebSocket,
+    Restful,
 }
 
 impl JaConfig {

diff --git a/jarust/src/lib.rs b/jarust/src/lib.rs
@@ -9,8 +9,8 @@ pub mod prelude;
 pub use jarust_transport::transaction_gen::GenerateTransaction;
 pub use jarust_transport::transaction_gen::TransactionGenerationStrategy;
 
+use jaconfig::ApiInterface;
 use jaconfig::JaConfig;
-use jaconfig::TransportType;
 use jaconnection::JaConnection;
 use jarust_transport::interface::janus_interface::ConnectionParams;
 use jarust_transport::interface::janus_interface::JanusInterface;
@@ -35,7 +35,7 @@ use tracing::Level;
 #[cfg(not(target_family = "wasm"))]
 pub async fn connect(
     jaconfig: JaConfig,
-    transport_type: TransportType,
+    transport_type: ApiInterface,
     transaction_generation_strategy: TransactionGenerationStrategy,
 ) -> JaResult<JaConnection> {
     let conn_params = ConnectionParams {
@@ -46,13 +46,13 @@ pub async fn connect(
     };
     let transaction_generator = transaction_generation_strategy.generator();
     match transport_type {
-        TransportType::Ws => {
+        ApiInterface::WebSocket => {
             custom_connect(
                 WebSocketInterface::make_interface(conn_params, transaction_generator).await?,
             )
             .await
         }
-        TransportType::Http => {
+        ApiInterface::Restful => {
             custom_connect(
                 RestfulInterface::make_interface(conn_params, transaction_generator).await?,
             )
@@ -65,7 +65,7 @@ pub async fn connect(
 #[cfg(target_family = "wasm")]
 pub async fn connect(
     jaconfig: JaConfig,
-    transport_type: TransportType,
+    transport_type: ApiInterface,
     transaction_generation_strategy: TransactionGenerationStrategy,
 ) -> JaResult<JaConnection> {
     todo!("WASM is not supported yet")

diff --git a/jarust_plugins/examples/audio_bridge.rs b/jarust_plugins/examples/audio_bridge.rs
@@ -1,5 +1,5 @@
 use jarust::jaconfig::JaConfig;
-use jarust::jaconfig::TransportType;
+use jarust::jaconfig::ApiInterface;
 use jarust::jaconnection::CreateConnectionParams;
 use jarust::TransactionGenerationStrategy;
 use jarust_plugins::audio_bridge::jahandle_ext::AudioBridge;
@@ -25,7 +25,7 @@ async fn main() -> anyhow::Result<()> {
         .build();
     let mut connection = jarust::connect(
         config,
-        TransportType::Ws,
+        ApiInterface::WebSocket,
         TransactionGenerationStrategy::Random,
     )
     .await?;

diff --git a/jarust_plugins/examples/echotest.rs b/jarust_plugins/examples/echotest.rs
@@ -1,5 +1,5 @@
 use jarust::jaconfig::JaConfig;
-use jarust::jaconfig::TransportType;
+use jarust::jaconfig::ApiInterface;
 use jarust::jaconnection::CreateConnectionParams;
 use jarust::TransactionGenerationStrategy;
 use jarust_plugins::echo_test::events::EchoTestEvent;
@@ -26,7 +26,7 @@ async fn main() -> anyhow::Result<()> {
         .build();
     let mut connection = jarust::connect(
         config,
-        TransportType::Ws,
+        ApiInterface::WebSocket,
         TransactionGenerationStrategy::Random,
     )
     .await?;

diff --git a/jarust_plugins/examples/echotest_start_with_establishment.rs b/jarust_plugins/examples/echotest_start_with_establishment.rs
@@ -1,5 +1,5 @@
 use jarust::jaconfig::JaConfig;
-use jarust::jaconfig::TransportType;
+use jarust::jaconfig::ApiInterface;
 use jarust::jaconnection::CreateConnectionParams;
 use jarust::TransactionGenerationStrategy;
 use jarust_plugins::echo_test::events::EchoTestEvent;
@@ -29,7 +29,7 @@ async fn main() -> anyhow::Result<()> {
         .build();
     let mut connection = jarust::connect(
         config,
-        TransportType::Ws,
+        ApiInterface::WebSocket,
         TransactionGenerationStrategy::Random,
     )
     .await?;

diff --git a/jarust_plugins/examples/video_room.rs b/jarust_plugins/examples/video_room.rs
@@ -1,5 +1,5 @@
+use jarust::jaconfig::ApiInterface;
 use jarust::jaconfig::JaConfig;
-use jarust::jaconfig::TransportType;
 use jarust::jaconnection::CreateConnectionParams;
 use jarust::TransactionGenerationStrategy;
 use jarust_plugins::video_room::jahandle_ext::VideoRoom;
@@ -27,7 +27,7 @@ async fn main() -> anyhow::Result<()> {
         .build();
     let mut connection = jarust::connect(
         config,
-        TransportType::Ws,
+        ApiInterface::WebSocket,
         TransactionGenerationStrategy::Random,
     )
     .await?;