fix ordering

Author: Steve Lee (POWERSHELL HE/HIM) (from Dev Box)

dsc_lib/src/discovery/command_discovery.rs

@@ -3,8 +3,8 @@
 
 use crate::discovery::{
     command_discovery_cache::{
+        adapters_is_empty, extend_adapted_resources, extend_adapters, extend_extensions, extend_resources, extensions_is_empty,
         get_adapted_resource, get_adapted_resources, get_adapters, get_extensions, get_resource, get_resources, resources_is_empty,
-        adapters_is_empty, extensions_is_empty, extend_adapted_resources, extend_adapters, extend_extensions, extend_resources
     },
     discovery_trait::{DiscoveryFilter, DiscoveryKind, ResourceDiscovery}
 };

dsc_lib/src/discovery/command_discovery_cache.rs

@@ -12,12 +12,24 @@ static RESOURCES: LazyLock<Mutex<BTreeMap<String, Vec<DscResource>>>> = LazyLock
 static EXTENSIONS: LazyLock<Mutex<BTreeMap<String, DscExtension>>> = LazyLock::new(|| Mutex::new(BTreeMap::new()));
 static ADAPTED_RESOURCES: LazyLock<Mutex<BTreeMap<String, Vec<DscResource>>>> = LazyLock::new(|| Mutex::new(BTreeMap::new()));
 
+// Adapter functions
+
+pub fn adapters_is_empty() -> bool {
+    ADAPTERS.lock().unwrap().is_empty()
+}
+
+pub fn extend_adapters(new_adapters: BTreeMap<String, Vec<DscResource>>) {
+    ADAPTERS.lock().unwrap().extend(new_adapters);
+}
+
 pub fn get_adapters() -> BTreeMap<String, Vec<DscResource>> {
     ADAPTERS.lock().unwrap().clone()
 }
 
-pub fn get_adapted_resources() -> BTreeMap<String, Vec<DscResource>> {
-    ADAPTED_RESOURCES.lock().unwrap().clone()
+// Adapted Resource functions
+
+pub fn extend_adapted_resources(new_adapted_resources: BTreeMap<String, Vec<DscResource>>) {
+    ADAPTED_RESOURCES.lock().unwrap().extend(new_adapted_resources);
 }
 
 pub fn get_adapted_resource(type_name: &str) -> Option<Vec<DscResource>> {
@@ -27,45 +39,41 @@ pub fn get_adapted_resource(type_name: &str) -> Option<Vec<DscResource>> {
     None
 }
 
-pub fn get_extensions() -> BTreeMap<String, DscExtension> {
-    EXTENSIONS.lock().unwrap().clone()
+pub fn get_adapted_resources() -> BTreeMap<String, Vec<DscResource>> {
+    ADAPTED_RESOURCES.lock().unwrap().clone()
 }
 
-pub fn get_resources() -> BTreeMap<String, Vec<DscResource>> {
-    RESOURCES.lock().unwrap().clone()
+// Extension functions
+
+pub fn extend_extensions(new_extensions: BTreeMap<String, DscExtension>) {
+    EXTENSIONS.lock().unwrap().extend(new_extensions);
 }
 
-pub fn get_resource(type_name: &str) -> Option<Vec<DscResource>> {
-    if let Some(resources) = RESOURCES.lock().unwrap().get(type_name) {
-        return Some(resources.clone());
-    }
-    None
+pub fn extensions_is_empty() -> bool {
+    EXTENSIONS.lock().unwrap().is_empty()
 }
 
-pub fn extend_adapters(new_adapters: BTreeMap<String, Vec<DscResource>>) {
-    ADAPTERS.lock().unwrap().extend(new_adapters);
+pub fn get_extensions() -> BTreeMap<String, DscExtension> {
+    EXTENSIONS.lock().unwrap().clone()
 }
 
+// Resource functions
+
 pub fn extend_resources(new_resources: BTreeMap<String, Vec<DscResource>>) {
     RESOURCES.lock().unwrap().extend(new_resources);
 }
 
-pub fn extend_extensions(new_extensions: BTreeMap<String, DscExtension>) {
-    EXTENSIONS.lock().unwrap().extend(new_extensions);
-}
-
-pub fn extend_adapted_resources(new_adapted_resources: BTreeMap<String, Vec<DscResource>>) {
-    ADAPTED_RESOURCES.lock().unwrap().extend(new_adapted_resources);
+pub fn get_resource(type_name: &str) -> Option<Vec<DscResource>> {
+    if let Some(resources) = RESOURCES.lock().unwrap().get(type_name) {
+        return Some(resources.clone());
+    }
+    None
 }
 
-pub fn extensions_is_empty() -> bool {
-    EXTENSIONS.lock().unwrap().is_empty()
+pub fn get_resources() -> BTreeMap<String, Vec<DscResource>> {
+    RESOURCES.lock().unwrap().clone()
 }
 
 pub fn resources_is_empty() -> bool {
     RESOURCES.lock().unwrap().is_empty()
 }
-
-pub fn adapters_is_empty() -> bool {
-    ADAPTERS.lock().unwrap().is_empty()
-}