diff --git a/nifi/user_python_extensions/convert_json_to_attribute.py b/nifi/user_python_extensions/convert_json_to_attribute.py index 3dded5f2b..231663be8 100644 --- a/nifi/user_python_extensions/convert_json_to_attribute.py +++ b/nifi/user_python_extensions/convert_json_to_attribute.py @@ -26,11 +26,13 @@ class Java: class ProcessorDetails: version = '0.0.1' + description = "Build ids_csv attribute from merged JSON records (dedupe, numeric-only)" + tags = ["ids", "sql", "in-clause"] def __init__(self, jvm: JVMView): super().__init__(jvm) - self.field_name: str = "base64" + self.field_name: str = "id" # this is directly mirrored to the UI self._properties: list[PropertyDescriptor] = [ @@ -40,9 +42,6 @@ def __init__(self, jvm: JVMView): validators=[StandardValidators.NON_EMPTY_VALIDATOR]) ] - self.description = "Build ids_csv attribute from merged JSON records (dedupe, numeric-only)" - self.tags = ["ids", "sql", "in-clause"] - self.descriptors: list[PropertyDescriptor] = self._properties @overrides @@ -61,7 +60,6 @@ def transform(self, context: ProcessContext, flowFile: JavaObject) -> FlowFileTr except Exception: parsed = [] - records = parsed if isinstance(parsed, list) else parsed.get("records", []) if not isinstance(records, list): records = [] diff --git a/nifi/user_scripts/tests/nifi/test_service_health.py b/nifi/user_scripts/tests/nifi/test_service_health.py index 8799270e4..dbeefe4b1 100644 --- a/nifi/user_scripts/tests/nifi/test_service_health.py +++ b/nifi/user_scripts/tests/nifi/test_service_health.py @@ -7,8 +7,8 @@ from nifi.user_scripts.dto.nifi_api_config import NiFiAPIConfig from nifi.user_scripts.dto.service_health import DatabaseHealth, ElasticHealth, NiFiHealth from nifi.user_scripts.utils.generic import get_logger -from nifi.user_scripts.utils.nifi.nifi_api_client import NiFiClient, NiFiRegistryClient from nifi.user_scripts.utils.health.service import check_elasticsearch, check_kibana, check_postgres +from nifi.user_scripts.utils.nifi.nifi_api_client import NiFiClient, NiFiRegistryClient class TestServices(unittest.TestCase): @@ -51,4 +51,4 @@ def test_elastic_health(self): def test_kibana_health(self): elastic_health: ElasticHealth = check_kibana(self.elastic_config) self.assertTrue(elastic_health.connected) - self.assertEqual(elastic_health.status, "healthy") \ No newline at end of file + self.assertEqual(elastic_health.status, "healthy") diff --git a/nifi/user_templates/dt4h/annotate_dt4h_ann_manager.xml b/nifi/user_templates/legacy/dt4h/annotate_dt4h_ann_manager.xml similarity index 100% rename from nifi/user_templates/dt4h/annotate_dt4h_ann_manager.xml rename to nifi/user_templates/legacy/dt4h/annotate_dt4h_ann_manager.xml diff --git a/nifi/user_templates/dt4h/raw_ingest_dt4h.xml b/nifi/user_templates/legacy/dt4h/raw_ingest_dt4h.xml similarity index 100% rename from nifi/user_templates/dt4h/raw_ingest_dt4h.xml rename to nifi/user_templates/legacy/dt4h/raw_ingest_dt4h.xml