Moved MetadataFactory to odf/metadata[#testing].

Cleanup of odf imports within odf crates themselves

src/adapter/auth-oso/Cargo.toml

@@ -35,7 +35,6 @@ tracing = { version = "0.1", default-features = false }
 
 [dev-dependencies]
 kamu = { workspace = true, features = ["testing"] }
-odf-storage-impl = { workspace = true, features = ["testing"]}
 time-source = { workspace = true }
 
 tempfile = "3"

src/adapter/auth-oso/tests/tests/test_oso_dataset_authorizer.rs

@@ -18,7 +18,7 @@ use kamu_adapter_auth_oso::{KamuAuthOso, OsoDatasetAuthorizer};
 use kamu_core::auth::{DatasetAction, DatasetActionAuthorizer, DatasetActionUnauthorizedError};
 use kamu_core::{CreateDatasetUseCase, TenancyConfig};
 use messaging_outbox::DummyOutboxImpl;
-use odf_storage_impl::testing::MetadataFactory;
+use odf::metadata::testing::MetadataFactory;
 use tempfile::TempDir;
 use time_source::SystemTimeSourceDefault;
 

src/adapter/graphql/Cargo.toml

@@ -73,7 +73,6 @@ kamu-flow-system-inmem = { workspace = true }
 kamu-task-system-inmem = { workspace = true }
 kamu-task-system-services = { workspace = true }
 messaging-outbox = { workspace = true }
-odf-storage-impl = { workspace = true, features = ["testing"]}
 time-source = { workspace = true }
 
 indoc = "2"

src/adapter/graphql/tests/tests/test_gql_account_flow_triggers.rs

@@ -39,7 +39,7 @@ use kamu_flow_system_inmem::{
 use kamu_task_system_inmem::InMemoryTaskEventStore;
 use kamu_task_system_services::TaskSchedulerImpl;
 use messaging_outbox::{register_message_dispatcher, Outbox, OutboxImmediateImpl};
-use odf_storage_impl::testing::MetadataFactory;
+use odf::metadata::testing::MetadataFactory;
 use time_source::SystemTimeSourceDefault;
 
 use crate::utils::authentication_catalogs;

src/adapter/graphql/tests/tests/test_gql_data.rs

@@ -30,7 +30,7 @@ use kamu_core::*;
 use kamu_datasets_inmem::InMemoryDatasetDependencyRepository;
 use kamu_datasets_services::DependencyGraphServiceImpl;
 use messaging_outbox::DummyOutboxImpl;
-use odf_storage_impl::testing::MetadataFactory;
+use odf::metadata::testing::MetadataFactory;
 use serde_json::json;
 use time_source::SystemTimeSourceDefault;
 

src/adapter/graphql/tests/tests/test_gql_dataset_env_vars.rs

@@ -22,7 +22,7 @@ use kamu_datasets::DatasetEnvVarsConfig;
 use kamu_datasets_inmem::{InMemoryDatasetDependencyRepository, InMemoryDatasetEnvVarRepository};
 use kamu_datasets_services::{DatasetEnvVarServiceImpl, DependencyGraphServiceImpl};
 use messaging_outbox::DummyOutboxImpl;
-use odf_storage_impl::testing::MetadataFactory;
+use odf::metadata::testing::MetadataFactory;
 use time_source::SystemTimeSourceDefault;
 
 use crate::utils::authentication_catalogs;

src/adapter/graphql/tests/tests/test_gql_dataset_flow_configs.rs

@@ -24,7 +24,7 @@ use kamu_datasets_services::DependencyGraphServiceImpl;
 use kamu_flow_system_inmem::InMemoryFlowConfigurationEventStore;
 use kamu_flow_system_services::FlowConfigurationServiceImpl;
 use messaging_outbox::DummyOutboxImpl;
-use odf_storage_impl::testing::MetadataFactory;
+use odf::metadata::testing::MetadataFactory;
 use time_source::SystemTimeSourceDefault;
 
 use crate::utils::{authentication_catalogs, expect_anonymous_access_error};

src/adapter/graphql/tests/tests/test_gql_dataset_flow_runs.rs

@@ -72,7 +72,7 @@ use kamu_task_system::{self as ts, TaskMetadata};
 use kamu_task_system_inmem::InMemoryTaskEventStore;
 use kamu_task_system_services::TaskSchedulerImpl;
 use messaging_outbox::{register_message_dispatcher, Outbox, OutboxExt, OutboxImmediateImpl};
-use odf_storage_impl::testing::MetadataFactory;
+use odf::metadata::testing::MetadataFactory;
 use time_source::SystemTimeSourceDefault;
 
 use crate::utils::{authentication_catalogs, expect_anonymous_access_error};

src/adapter/graphql/tests/tests/test_gql_dataset_flow_triggers.rs

@@ -23,7 +23,7 @@ use kamu_datasets_inmem::InMemoryDatasetDependencyRepository;
 use kamu_flow_system_inmem::{InMemoryFlowConfigurationEventStore, InMemoryFlowTriggerEventStore};
 use kamu_flow_system_services::FlowTriggerServiceImpl;
 use messaging_outbox::DummyOutboxImpl;
-use odf_storage_impl::testing::MetadataFactory;
+use odf::metadata::testing::MetadataFactory;
 use time_source::SystemTimeSourceDefault;
 
 use crate::utils::{authentication_catalogs, expect_anonymous_access_error};

src/adapter/graphql/tests/tests/test_gql_datasets.rs

@@ -19,7 +19,7 @@ use kamu_datasets_inmem::InMemoryDatasetDependencyRepository;
 use kamu_datasets_services::DependencyGraphServiceImpl;
 use messaging_outbox::{register_message_dispatcher, Outbox, OutboxImmediateImpl};
 use mockall::predicate::eq;
-use odf_storage_impl::testing::MetadataFactory;
+use odf::metadata::testing::MetadataFactory;
 use time_source::SystemTimeSourceDefault;
 
 use crate::utils::{authentication_catalogs, expect_anonymous_access_error};

src/adapter/graphql/tests/tests/test_gql_metadata.rs

@@ -16,7 +16,7 @@ use kamu_core::*;
 use kamu_datasets_inmem::InMemoryDatasetDependencyRepository;
 use kamu_datasets_services::DependencyGraphServiceImpl;
 use messaging_outbox::DummyOutboxImpl;
-use odf_storage_impl::testing::MetadataFactory;
+use odf::metadata::testing::MetadataFactory;
 use time_source::SystemTimeSourceDefault;
 
 use crate::utils::authentication_catalogs;

src/adapter/graphql/tests/tests/test_gql_metadata_chain.rs

@@ -18,7 +18,7 @@ use kamu_core::*;
 use kamu_datasets_inmem::InMemoryDatasetDependencyRepository;
 use kamu_datasets_services::DependencyGraphServiceImpl;
 use messaging_outbox::DummyOutboxImpl;
-use odf_storage_impl::testing::MetadataFactory;
+use odf::metadata::testing::MetadataFactory;
 use time_source::SystemTimeSourceDefault;
 
 use crate::utils::{authentication_catalogs, expect_anonymous_access_error};

src/adapter/graphql/tests/tests/test_gql_remote_statuses.rs

@@ -18,7 +18,7 @@ use kamu::*;
 use kamu_core::utils::metadata_chain_comparator::CompareChainsResult;
 use kamu_core::*;
 use messaging_outbox::DummyOutboxImpl;
-use odf_storage_impl::testing::MetadataFactory;
+use odf::metadata::testing::MetadataFactory;
 use tempfile::TempDir;
 use time_source::SystemTimeSourceDefault;
 use url::Url;

src/adapter/graphql/tests/tests/test_gql_search.rs

@@ -15,7 +15,7 @@ use kamu_core::*;
 use kamu_datasets_inmem::InMemoryDatasetDependencyRepository;
 use kamu_datasets_services::DependencyGraphServiceImpl;
 use messaging_outbox::DummyOutboxImpl;
-use odf_storage_impl::testing::MetadataFactory;
+use odf::metadata::testing::MetadataFactory;
 use time_source::SystemTimeSourceDefault;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

src/adapter/http/Cargo.toml

@@ -113,7 +113,7 @@ kamu-datasets-inmem = { workspace = true }
 kamu-ingest-datafusion = { workspace = true }
 messaging-outbox = { workspace = true }
 odf-dataset-impl = { workspace = true, features = ["testing"] }
-odf-storage-impl = { workspace = true, features = ["testing"] }
+odf-storage-impl = { workspace = true }
 test-utils = { workspace = true }
 
 fs_extra = "1.3"                                                    # Recursive folder copy

src/adapter/http/tests/harness/common_harness.rs

@@ -16,9 +16,9 @@ use datafusion::arrow::array::{Array, RecordBatch, UInt64Array};
 use datafusion::arrow::datatypes::{DataType, Field, Schema};
 use kamu::domain::*;
 use kamu::testing::ParquetWriterHelper;
+use odf::metadata::testing::{AddDataBuilder, MetadataFactory};
 use odf::storage::ObjectRepository as _;
 use odf_dataset_impl::DatasetLayout;
-use odf_storage_impl::testing::{AddDataBuilder, MetadataFactory};
 use odf_storage_impl::ObjectRepositoryLocalFSSha3;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

src/adapter/http/tests/tests/test_data_query.rs

@@ -18,7 +18,7 @@ use kamu::domain::*;
 use kamu::*;
 use kamu_adapter_http::data::query_types::IdentityConfig;
 use kamu_ingest_datafusion::DataWriterDataFusion;
-use odf_storage_impl::testing::MetadataFactory;
+use odf::metadata::testing::MetadataFactory;
 use serde_json::json;
 
 use crate::harness::*;

src/adapter/http/tests/tests/test_dataset_authorization_layer.rs

@@ -29,7 +29,7 @@ use kamu_datasets_inmem::InMemoryDatasetDependencyRepository;
 use kamu_datasets_services::DependencyGraphServiceImpl;
 use messaging_outbox::DummyOutboxImpl;
 use mockall::predicate::{eq, function};
-use odf_storage_impl::testing::MetadataFactory;
+use odf::metadata::testing::MetadataFactory;
 use time_source::SystemTimeSourceDefault;
 use url::Url;
 

src/adapter/http/tests/tests/test_dataset_info.rs

@@ -9,7 +9,7 @@
 
 use chrono::Utc;
 use kamu_core::TenancyConfig;
-use odf_storage_impl::testing::MetadataFactory;
+use odf::metadata::testing::MetadataFactory;
 use serde_json::json;
 
 use crate::harness::*;

src/adapter/http/tests/tests/test_protocol_dataset_helpers.rs

@@ -17,7 +17,7 @@ use kamu_adapter_http::smart_protocol::messages::{self, SMART_TRANSFER_PROTOCOL_
 use kamu_adapter_http::smart_protocol::protocol_dataset_helper::*;
 use kamu_adapter_http::{BearerHeader, OdfSmtpVersion};
 use kamu_core::TenancyConfig;
-use odf_storage_impl::testing::MetadataFactory;
+use odf::metadata::testing::MetadataFactory;
 use test_utils::TEST_BUCKET_NAME;
 use url::Url;
 

src/adapter/http/tests/tests/test_routing.rs

@@ -20,8 +20,8 @@ use kamu_accounts::CurrentAccountSubject;
 use kamu_datasets_inmem::InMemoryDatasetDependencyRepository;
 use kamu_datasets_services::DependencyGraphServiceImpl;
 use messaging_outbox::DummyOutboxImpl;
+use odf::metadata::testing::MetadataFactory;
 use odf_dataset_impl::{DatasetFactoryImpl, IpfsGateway};
-use odf_storage_impl::testing::MetadataFactory;
 use time_source::SystemTimeSourceDefault;
 use utoipa_axum::router::OpenApiRouter;
 

src/adapter/http/tests/tests/tests_pull/scenarios/scenario_aborted_read_of_existing_evolved_dataset_reread_succeeds.rs

@@ -7,8 +7,8 @@
 // the Business Source License, use of this software will be governed
 // by the Apache License, Version 2.0.
 
+use odf::metadata::testing::MetadataFactory;
 use odf_dataset_impl::DatasetLayout;
-use odf_storage_impl::testing::MetadataFactory;
 
 use crate::harness::{
     commit_add_data_event,

src/adapter/http/tests/tests/tests_pull/scenarios/scenario_aborted_read_of_new_reread_succeeds.rs

@@ -7,8 +7,8 @@
 // the Business Source License, use of this software will be governed
 // by the Apache License, Version 2.0.
 
+use odf::metadata::testing::MetadataFactory;
 use odf_dataset_impl::DatasetLayout;
-use odf_storage_impl::testing::MetadataFactory;
 
 use crate::harness::{
     commit_add_data_event,

src/adapter/http/tests/tests/tests_pull/scenarios/scenario_existing_advanced_dataset_fails.rs

@@ -8,7 +8,7 @@
 // by the Apache License, Version 2.0.
 
 use kamu::domain::*;
-use odf_storage_impl::testing::MetadataFactory;
+use odf::metadata::testing::MetadataFactory;
 
 use crate::harness::{
     copy_dataset_files,

src/adapter/http/tests/tests/tests_pull/scenarios/scenario_existing_diverged_dataset.rs

@@ -8,8 +8,8 @@
 // by the Apache License, Version 2.0.
 
 use kamu::domain::*;
+use odf::metadata::testing::MetadataFactory;
 use odf_dataset_impl::DatasetLayout;
-use odf_storage_impl::testing::MetadataFactory;
 
 use crate::harness::{
     commit_add_data_event,

src/adapter/http/tests/tests/tests_pull/scenarios/scenario_existing_evolved_dataset.rs

@@ -7,8 +7,8 @@
 // the Business Source License, use of this software will be governed
 // by the Apache License, Version 2.0.
 
+use odf::metadata::testing::MetadataFactory;
 use odf_dataset_impl::DatasetLayout;
-use odf_storage_impl::testing::MetadataFactory;
 
 use crate::harness::{
     commit_add_data_event,

src/adapter/http/tests/tests/tests_pull/scenarios/scenario_existing_up_to_date_dataset.rs

@@ -7,8 +7,8 @@
 // the Business Source License, use of this software will be governed
 // by the Apache License, Version 2.0.
 
+use odf::metadata::testing::MetadataFactory;
 use odf_dataset_impl::DatasetLayout;
-use odf_storage_impl::testing::MetadataFactory;
 
 use crate::harness::{
     commit_add_data_event,

src/adapter/http/tests/tests/tests_pull/scenarios/scenario_new_dataset.rs

@@ -7,8 +7,8 @@
 // the Business Source License, use of this software will be governed
 // by the Apache License, Version 2.0.
 
+use odf::metadata::testing::MetadataFactory;
 use odf_dataset_impl::DatasetLayout;
-use odf_storage_impl::testing::MetadataFactory;
 
 use crate::harness::{
     commit_add_data_event,

src/adapter/http/tests/tests/tests_pull/scenarios/scenario_new_empty_dataset.rs

@@ -7,8 +7,8 @@
 // the Business Source License, use of this software will be governed
 // by the Apache License, Version 2.0.
 
+use odf::metadata::testing::MetadataFactory;
 use odf_dataset_impl::DatasetLayout;
-use odf_storage_impl::testing::MetadataFactory;
 
 use crate::harness::{ClientSideHarness, ServerSideHarness};
 

src/adapter/http/tests/tests/tests_push/scenarios/scenario_aborted_write_of_new_rewrite_succeeds.rs

@@ -7,8 +7,8 @@
 // the Business Source License, use of this software will be governed
 // by the Apache License, Version 2.0.
 
+use odf::metadata::testing::MetadataFactory;
 use odf_dataset_impl::DatasetLayout;
-use odf_storage_impl::testing::MetadataFactory;
 
 use crate::harness::{
     commit_add_data_event,

src/adapter/http/tests/tests/tests_push/scenarios/scenario_aborted_write_of_updated_rewrite_succeeds.rs

@@ -7,8 +7,8 @@
 // the Business Source License, use of this software will be governed
 // by the Apache License, Version 2.0.
 
+use odf::metadata::testing::MetadataFactory;
 use odf_dataset_impl::DatasetLayout;
-use odf_storage_impl::testing::MetadataFactory;
 
 use crate::harness::{
     commit_add_data_event,