= None;
let property_name: StringView = StringView::new(property.name);
@@ -77,12 +80,7 @@ impl<'a> GetProperty for CffiControllerServiceContext<'a> {
#[allow(non_upper_case_globals)]
match status {
minifi_status_MINIFI_STATUS_SUCCESS => Ok(result),
- minifi_status_MINIFI_STATUS_PROPERTY_NOT_SET => match property.is_required {
- true => Err(MinifiError::MissingRequiredProperty(Cow::from(
- property.name,
- ))),
- false => Ok(None),
- },
+ minifi_status_MINIFI_STATUS_PROPERTY_NOT_SET => Ok(None),
err_code => Err(MinifiError::StatusError((
format!(
"minifi_controller_service_context_get_property({:?})",
diff --git a/minifi_rust/minifi_native/src/c_ffi/c_ffi_controller_service_definition.rs b/minifi_rust/minifi_native/src/c_ffi/c_ffi_controller_service_definition.rs
index 738071dc7a..95fe4bb0d1 100644
--- a/minifi_rust/minifi_native/src/c_ffi/c_ffi_controller_service_definition.rs
+++ b/minifi_rust/minifi_native/src/c_ffi/c_ffi_controller_service_definition.rs
@@ -21,7 +21,7 @@ use crate::c_ffi::c_ffi_property::CProperties;
use crate::c_ffi::{CffiLogger, StaticStrAsMinifiCStr};
use crate::{
ComponentIdentifier, ControllerService, ControllerServiceDefinition, EnableControllerService,
- LogLevel, Property, ProvidedInterface,
+ LogLevel, PropertyDefinition, ProvidedInterface,
};
use minifi_native_sys::{
minifi_controller_service_callbacks, minifi_controller_service_context,
@@ -71,10 +71,10 @@ where
{
pub fn new(
description_text: &'static str,
- properties: &'static [Property],
+ properties: &'static [PropertyDefinition],
provided_interfaces: &'static [ProvidedInterface],
) -> Self {
- let c_properties = Property::create_c_properties(properties);
+ let c_properties = PropertyDefinition::create_c_properties(properties);
let mut c_provided_apis = Vec::new();
for provided_interface in provided_interfaces {
c_provided_apis.push(provided_interface.name.as_minifi_c_type());
diff --git a/minifi_rust/minifi_native/src/c_ffi/c_ffi_process_context.rs b/minifi_rust/minifi_native/src/c_ffi/c_ffi_process_context.rs
index 60dfc033c0..4604b24a5b 100644
--- a/minifi_rust/minifi_native/src/c_ffi/c_ffi_process_context.rs
+++ b/minifi_rust/minifi_native/src/c_ffi/c_ffi_process_context.rs
@@ -19,12 +19,12 @@ use super::c_ffi_flow_file::CffiFlowFile;
use super::c_ffi_primitives::StringView;
use crate::api::ProcessContext;
use crate::api::controller_service::ControllerService;
+use crate::api::property::PropertySchema;
use crate::c_ffi::{CffiLogger, StaticStrAsMinifiCStr};
use crate::{
ComponentIdentifier, ControllerServiceApi, EnableControllerService, MinifiError, Property,
};
use minifi_native_sys::*;
-use std::borrow::Cow;
use std::ffi::c_void;
use std::num::NonZeroU32;
@@ -65,9 +65,9 @@ unsafe extern "C" fn get_property_callback(
impl<'a> ProcessContext for CffiProcessContext<'a> {
type FlowFile = CffiFlowFile<'a>; // FlowFile shouldn't outlive the ProcessContext
- fn get_property(
+ fn get_raw_property(
&self,
- property: &Property,
+ property: &Property,
flow_file: Option<&Self::FlowFile>,
) -> Result, MinifiError> {
let ff_ptr = flow_file.map_or(std::ptr::null_mut(), |ff| ff.get_ptr());
@@ -85,12 +85,7 @@ impl<'a> ProcessContext for CffiProcessContext<'a> {
&mut result as *mut _ as *mut c_void,
) {
minifi_status_MINIFI_STATUS_SUCCESS => Ok(result),
- minifi_status_MINIFI_STATUS_PROPERTY_NOT_SET => match property.is_required {
- true => Err(MinifiError::MissingRequiredProperty(Cow::from(
- property.name,
- ))),
- false => Ok(None),
- },
+ minifi_status_MINIFI_STATUS_PROPERTY_NOT_SET => Ok(None),
err_code => Err(MinifiError::StatusError((
format!("minifi_process_context_get_property({:?})", property.name).into(),
NonZeroU32::new_unchecked(err_code),
@@ -99,12 +94,13 @@ impl<'a> ProcessContext for CffiProcessContext<'a> {
}
}
- fn get_raw_controller_service(
+ fn get_raw_controller_service(
&self,
- property: &Property,
+ property: &Property,
) -> Result, MinifiError>
where
Cs: ComponentIdentifier + 'static,
+ K: PropertySchema + ?Sized,
{
let str_view = StringView::new(property.name);
@@ -117,39 +113,43 @@ impl<'a> ProcessContext for CffiProcessContext<'a> {
Cs::CLASS_NAME.as_minifi_c_type(),
&mut controller_service_ptr,
);
- if get_cs_status != minifi_status_MINIFI_STATUS_SUCCESS {
- return Err(MinifiError::StatusError((
+ #[allow(non_upper_case_globals)]
+ match get_cs_status {
+ minifi_status_MINIFI_STATUS_PROPERTY_NOT_SET => Ok(None),
+ minifi_status_MINIFI_STATUS_SUCCESS => Ok(Some(
+ (controller_service_ptr as *const Cs)
+ .as_ref()
+ .expect("C returned a null pointer"),
+ )),
+ err => Err(MinifiError::StatusError((
format!(
"minifi_process_context_get_controller_service_from_property::<{:?}>({:?})",
Cs::CLASS_NAME,
- property
+ property.name
)
.into(),
- NonZeroU32::new_unchecked(get_cs_status),
- )));
+ NonZeroU32::new_unchecked(err),
+ ))),
}
- let cs_ref: &Cs = {
- (controller_service_ptr as *const Cs)
- .as_ref()
- .expect("C returned a null pointer")
- };
- Ok(Some(cs_ref))
}
}
- fn get_controller_service(&self, property: &Property) -> Result, MinifiError>
+ fn get_controller_service(
+ &self,
+ property: &Property,
+ ) -> Result, MinifiError>
where
- Cs: EnableControllerService + ComponentIdentifier + 'static,
+ Cs: EnableControllerService + ComponentIdentifier + PropertySchema + 'static,
{
- match self.get_raw_controller_service::>(property)? {
+ match self.get_raw_controller_service::, Cs>(property)? {
None => Ok(None),
Some(f) => Ok(f.get_implementation()),
}
}
- fn get_controller_service_api(
+ fn get_controller_service_api(
&self,
- property: &Property,
+ property: &Property,
) -> Result>, MinifiError> {
let str_view = StringView::new(property.name);
let interface_view = StringView::new(Trait::INTERFACE_NAME);
diff --git a/minifi_rust/minifi_native/src/c_ffi/c_ffi_processor_definition.rs b/minifi_rust/minifi_native/src/c_ffi/c_ffi_processor_definition.rs
index 68602aca69..a5c6688c05 100644
--- a/minifi_rust/minifi_native/src/c_ffi/c_ffi_processor_definition.rs
+++ b/minifi_rust/minifi_native/src/c_ffi/c_ffi_processor_definition.rs
@@ -28,7 +28,7 @@ use crate::c_ffi::c_ffi_output_attribute::COutputAttributes;
use crate::c_ffi::c_ffi_property::CProperties;
use crate::{
ComponentIdentifier, LogLevel, MultiThreaded, OutputAttribute, Processor, ProcessorDefinition,
- Property, Schedule, SingleThreaded,
+ PropertyDefinition, Schedule, SingleThreaded,
};
use crate::{OnTriggerResult, Relationship};
use minifi_native_sys::*;
@@ -130,10 +130,10 @@ where
supports_dynamic_relationships: bool,
output_attributes: &'static [OutputAttribute],
relationships: &'static [Relationship],
- properties: &'static [Property],
+ properties: &'static [PropertyDefinition],
) -> Self {
let c_relationships = Relationship::create_c_vec(relationships);
- let c_properties = Property::create_c_properties(properties);
+ let c_properties = PropertyDefinition::create_c_properties(properties);
let c_output_attributes = COutputAttributes::new(output_attributes);
Self {
diff --git a/minifi_rust/minifi_native/src/c_ffi/c_ffi_property.rs b/minifi_rust/minifi_native/src/c_ffi/c_ffi_property.rs
index d2fe2c1b7d..f252a9e1da 100644
--- a/minifi_rust/minifi_native/src/c_ffi/c_ffi_property.rs
+++ b/minifi_rust/minifi_native/src/c_ffi/c_ffi_property.rs
@@ -16,7 +16,8 @@
// under the License.
use super::c_ffi_primitives::StaticStrAsMinifiCStr;
-use crate::{Property, StandardPropertyValidator};
+use crate::api::property::PropertyConstraints;
+use crate::{PropertyDefinition, StandardPropertyValidator};
use minifi_native_sys::{
minifi_property_definition, minifi_string_view, minifi_validator,
minifi_validator_MINIFI_VALIDATOR_ALWAYS_VALID, minifi_validator_MINIFI_VALIDATOR_BOOLEAN,
@@ -59,7 +60,7 @@ impl CProperties {
}
}
-impl Property {
+impl PropertyDefinition {
fn create_c_default_value_holder(properties: &[Self]) -> Vec {
properties
.iter()
@@ -76,11 +77,14 @@ impl Property {
fn create_c_allowed_values_vec_vec(properties: &[Self]) -> Vec> {
properties
.iter()
- .map(|p| {
- p.allowed_values
+ .map(|p| match p.constraints {
+ Some(PropertyConstraints::AllowedValues(allowed_values)) => allowed_values
.iter()
.map(|av| av.as_minifi_c_type())
- .collect()
+ .collect(),
+ _ => {
+ vec![]
+ }
})
.collect()
}
@@ -88,9 +92,11 @@ impl Property {
fn create_c_allowed_types_vec(properties: &[Self]) -> Vec {
properties
.iter()
- .map(|p| match p.allowed_type {
- Some(dv) => dv.as_minifi_c_type(),
- None => minifi_string_view {
+ .map(|p| match p.constraints {
+ Some(PropertyConstraints::ControllerService(allowed_type)) => {
+ allowed_type.as_minifi_c_type()
+ }
+ _ => minifi_string_view {
data: ptr::null(),
length: 0,
},
@@ -99,9 +105,9 @@ impl Property {
}
pub(crate) fn create_c_properties(properties: &[Self]) -> CProperties {
- let c_default_values = Property::create_c_default_value_holder(properties);
- let c_allowed_values = Property::create_c_allowed_values_vec_vec(properties);
- let c_allowed_types = Property::create_c_allowed_types_vec(properties);
+ let c_default_values = PropertyDefinition::create_c_default_value_holder(properties);
+ let c_allowed_values = PropertyDefinition::create_c_allowed_values_vec_vec(properties);
+ let c_allowed_types = PropertyDefinition::create_c_allowed_types_vec(properties);
assert_eq!(c_default_values.len(), properties.len());
assert_eq!(c_allowed_values.len(), properties.len());
assert_eq!(c_allowed_types.len(), properties.len());
@@ -125,7 +131,10 @@ impl Property {
},
allowed_values_count: allowed_values.len(),
allowed_values_ptr: allowed_values.as_ptr(),
- validator: property.validator.as_minifi_c_type(),
+ validator: match &property.constraints {
+ Some(PropertyConstraints::Validator(s)) => s.as_minifi_c_type(),
+ _ => minifi_validator_MINIFI_VALIDATOR_ALWAYS_VALID,
+ },
allowed_type: if allowed_type.data.is_null() {
std::ptr::null()
} else {
@@ -147,9 +156,6 @@ impl Property {
impl StandardPropertyValidator {
pub(crate) fn as_minifi_c_type(&self) -> minifi_validator {
match self {
- StandardPropertyValidator::AlwaysValidValidator => {
- minifi_validator_MINIFI_VALIDATOR_ALWAYS_VALID
- }
StandardPropertyValidator::NonBlankValidator => {
minifi_validator_MINIFI_VALIDATOR_NON_BLANK
}
diff --git a/minifi_rust/minifi_native/src/lib.rs b/minifi_rust/minifi_native/src/lib.rs
index 2d6bf1205c..ce54f9090c 100644
--- a/minifi_rust/minifi_native/src/lib.rs
+++ b/minifi_rust/minifi_native/src/lib.rs
@@ -14,6 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
+extern crate self as minifi_native;
mod api;
pub mod c_ffi;
@@ -45,7 +46,10 @@ pub use api::raw_processor::{MultiThreaded, SingleThreaded};
pub use api::logger::{LogLevel, Logger};
-pub use api::property::{GetControllerService, GetProperty, Property};
+pub use api::property::{
+ ControllerServiceValue, GetControllerService, GetProperty, Property, PropertyDefinition,
+ PropertySchema, PropertyValue,
+};
pub use api::provided_interface::{ControllerServiceApi, ProvidedInterface};
@@ -54,8 +58,9 @@ pub use api::process_session::IoState;
pub use api::attribute::{GetAttribute, OutputAttribute};
pub use api::{
- FlowFile, GetId, InputStream, OnTriggerResult, OutputStream, ProcessContext, ProcessSession,
- ProcessorInputRequirement, Relationship, StandardPropertyValidator,
+ DataSize, FlowFile, GetId, InputStream, NonBlankPath, OnTriggerResult, OutputStream,
+ ProcessContext, ProcessSession, ProcessorInputRequirement, PropertyConstraints, PropertyType,
+ Relationship, StandardPropertyValidator,
};
pub use minifi_native_macros as macros;
diff --git a/minifi_rust/minifi_native/src/mock/mock_controller_service_context.rs b/minifi_rust/minifi_native/src/mock/mock_controller_service_context.rs
index 2a594ef8a9..86a8a81580 100644
--- a/minifi_rust/minifi_native/src/mock/mock_controller_service_context.rs
+++ b/minifi_rust/minifi_native/src/mock/mock_controller_service_context.rs
@@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.
+use crate::api::property::PropertySchema;
use crate::mock::mock_process_context::MockPropertyMap;
use crate::{GetProperty, MinifiError, Property};
@@ -23,7 +24,10 @@ pub struct MockControllerServiceContext {
}
impl GetProperty for MockControllerServiceContext {
- fn get_property(&self, property: &Property) -> Result, MinifiError> {
+ fn get_raw_property(
+ &self,
+ property: &Property,
+ ) -> Result, MinifiError> {
self.properties.get_property(property, None)
}
}
diff --git a/minifi_rust/minifi_native/src/mock/mock_process_context.rs b/minifi_rust/minifi_native/src/mock/mock_process_context.rs
index be05daa16d..56ba242364 100644
--- a/minifi_rust/minifi_native/src/mock/mock_process_context.rs
+++ b/minifi_rust/minifi_native/src/mock/mock_process_context.rs
@@ -15,13 +15,13 @@
// specific language governing permissions and limitations
// under the License.
+use crate::api::property::PropertySchema;
use crate::api::{GetId, ProcessContext, RawControllerService};
use crate::{
ComponentIdentifier, ControllerServiceApi, EnableControllerService, GetAttribute, MinifiError,
MockFlowFile, Property,
};
use std::any::Any;
-use std::borrow::Cow;
use std::collections::HashMap;
pub struct MockPropertyMap {
@@ -55,23 +55,17 @@ impl MockPropertyMap {
}
impl MockPropertyMap {
- pub fn get_property(
+ pub fn get_property(
&self,
- property: &Property,
+ property: &Property,
_flow_file: Option<&MockFlowFile>,
) -> Result, MinifiError> {
- if let Some(property) = self.properties.get(property.name) {
- Ok(Some(property.clone()))
+ if let Some(value) = self.properties.get(property.name) {
+ Ok(Some(value.clone()))
} else {
- if let Some(default_val) = property.default_value {
- return Ok(Some(default_val.to_string()));
- }
- match property.is_required {
- true => Err(MinifiError::MissingRequiredProperty(Cow::from(
- property.name,
- ))),
- false => Ok(None),
- }
+ Ok(property
+ .default_value
+ .map(|default_val| default_val.to_string()))
}
}
}
@@ -85,24 +79,25 @@ pub struct MockProcessContext {
impl ProcessContext for MockProcessContext {
type FlowFile = MockFlowFile;
- fn get_property(
+ fn get_raw_property(
&self,
- property: &Property,
+ property: &Property,
_flow_file: Option<&Self::FlowFile>,
) -> Result, MinifiError> {
self.properties.get_property(property, _flow_file)
}
- fn get_raw_controller_service(
+ fn get_raw_controller_service(
&self,
- property: &Property,
+ property: &Property,
) -> Result, MinifiError>
where
Cs: RawControllerService + ComponentIdentifier + 'static,
+ K: PropertySchema + ?Sized,
{
// Mirror `get_controller_service`: resolve the property to a
// service name and downcast the registered `Box`.
- if let Some(service_name) = self.get_property(property, None)? {
+ if let Some(service_name) = self.get_raw_property(property, None)? {
Ok(self
.controller_services
.get(&service_name)
@@ -112,11 +107,14 @@ impl ProcessContext for MockProcessContext {
}
}
- fn get_controller_service(&self, property: &Property) -> Result, MinifiError>
+ fn get_controller_service(
+ &self,
+ property: &Property,
+ ) -> Result, MinifiError>
where
- Cs: EnableControllerService + ComponentIdentifier + 'static,
+ Cs: EnableControllerService + ComponentIdentifier + PropertySchema + 'static,
{
- if let Some(service_name) = self.get_property(property, None)? {
+ if let Some(service_name) = self.get_raw_property(property, None)? {
Ok(self
.controller_services
.get(&service_name)
@@ -126,9 +124,9 @@ impl ProcessContext for MockProcessContext {
}
}
- fn get_controller_service_api(
+ fn get_controller_service_api(
&self,
- _property: &Property,
+ _property: &Property,
) -> Result>, MinifiError> {
// A fully-typed mock for `dyn Trait` interfaces would need per-property
// registration keyed by both property name and interface name; the
diff --git a/minifi_rust/minifi_native_macros/src/lib.rs b/minifi_rust/minifi_native_macros/src/lib.rs
index fa8e563361..8730055078 100644
--- a/minifi_rust/minifi_native_macros/src/lib.rs
+++ b/minifi_rust/minifi_native_macros/src/lib.rs
@@ -31,6 +31,12 @@ pub fn derive_component_identifier(input: TokenStream) -> TokenStream {
const GROUP_NAME: &'static str = env!("CARGO_PKG_NAME");
const VERSION: &'static str = env!("CARGO_PKG_VERSION");
}
+
+ impl ::minifi_native::PropertySchema for #name {
+ const CONSTRAINT: Option<::minifi_native::PropertyConstraints> =
+ Some(::minifi_native::PropertyConstraints::ControllerService(::CLASS_NAME));
+ const IS_REQUIRED: bool = true;
+ }
};
TokenStream::from(expanded)
@@ -48,6 +54,37 @@ pub fn controller_service_api(_attr: TokenStream, item: TokenStream) -> TokenStr
impl ::minifi_native::ControllerServiceApi for dyn #name {
const INTERFACE_NAME: &'static str = concat!(module_path!(), "::", #name_str);
}
+
+ impl ::minifi_native::PropertySchema for dyn #name {
+ const CONSTRAINT: Option<::minifi_native::PropertyConstraints> =
+ Some(::minifi_native::PropertyConstraints::ControllerService(::INTERFACE_NAME));
+ const IS_REQUIRED: bool = true;
+ }
+ };
+
+ TokenStream::from(expanded)
+}
+
+#[proc_macro_derive(PropertyType)]
+pub fn derive_property_type(input: TokenStream) -> TokenStream {
+ let input = parse_macro_input!(input as DeriveInput);
+ let name = &input.ident;
+
+ let expanded = quote! {
+ impl ::minifi_native::PropertyType for #name {
+ type Output = #name;
+ fn parse(s: &str) -> Result {
+ s.parse::<#name>().map_err(Into::into)
+ }
+ }
+
+ impl ::minifi_native::PropertySchema for #name {
+ const CONSTRAINT: Option<::minifi_native::PropertyConstraints> =
+ Some(::minifi_native::PropertyConstraints::AllowedValues(
+ <#name as ::strum::VariantNames>::VARIANTS
+ ));
+ const IS_REQUIRED: bool = true;
+ }
};
TokenStream::from(expanded)
diff --git a/minifi_rust/minifi_rs_behave/src/main.rs b/minifi_rust/minifi_rs_behave/src/main.rs
index f0d8c12bc4..2e8517f099 100644
--- a/minifi_rust/minifi_rs_behave/src/main.rs
+++ b/minifi_rust/minifi_rs_behave/src/main.rs
@@ -95,6 +95,7 @@ impl BehaveRunner {
.arg("pip")
.arg("install")
.arg(self.minifi_behave_path.to_string_lossy().as_ref())
+ .arg("certifi")
.status()
.expect("Failed to install dependencies")
}