Merge pull request #93 from code0-tech/tucana-0-0-43

dependencies: updated to latest tucana version

Author: raphael-goetz

Cargo.lock

@@ -8,7 +8,7 @@ homepage = "https://code0.tech"
 license = "Apache-2.0"
 
 [dependencies]
-tucana = { version = "0.0.42", features = ["aquila"] }
+tucana = { version = "0.0.43", features = ["aquila"] }
 async-trait = "0.1.85"
 log = "0.4.24"
 tonic = "0.14.1"

Cargo.toml

@@ -1,50 +1,29 @@
-use tucana::shared::{DefinitionDataType, FlowType, RuntimeFunctionDefinition, Version};
+use tucana::shared::{DefinitionDataType, FlowType, RuntimeFunctionDefinition};
 
 pub trait HasVersion {
-    fn version(&self) -> &Option<Version>;
-    fn version_mut(&mut self) -> &mut Option<Version>;
+    fn version(&self) -> &String;
 
-    fn normalize_version(&mut self) {
-        self.version_mut().get_or_insert(Version {
-            major: 0,
-            minor: 0,
-            patch: 0,
-        });
-    }
-
-    fn is_accepted(&self, filter: &Option<Version>) -> bool {
+    fn is_accepted(&self, filter: &Option<String>) -> bool {
         filter
             .as_ref()
-            .is_none_or(|v| self.version().as_ref() == Some(v))
+            .is_none_or(|v| self.version() == v)
     }
 }
 
 impl HasVersion for DefinitionDataType {
-    fn version(&self) -> &Option<Version> {
+    fn version(&self) -> &String {
         &self.version
     }
-
-    fn version_mut(&mut self) -> &mut Option<Version> {
-        &mut self.version
-    }
 }
 
 impl HasVersion for FlowType {
-    fn version(&self) -> &Option<Version> {
+    fn version(&self) -> &String {
         &self.version
     }
-
-    fn version_mut(&mut self) -> &mut Option<Version> {
-        &mut self.version
-    }
 }
 
 impl HasVersion for RuntimeFunctionDefinition {
-    fn version(&self) -> &Option<Version> {
+    fn version(&self) -> &String {
         &self.version
     }
-
-    fn version_mut(&mut self) -> &mut Option<Version> {
-        &mut self.version
-    }
 }

src/flow_definition/feature/version.rs

@@ -3,17 +3,17 @@ mod feature;
 
 use crate::flow_definition::error::ReaderError;
 use crate::flow_definition::feature::Feature;
-use crate::flow_definition::feature::version::HasVersion;
 use serde::de::DeserializeOwned;
 use std::fs;
 use std::path::Path;
-use tucana::shared::{DefinitionDataType, FlowType, RuntimeFunctionDefinition, Version};
+use tucana::shared::{DefinitionDataType, FlowType, RuntimeFunctionDefinition};
 use walkdir::WalkDir;
+use crate::flow_definition::feature::version::HasVersion;
 
 pub struct Reader {
     should_break: bool,
     accepted_features: Vec<String>,
-    accepted_version: Option<Version>,
+    accepted_version: Option<String>,
     path: String,
 }
 
@@ -22,7 +22,7 @@ impl Reader {
         path: String,
         should_break: bool,
         accepted_features: Vec<String>,
-        accepted_version: Option<Version>,
+        accepted_version: Option<String>,
     ) -> Self {
         Self {
             should_break,
@@ -180,10 +180,6 @@ impl Reader {
 
         let items = raw
             .into_iter()
-            .map(|mut v| {
-                v.normalize_version();
-                v
-            })
             .filter(|v| v.is_accepted(&self.accepted_version))
             .collect();