refactor(config): slight adjustment to reduce conditionally compiled code branches

Author: mmalenic

htsget-config/src/resolver.rs

@@ -293,10 +293,16 @@ impl Resolver {
 
   /// Set the local resolvers from the data server config.
   pub fn resolvers_from_data_server_config(&mut self, config: &DataServerConfig) {
-    if let Storage::Local(local) = self.storage() {
-      if local.use_data_server_config() {
-        self.storage = Storage::Local(config.into());
+    match self.storage() {
+      Storage::Local(local) => {
+        if local.use_data_server_config() {
+          self.storage = Storage::Local(config.into());
+        }
       }
+      #[cfg(feature = "s3-storage")]
+      Storage::S3(_) => {}
+      #[cfg(feature = "url-storage")]
+      Storage::Url(_) => {}
     }
   }
 
@@ -384,29 +390,21 @@ impl StorageResolver for Resolver {
 
     query.set_id(resolved_id.into_inner());
 
-    if let Some(response) = self.storage().resolve_local_storage::<T>(query).await {
-      return Some(response);
-    }
-
-    #[cfg(feature = "s3-storage")]
-    {
-      let first_match = self.get_match(1, &_matched_id);
-
-      if let Some(response) = self
-        .storage()
-        .resolve_s3_storage::<T>(first_match, query)
-        .await
-      {
-        return Some(response);
+    match self.storage() {
+      Storage::Local(local_storage) => Some(T::from_local(local_storage, query).await),
+      #[cfg(feature = "s3-storage")]
+      Storage::S3(s3_storage) => {
+        let first_match = self.get_match(1, &_matched_id);
+        let mut s3_storage = s3_storage.clone();
+        if s3_storage.bucket.is_empty() {
+          s3_storage.bucket = first_match?.to_string();
+        }
+
+        Some(T::from_s3(&s3_storage, query).await)
       }
+      #[cfg(feature = "url-storage")]
+      Storage::Url(url_storage) => Some(T::from_url(url_storage, query).await),
     }
-
-    #[cfg(feature = "url-storage")]
-    if let Some(response) = self.storage().resolve_url_storage::<T>(query).await {
-      return Some(response);
-    }
-
-    None
   }
 }
 

htsget-config/src/storage/mod.rs

@@ -1,10 +1,8 @@
-use crate::resolver::ResolveResponse;
 use crate::storage::local::LocalStorage;
 #[cfg(feature = "s3-storage")]
 use crate::storage::s3::S3Storage;
 #[cfg(feature = "url-storage")]
 use crate::storage::url::UrlStorageClient;
-use crate::types::{Query, Response, Result};
 use serde::{Deserialize, Serialize};
 
 pub mod local;
@@ -43,55 +41,6 @@ pub enum Storage {
   #[cfg(feature = "url-storage")]
   #[serde(alias = "url", alias = "URL")]
   Url(#[serde(skip_serializing)] UrlStorageClient),
-  #[serde(skip)]
-  Unknown,
-}
-
-impl Storage {
-  /// Resolve the local component `Storage` into a type that implements `FromStorage`. Tagged
-  /// `Local` storage is not resolved because it is resolved into untagged `Local` storage when
-  /// `Config` is constructed.
-  pub async fn resolve_local_storage<T: ResolveResponse>(
-    &self,
-    query: &Query,
-  ) -> Option<Result<Response>> {
-    match self {
-      Storage::Local(local_storage) => Some(T::from_local(local_storage, query).await),
-      _ => None,
-    }
-  }
-
-  /// Resolve the s3 component of `Storage` into a type that implements `FromStorage`.
-  #[cfg(feature = "s3-storage")]
-  pub async fn resolve_s3_storage<T: ResolveResponse>(
-    &self,
-    first_match: Option<&str>,
-    query: &Query,
-  ) -> Option<Result<Response>> {
-    match self {
-      Storage::S3(s3_storage) => {
-        let mut s3_storage = s3_storage.clone();
-        if s3_storage.bucket.is_empty() {
-          s3_storage.bucket = first_match?.to_string();
-        }
-
-        Some(T::from_s3(&s3_storage, query).await)
-      }
-      _ => None,
-    }
-  }
-
-  /// Resolve the url component of `Storage` into a type that implements `FromStorage`.
-  #[cfg(feature = "url-storage")]
-  pub async fn resolve_url_storage<T: ResolveResponse>(
-    &self,
-    query: &Query,
-  ) -> Option<Result<Response>> {
-    match self {
-      Storage::Url(url_storage) => Some(T::from_url(url_storage, query).await),
-      _ => None,
-    }
-  }
 }
 
 impl Default for Storage {

htsget-storage/src/lib.rs

@@ -137,31 +137,30 @@ impl StorageTrait for Storage {
 }
 
 impl Storage {
-  #[cfg(feature = "experimental")]
-  /// Wrap an existing storage with C4GH storage.
-  pub fn c4gh_storage(object_type: &ObjectType, storage: Storage) -> Storage {
-    if let Some(keys) = object_type.keys() {
-      Storage::new(C4GHStorage::new_box(
-        keys.clone().into_inner(),
-        storage.into_inner(),
-      ))
-    } else {
-      storage
-    }
-  }
-
-  /// Create from local storage config.
-  pub async fn from_local(config: &LocalStorageConfig) -> Result<Storage> {
-    let storage = Storage::new(LocalStorage::new(config.local_path(), config.clone())?);
+  /// Wrap an existing storage with the object type storage.
+  pub fn from_object_type(object_type: &ObjectType, storage: Storage) -> Storage {
     cfg_if! {
       if #[cfg(feature = "experimental")] {
-        Ok(Self::c4gh_storage(config.object_type(), storage))
+        if let Some(keys) = object_type.keys() {
+          Storage::new(C4GHStorage::new_box(
+            keys.clone().into_inner(),
+            storage.into_inner(),
+          ))
+        } else {
+          storage
+        }
       } else {
         Ok(storage)
       }
     }
   }
 
+  /// Create from local storage config.
+  pub async fn from_local(config: &LocalStorageConfig) -> Result<Storage> {
+    let storage = Storage::new(LocalStorage::new(config.local_path(), config.clone())?);
+    Ok(Storage::from_object_type(config.object_type(), storage))
+  }
+
   /// Create from s3 config.
   #[cfg(feature = "s3-storage")]
   pub async fn from_s3(s3_storage: &S3StorageConfig) -> Storage {