diff --git a/services/distributeddataservice/adapter/include/utils/kvstore_utils.h b/services/distributeddataservice/adapter/include/utils/kvstore_utils.h index d521bf31757a2448ff15fb7c3a8333a2637df60c..123d7977d2ea0f644fa67ab16051a3b23915c812 100644 --- a/services/distributeddataservice/adapter/include/utils/kvstore_utils.h +++ b/services/distributeddataservice/adapter/include/utils/kvstore_utils.h @@ -17,7 +17,6 @@ #define KVSTORE_UTILS_H #include -#include #include "visibility.h" namespace OHOS { diff --git a/services/distributeddataservice/adapter/utils/src/kvstore_utils.cpp b/services/distributeddataservice/adapter/utils/src/kvstore_utils.cpp index 635bf78078584712be77786e52e682119755a607..c95a67f3d2e0e59221a7288da4825166f3db2911 100644 --- a/services/distributeddataservice/adapter/utils/src/kvstore_utils.cpp +++ b/services/distributeddataservice/adapter/utils/src/kvstore_utils.cpp @@ -15,7 +15,6 @@ #define LOG_TAG "KvStoreUtils" #include "kvstore_utils.h" -#include namespace OHOS { namespace DistributedKv { diff --git a/services/distributeddataservice/app/src/kvstore_account_observer.h b/services/distributeddataservice/app/src/kvstore_account_observer.h index bbc535088ddb3ceec9fe23e49749debefb58ff2f..156ffa494ff24e397f30968ed1c670ac6ef13f79 100644 --- a/services/distributeddataservice/app/src/kvstore_account_observer.h +++ b/services/distributeddataservice/app/src/kvstore_account_observer.h @@ -16,10 +16,7 @@ #ifndef KVSTORE_ACCOUNT_OBSERVER_H #define KVSTORE_ACCOUNT_OBSERVER_H -#include - #include "account/account_delegate.h" -#include "executor_pool.h" namespace OHOS { namespace DistributedKv { diff --git a/services/distributeddataservice/app/src/kvstore_data_service.cpp b/services/distributeddataservice/app/src/kvstore_data_service.cpp index aff30c73f51f77c0563a8378c951c84621bf2396..81fd4edfb46e96a1cbd877b5a3e030995d68fefe 100644 --- a/services/distributeddataservice/app/src/kvstore_data_service.cpp +++ b/services/distributeddataservice/app/src/kvstore_data_service.cpp @@ -15,55 +15,34 @@ #define LOG_TAG "KvStoreDataService" #include "kvstore_data_service.h" -#include -#include -#include #include -#include #include -#include -#include #include "accesstoken_kit.h" -#include "app_id_mapping/app_id_mapping_config_manager.h" -#include "auth_delegate.h" -#include "auto_launch_export.h" #include "bootstrap.h" -#include "checker/checker_manager.h" -#include "communication_provider.h" #include "communicator_context.h" #include "config_factory.h" #include "crypto/crypto_manager.h" #include "db_info_handle_impl.h" #include "device_manager_adapter.h" #include "device_matrix.h" -#include "dfx/reporter.h" -#include "dump/dump_manager.h" #include "dump_helper.h" #include "eventcenter/event_center.h" -#include "if_system_ability_manager.h" #include "installer/installer.h" #include "iservice_registry.h" #include "kvstore_account_observer.h" #include "kvstore_screen_observer.h" #include "log_print.h" #include "mem_mgr_client.h" -#include "mem_mgr_proxy.h" #include "metadata/appid_meta_data.h" -#include "metadata/meta_data_manager.h" #include "network/network_delegate.h" -#include "metadata/store_meta_data.h" -#include "permission_validator.h" #include "permit_delegate.h" -#include "process_communicator_impl.h" #include "route_head_handler_impl.h" -#include "runtime_config.h" #include "store/auto_cache.h" #include "string_ex.h" #include "system_ability_definition.h" #include "task_manager.h" #include "thread/thread_manager.h" -#include "upgrade.h" #include "upgrade_manager.h" #include "user_delegate.h" #include "utils/anonymous.h" diff --git a/services/distributeddataservice/app/src/kvstore_data_service.h b/services/distributeddataservice/app/src/kvstore_data_service.h index f49a323c8657e517ea69796921783392e5e9a3d6..defc465dc6f61e0071bdd3981d0ed789ad76121b 100644 --- a/services/distributeddataservice/app/src/kvstore_data_service.h +++ b/services/distributeddataservice/app/src/kvstore_data_service.h @@ -17,28 +17,18 @@ #define KVSTORE_DATASERVICE_H #include -#include -#include -#include #include "account/account_delegate.h" #include "clone/clone_backup_info.h" #include "clone/secret_key_backup_data.h" #include "dfx/reporter.h" -#include "executor_pool.h" #include "feature_stub_impl.h" -#include "ikvstore_data_service.h" -#include "ithread_pool.h" #include "kvstore_data_service_stub.h" #include "kvstore_device_listener.h" #include "kvstore_meta_manager.h" #include "metadata/secret_key_meta_data.h" -#include "metadata/store_meta_data.h" #include "runtime_config.h" -#include "screen/screen_manager.h" #include "security/security.h" -#include "system_ability.h" -#include "types.h" #include "unique_fd.h" namespace OHOS::DistributedKv { diff --git a/services/distributeddataservice/app/src/kvstore_data_service_stub.cpp b/services/distributeddataservice/app/src/kvstore_data_service_stub.cpp index 3b74cbee45d238d8a0067adc34d058275c0118e2..d03632ea32e84b5956a6bf08e9bebdc110203bef 100644 --- a/services/distributeddataservice/app/src/kvstore_data_service_stub.cpp +++ b/services/distributeddataservice/app/src/kvstore_data_service_stub.cpp @@ -18,8 +18,6 @@ #include "kvstore_data_service_stub.h" #include #include "itypes_util.h" -#include "message_parcel.h" -#include "types.h" #include "log_print.h" #include "xcollie.h" diff --git a/services/distributeddataservice/app/src/kvstore_data_service_stub.h b/services/distributeddataservice/app/src/kvstore_data_service_stub.h index 2e776bd01fd3238b1554a559c431cf935db560b0..e9ef385c92f7d0d308896fde6a7ae7a1c8997be0 100644 --- a/services/distributeddataservice/app/src/kvstore_data_service_stub.h +++ b/services/distributeddataservice/app/src/kvstore_data_service_stub.h @@ -15,7 +15,6 @@ #ifndef KVSTORE_DATA_SERVICE_STUB_H #define KVSTORE_DATA_SERVICE_STUB_H #include "ikvstore_data_service.h" -#include "distributeddata_ipc_interface_code.h" namespace OHOS::DistributedKv { class API_EXPORT KvStoreDataServiceStub : public IRemoteStub { public: diff --git a/services/distributeddataservice/app/src/kvstore_meta_manager.cpp b/services/distributeddataservice/app/src/kvstore_meta_manager.cpp index 1472fdd593d2239797847c6403e2162908e11bf3..71f802e4af7dbf942737d1f47a56282b8c179ad9 100644 --- a/services/distributeddataservice/app/src/kvstore_meta_manager.cpp +++ b/services/distributeddataservice/app/src/kvstore_meta_manager.cpp @@ -14,13 +14,8 @@ */ #define LOG_TAG "KvStoreMetaManager" -#include "kvstore_meta_manager.h" - #include -#include -#include -#include "account/account_delegate.h" #include "bootstrap.h" #include "communication_provider.h" #include "crypto/crypto_manager.h" @@ -29,29 +24,19 @@ #include "directory/directory_manager.h" #include "eventcenter/event_center.h" #include "kvstore_data_service.h" -#include "kv_radar_reporter.h" #include "log_print.h" -#include "matrix_event.h" #include "metadata/auto_launch_meta_data.h" #include "metadata/capability_meta_data.h" #include "metadata/device_meta_data.h" -#include "metadata/meta_data_manager.h" -#include "metadata/matrix_meta_data.h" #include "metadata/strategy_meta_data.h" #include "metadata/store_meta_data_local.h" #include "metadata/strategy_meta_data.h" #include "metadata/switches_meta_data.h" #include "metadata/user_meta_data.h" #include "metadata/version_meta_data.h" -#include "runtime_config.h" -#include "safe_block_queue.h" -#include "store/general_store.h" -#include "store/store_info.h" #include "utils/anonymous.h" -#include "utils/block_integer.h" #include "utils/corrupt_reporter.h" #include "utils/crypto.h" -#include "utils/ref_count.h" #include "utils/converter.h" #include "utils/constant.h" diff --git a/services/distributeddataservice/app/src/kvstore_meta_manager.h b/services/distributeddataservice/app/src/kvstore_meta_manager.h index df3abc6614bedcbe18c1a143ec79146d63784dd1..843b33256e71667a29b7a95c0d822c60fbf209d1 100644 --- a/services/distributeddataservice/app/src/kvstore_meta_manager.h +++ b/services/distributeddataservice/app/src/kvstore_meta_manager.h @@ -15,16 +15,10 @@ #ifndef KVSTORE_META_MANAGER_H #define KVSTORE_META_MANAGER_H -#include -#include - #include "app_device_change_listener.h" -#include "executor_pool.h" -#include "kv_store_delegate.h" #include "kv_store_delegate_manager.h" #include "safe_block_queue.h" #include "system_ability.h" -#include "types.h" #include "metadata/meta_data_manager.h" #include "metadata/store_meta_data.h" diff --git a/services/distributeddataservice/app/src/kvstore_screen_observer.h b/services/distributeddataservice/app/src/kvstore_screen_observer.h index 944a5463c70124993c36ef539c7fdd22d27fa8a3..fddf7dcd264f8f511a403078d5b54575f9c3fbe3 100644 --- a/services/distributeddataservice/app/src/kvstore_screen_observer.h +++ b/services/distributeddataservice/app/src/kvstore_screen_observer.h @@ -16,7 +16,6 @@ #ifndef KVSTORE_SCREEN_OBSERVER_H #define KVSTORE_SCREEN_OBSERVER_H -#include "executor_pool.h" #include "screen/screen_manager.h" namespace OHOS { diff --git a/services/distributeddataservice/app/src/security/security.h b/services/distributeddataservice/app/src/security/security.h index bfa2a5415f53ef3aef0f784b3b6b4d424e33bb0d..8562f4b196364e22f77797ff5177b858f8fba7ce 100644 --- a/services/distributeddataservice/app/src/security/security.h +++ b/services/distributeddataservice/app/src/security/security.h @@ -21,7 +21,6 @@ #include "app_device_change_listener.h" #include "executor_pool.h" #include "iprocess_system_api_adapter.h" -#include "kv_store_delegate_manager.h" #include "sensitive.h" #include "visibility.h" diff --git a/services/distributeddataservice/service/kvdb/BUILD.gn b/services/distributeddataservice/service/kvdb/BUILD.gn index 011ace89b128abb1543f5ef80102510e4fea1472..5e433ec9fc490092c16af68986d11d2b701ce789 100644 --- a/services/distributeddataservice/service/kvdb/BUILD.gn +++ b/services/distributeddataservice/service/kvdb/BUILD.gn @@ -71,14 +71,11 @@ ohos_source_set("distributeddata_kvdb") { ] external_deps = [ - "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", - "c_utils:utils", "device_manager:devicemanagersdk", "hilog:libhilog", "hisysevent:libhisysevent", "ipc:ipc_core", - "cJSON:cjson", "kv_store:datamgr_common", "kv_store:distributeddb", "kv_store:kvdb_inner_lite", diff --git a/services/distributeddataservice/service/kvdb/auth_delegate.cpp b/services/distributeddataservice/service/kvdb/auth_delegate.cpp index f76965451bf328bfd835be7706c169da18a5f590..61b273f30dd61b57af76af84c76c63a5628818d9 100644 --- a/services/distributeddataservice/service/kvdb/auth_delegate.cpp +++ b/services/distributeddataservice/service/kvdb/auth_delegate.cpp @@ -16,13 +16,10 @@ #define LOG_TAG "AuthHandler" #include "auth_delegate.h" -#include "checker/checker_manager.h" #include "device_manager_adapter.h" #include "log_print.h" #include "user_delegate.h" #include "utils/anonymous.h" -#include "metadata/store_meta_data.h" -#include "metadata/meta_data_manager.h" namespace OHOS::DistributedData { using DmAdapter = OHOS::DistributedData::DeviceManagerAdapter; class AuthHandlerStub : public AuthHandler { diff --git a/services/distributeddataservice/service/kvdb/auth_delegate.h b/services/distributeddataservice/service/kvdb/auth_delegate.h index 199b7e74599245cbd4f123389bfa89da1a534e75..b5ad1e94fa75eb2bd360ce620b7ed55e266ac6aa 100644 --- a/services/distributeddataservice/service/kvdb/auth_delegate.h +++ b/services/distributeddataservice/service/kvdb/auth_delegate.h @@ -16,10 +16,6 @@ #ifndef DISTRIBUTEDDATAMGR_AUTH_DELEGATE_H #define DISTRIBUTEDDATAMGR_AUTH_DELEGATE_H -#include - -#include "metadata/user_meta_data.h" -#include "serializable/serializable.h" #include "commu_types.h" namespace OHOS::DistributedData { using AclParams = OHOS::AppDistributedKv::AclParams; diff --git a/services/distributeddataservice/service/kvdb/kvdb_exporter.h b/services/distributeddataservice/service/kvdb/kvdb_exporter.h index 2e856e5d817289ec5d70c825cc5c6f060658df03..a72ae87ad63100e4ca70720796145fa943e90a65 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_exporter.h +++ b/services/distributeddataservice/service/kvdb/kvdb_exporter.h @@ -16,7 +16,6 @@ #ifndef OHOS_DISTRIBUTED_DATA_SERVICE_KVDB_EXPORTER_H #define OHOS_DISTRIBUTED_DATA_SERVICE_KVDB_EXPORTER_H #include "kv_store_delegate_manager.h" -#include "kv_store_nb_delegate.h" #include "metadata/store_meta_data.h" namespace OHOS::DistributedKv { class KVDBExporter { diff --git a/services/distributeddataservice/service/kvdb/kvdb_general_store.cpp b/services/distributeddataservice/service/kvdb/kvdb_general_store.cpp index 9fd1fe9d0f0d4785b940859fa673f5ed6341fd50..16ebf4e2f20a4e2a5b38bcba9452b673f720cdc7 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_general_store.cpp +++ b/services/distributeddataservice/service/kvdb/kvdb_general_store.cpp @@ -19,25 +19,16 @@ #include "app_id_mapping/app_id_mapping_config_manager.h" #include "bootstrap.h" -#include "checker/checker_manager.h" -#include "cloud/cloud_sync_finished_event.h" #include "cloud/schema_meta.h" #include "crypto/crypto_manager.h" #include "device_manager_adapter.h" #include "device_matrix.h" -#include "dfx/dfx_types.h" #include "dfx/reporter.h" -#include "directory/directory_manager.h" -#include "eventcenter/event_center.h" #include "kvdb_query.h" #include "log_print.h" #include "metadata/meta_data_manager.h" -#include "metadata/secret_key_meta_data.h" #include "metadata/store_meta_data_local.h" -#include "query_helper.h" #include "rdb_cloud.h" -#include "snapshot/bind_event.h" -#include "types.h" #include "user_delegate.h" #include "utils/anonymous.h" diff --git a/services/distributeddataservice/service/kvdb/kvdb_general_store.h b/services/distributeddataservice/service/kvdb/kvdb_general_store.h index 80e030f05502be847d9d51d4c89f70fc2ca9d1f3..dce19e1aac2e33b1247bb7311458d2fe2561f444 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_general_store.h +++ b/services/distributeddataservice/service/kvdb/kvdb_general_store.h @@ -16,19 +16,9 @@ #ifndef OHOS_DISTRIBUTED_DATA_DATAMGR_SERVICE_KVDB_GENERAL_STORE_H #define OHOS_DISTRIBUTED_DATA_DATAMGR_SERVICE_KVDB_GENERAL_STORE_H -#include -#include -#include - -#include "kv_store_changed_data.h" #include "kv_store_delegate_manager.h" -#include "kv_store_nb_delegate.h" -#include "kvstore_sync_callback.h" -#include "kvstore_sync_manager.h" #include "metadata/store_meta_data.h" #include "store/general_store.h" -#include "store/general_value.h" -#include "store_observer.h" namespace OHOS::DistributedKv { using namespace DistributedData; diff --git a/services/distributeddataservice/service/kvdb/kvdb_notifier_proxy.cpp b/services/distributeddataservice/service/kvdb/kvdb_notifier_proxy.cpp index ce558c677dd533b140941a27b3d627c90e747998..f56754241c5f7b3765dda51e831ef90f3eb49750 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_notifier_proxy.cpp +++ b/services/distributeddataservice/service/kvdb/kvdb_notifier_proxy.cpp @@ -20,8 +20,6 @@ #include "distributeddata_kvdb_ipc_interface_code.h" #include "itypes_util.h" #include "log_print.h" -#include "message_parcel.h" -#include "message_option.h" #include "utils/anonymous.h" namespace OHOS { diff --git a/services/distributeddataservice/service/kvdb/kvdb_notifier_proxy.h b/services/distributeddataservice/service/kvdb/kvdb_notifier_proxy.h index 6710141641264ea2135ebd3fb15d4690d5ec9558..9764f994b63a1fe3a870a6a56df0a5ff1cc359c4 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_notifier_proxy.h +++ b/services/distributeddataservice/service/kvdb/kvdb_notifier_proxy.h @@ -17,8 +17,6 @@ #define OHOS_DISTRIBUTED_DATA_SERVICE_KVDB_NOTIFIER_PROXY_H #include "ikvdb_notifier.h" -#include "iremote_broker.h" -#include "iremote_proxy.h" namespace OHOS { namespace DistributedKv { diff --git a/services/distributeddataservice/service/kvdb/kvdb_observer_proxy.cpp b/services/distributeddataservice/service/kvdb/kvdb_observer_proxy.cpp index 3eb5413ef7a34faf0fed0d8d53f6ca6723bd4b87..d976b40f152a83a811d3575eaaa9324438f507dc 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_observer_proxy.cpp +++ b/services/distributeddataservice/service/kvdb/kvdb_observer_proxy.cpp @@ -18,11 +18,8 @@ #include "kvdb_observer_proxy.h" #include -#include #include "kv_types_util.h" -#include "itypes_util.h" #include "log_print.h" -#include "message_parcel.h" namespace OHOS { namespace DistributedKv { using namespace std::chrono; diff --git a/services/distributeddataservice/service/kvdb/kvdb_observer_proxy.h b/services/distributeddataservice/service/kvdb/kvdb_observer_proxy.h index 9a706fd260c99091ef1d8e401517c00b4f68e1cf..ed39913144c35272cdbf5ab0aa737454e098a35e 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_observer_proxy.h +++ b/services/distributeddataservice/service/kvdb/kvdb_observer_proxy.h @@ -16,11 +16,7 @@ #ifndef KVDB_OBSERVER_PROXY_H #define KVDB_OBSERVER_PROXY_H -#include "change_notification.h" -#include "iremote_broker.h" #include "ikvstore_observer.h" -#include "iremote_proxy.h" -#include "types.h" namespace OHOS { namespace DistributedKv { diff --git a/services/distributeddataservice/service/kvdb/kvdb_query.h b/services/distributeddataservice/service/kvdb/kvdb_query.h index 3eec4f49661b50aec0d8e6af5c1bcdfcadea488d..d6fd86575d8d2cef8647d9728ac93433292db4ba 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_query.h +++ b/services/distributeddataservice/service/kvdb/kvdb_query.h @@ -16,10 +16,7 @@ #ifndef OHOS_DISTRIBUTED_DATA_DATAMGR_SERVICE_KVDB_QUERY_H #define OHOS_DISTRIBUTED_DATA_DATAMGR_SERVICE_KVDB_QUERY_H -#include "query.h" #include "query_helper.h" -#include "store/general_value.h" -#include "store_types.h" namespace OHOS::DistributedKv { class KVDBQuery : public DistributedData::GenQuery { diff --git a/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp b/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp index 06373b517c50497e72112c3f063d012b41ee9b7c..753a4d072c3d340346c0cb769b24a91df947ca6e 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp +++ b/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp @@ -15,17 +15,14 @@ #define LOG_TAG "KVDBServiceImpl" #include "kvdb_service_impl.h" -#include #include #include "accesstoken_kit.h" #include "account/account_delegate.h" #include "backup_manager.h" #include "bootstrap.h" -#include "checker/checker_manager.h" #include "cloud/change_event.h" #include "cloud/cloud_server.h" -#include "communication_provider.h" #include "communicator_context.h" #include "device_manager_adapter.h" #include "directory/directory_manager.h" @@ -36,14 +33,10 @@ #include "kvdb_general_store.h" #include "kvdb_query.h" #include "log_print.h" -#include "matrix_event.h" #include "metadata/appid_meta_data.h" #include "metadata/capability_meta_data.h" -#include "metadata/store_meta_data.h" #include "metadata/switches_meta_data.h" #include "permit_delegate.h" -#include "query_helper.h" -#include "store/store_info.h" #include "upgrade.h" #include "utils/anonymous.h" #include "utils/constant.h" diff --git a/services/distributeddataservice/service/kvdb/kvdb_service_impl.h b/services/distributeddataservice/service/kvdb/kvdb_service_impl.h index dd185700db36228cfe8a58253e5a1babcd88b06d..8b507c151e1fb703b4b32fabc4665b887f4f4ad6 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_service_impl.h +++ b/services/distributeddataservice/service/kvdb/kvdb_service_impl.h @@ -15,25 +15,19 @@ #ifndef OHOS_DISTRIBUTED_DATA_SERVICE_KVDB_SERVICE_IMPL_H #define OHOS_DISTRIBUTED_DATA_SERVICE_KVDB_SERVICE_IMPL_H -#include -#include #include "concurrent_map.h" #include "crypto/crypto_manager.h" #include "device_matrix.h" #include "kv_store_delegate_manager.h" -#include "kv_store_nb_delegate.h" -#include "kvdb_notifier_proxy.h" #include "kvdb_service_stub.h" #include "kvdb_watcher.h" #include "kvstore_sync_manager.h" #include "metadata/meta_data_manager.h" -#include "metadata/store_meta_data.h" #include "metadata/store_meta_data_local.h" #include "metadata/strategy_meta_data.h" #include "store/auto_cache.h" -#include "store/general_value.h" -#include "utils/ref_count.h" + namespace OHOS::DistributedKv { class KVDBServiceImpl final : public KVDBServiceStub { public: diff --git a/services/distributeddataservice/service/kvdb/kvdb_service_stub.h b/services/distributeddataservice/service/kvdb/kvdb_service_stub.h index f26cb7c8325dfb1d5348c1f426379d8c340e7708..11d508e3a7ff207e63910b5b3048074062a8c044 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_service_stub.h +++ b/services/distributeddataservice/service/kvdb/kvdb_service_stub.h @@ -18,7 +18,6 @@ #include "checker/checker_manager.h" #include "distributeddata_kvdb_ipc_interface_code.h" #include "feature/feature_system.h" -#include "iremote_stub.h" #include "kvdb_service.h" namespace OHOS::DistributedKv { class KVDBServiceStub : public KVDBService, public DistributedData::FeatureSystem::Feature { diff --git a/services/distributeddataservice/service/kvdb/kvdb_watcher.cpp b/services/distributeddataservice/service/kvdb/kvdb_watcher.cpp index f04180ab5a65d17d1dfefdda2e5f6376e0033198..ebf4e5397f2c5ff45e50cbf496a41a80007087ac 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_watcher.cpp +++ b/services/distributeddataservice/service/kvdb/kvdb_watcher.cpp @@ -17,12 +17,6 @@ #include "kvdb_watcher.h" -#include "error/general_error.h" -#include "kvdb_observer_proxy.h" -#include "log_print.h" -#include "types.h" -#include "utils/anonymous.h" - namespace OHOS::DistributedKv { using namespace DistributedData; using Error = DistributedData::GeneralError; diff --git a/services/distributeddataservice/service/kvdb/kvdb_watcher.h b/services/distributeddataservice/service/kvdb/kvdb_watcher.h index 301bcc6b4d1734d8ed036c269e07c4752dda2835..d02292687e16d8a64368a2423a81cf4537c920a1 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_watcher.h +++ b/services/distributeddataservice/service/kvdb/kvdb_watcher.h @@ -15,11 +15,8 @@ #ifndef OHOS_DISTRIBUTED_DATA_DATAMGR_SERVICE_KVDB_WATCHER_H #define OHOS_DISTRIBUTED_DATA_DATAMGR_SERVICE_KVDB_WATCHER_H -#include -#include #include "kvdb_observer_proxy.h" -#include "kv_store_changed_data.h" #include "store/general_value.h" #include "store/general_watcher.h" diff --git a/services/distributeddataservice/service/kvdb/kvstore_sync_manager.h b/services/distributeddataservice/service/kvdb/kvstore_sync_manager.h index 4f4fc19d2d83237e6cc5d208515a631ed9b8eed3..c609ce6684e7da3c9257eb6eafa3f03e28aa9770 100644 --- a/services/distributeddataservice/service/kvdb/kvstore_sync_manager.h +++ b/services/distributeddataservice/service/kvdb/kvstore_sync_manager.h @@ -16,10 +16,6 @@ #ifndef KVSTORE_SYNC_MANAGER_H #define KVSTORE_SYNC_MANAGER_H -#include -#include -#include - #include "executor_pool.h" #include "kv_store_nb_delegate.h" #include "types.h" diff --git a/services/distributeddataservice/service/kvdb/query_helper.cpp b/services/distributeddataservice/service/kvdb/query_helper.cpp index c1bd2d6c0b554e168526edc179a9f84567b0c237..b32e7dba30245552df567113a1e1ff828067c71a 100644 --- a/services/distributeddataservice/service/kvdb/query_helper.cpp +++ b/services/distributeddataservice/service/kvdb/query_helper.cpp @@ -15,12 +15,9 @@ #define LOG_TAG "QueryHelper" #include "query_helper.h" #include -#include #include "data_query.h" #include "device_manager_adapter.h" -#include "kvstore_utils.h" #include "log_print.h" -#include "types.h" #include "utils/anonymous.h" namespace OHOS::DistributedKv { constexpr int QUERY_SKIP_SIZE = 1; diff --git a/services/distributeddataservice/service/kvdb/query_helper.h b/services/distributeddataservice/service/kvdb/query_helper.h index 227f7a67adca3c70181e3f24c2c8b46062fbbb9a..05418a0a6ee4909da4f8edfbeca18a97b69cad76 100644 --- a/services/distributeddataservice/service/kvdb/query_helper.h +++ b/services/distributeddataservice/service/kvdb/query_helper.h @@ -16,8 +16,6 @@ #ifndef QUERY_HELPER_H #define QUERY_HELPER_H -#include - #include "query.h" #include "types.h" diff --git a/services/distributeddataservice/service/kvdb/upgrade.cpp b/services/distributeddataservice/service/kvdb/upgrade.cpp index 7040dfb8899412a499af3c24e94fe914192ffb4d..6d523c6576af9aa46c9fbe714c7689af0144c5f1 100644 --- a/services/distributeddataservice/service/kvdb/upgrade.cpp +++ b/services/distributeddataservice/service/kvdb/upgrade.cpp @@ -15,16 +15,11 @@ #define LOG_TAG "Upgrade" #include "upgrade.h" -#include -#include - #include "accesstoken_kit.h" #include "device_manager_adapter.h" #include "directory/directory_manager.h" #include "kvdb_general_store.h" #include "log_print.h" -#include "metadata/meta_data_manager.h" -#include "metadata/secret_key_meta_data.h" #include "utils/anonymous.h" namespace OHOS::DistributedKv { using namespace OHOS::DistributedData; diff --git a/services/distributeddataservice/service/kvdb/upgrade.h b/services/distributeddataservice/service/kvdb/upgrade.h index 62458e235c2d346c2543c36a03b22f995c5f592b..d9b18c10147cf26bff51ec21bc7148fb34a1698f 100644 --- a/services/distributeddataservice/service/kvdb/upgrade.h +++ b/services/distributeddataservice/service/kvdb/upgrade.h @@ -15,12 +15,9 @@ #ifndef OHOS_DISTRIBUTED_DATA_SERVICE_KVDB_UPGRADE_H #define OHOS_DISTRIBUTED_DATA_SERVICE_KVDB_UPGRADE_H -#include -#include #include "concurrent_map.h" #include "kv_store_delegate_manager.h" -#include "kv_store_nb_delegate.h" #include "metadata/store_meta_data.h" #include "types.h" diff --git a/services/distributeddataservice/service/kvdb/user_delegate.cpp b/services/distributeddataservice/service/kvdb/user_delegate.cpp index 222cfef5baaf3a337edc86d66101f3fec0f2399b..61ced3cdae113ea41e9bb6e55fd4a6ba4062ff73 100644 --- a/services/distributeddataservice/service/kvdb/user_delegate.cpp +++ b/services/distributeddataservice/service/kvdb/user_delegate.cpp @@ -16,9 +16,7 @@ #define LOG_TAG "UserDelegate" #include "user_delegate.h" -#include #include -#include #include "device_manager_adapter.h" #include "log_print.h" diff --git a/services/distributeddataservice/service/kvdb/user_delegate.h b/services/distributeddataservice/service/kvdb/user_delegate.h index 497d16f2908e54d1d6dbb8b3c33aa013618af02e..ccb9a7add1395cf7c42f564aa7716c0269b7aba1 100644 --- a/services/distributeddataservice/service/kvdb/user_delegate.h +++ b/services/distributeddataservice/service/kvdb/user_delegate.h @@ -16,14 +16,9 @@ #ifndef DISTRIBUTEDDATAMGR_USER_DELEGATE_H #define DISTRIBUTEDDATAMGR_USER_DELEGATE_H -#include -#include - #include "account/account_delegate.h" #include "concurrent_map.h" -#include "executor_pool.h" #include "metadata/user_meta_data.h" -#include "visibility.h" namespace OHOS::DistributedData { using AccountDelegate = DistributedData::AccountDelegate;