From d36878409a652ecdffbefa9c05445ca52bf59904 Mon Sep 17 00:00:00 2001 From: Teddy Date: Fri, 27 Jun 2025 14:47:36 +0200 Subject: [PATCH] MINOR: Extracted indexMapping into spec module (#21882) * feat: added endpoint to programatically retrieve index mapping * feat: added endpoint to programatically retrieve index mapping * refactor: extracted JsonUtils from server sub module * refactor: move IndexMapping to spec * style: ran java linting * refactor: moved IndexMapping to singleton class * fix: JsonUtils import * style: ran java linting * fix: init indexmapper in operations * fix: moved ES index json files to spec * style: ran java linting --------- Co-authored-by: Sriharsha Chintalapani --- .../java/org/openmetadata/csv/EntityCsv.java | 2 +- .../service/OpenMetadataApplication.java | 4 + .../OpenMetadataApplicationConfig.java | 2 +- .../openmetadata/service/TypeRegistry.java | 2 +- .../apps/AbstractNativeApplication.java | 2 +- .../openmetadata/service/apps/AppUtil.java | 2 +- .../service/apps/ApplicationHandler.java | 2 +- .../service/apps/ConfigurationReader.java | 2 +- .../apps/bundles/autoPilot/AutoPilotApp.java | 2 +- .../changeEvent/AbstractEventConsumer.java | 2 +- .../changeEvent/email/EmailPublisher.java | 2 +- .../feed/ActivityFeedPublisher.java | 2 +- .../changeEvent/gchat/GChatPublisher.java | 2 +- .../changeEvent/generic/GenericPublisher.java | 2 +- .../changeEvent/msteams/MSTeamsPublisher.java | 2 +- .../slack/SlackEventPublisher.java | 2 +- .../bundles/dataRetention/DataRetention.java | 2 +- .../bundles/insights/DataInsightsApp.java | 4 +- .../insights/DataInsightsReportApp.java | 2 +- .../processors/CreateReportDataProcessor.java | 2 +- .../search/DataInsightsSearchInterface.java | 4 +- .../insights/search/IndexTemplate.java | 2 +- .../ElasticSearchDataInsightsClient.java | 2 +- .../OpenSearchDataInsightsClient.java | 2 +- .../insights/sinks/ReportDataSink.java | 2 +- ...gatedCostAnalysisReportDataAggregator.java | 2 +- ...egatedCostAnalysisReportDataProcessor.java | 2 +- .../DatabaseServiceTablesProcessor.java | 2 +- .../RawCostAnalysisReportDataProcessor.java | 2 +- .../DataInsightsElasticSearchProcessor.java | 2 +- .../DataInsightsEntityEnricherProcessor.java | 2 +- .../DataInsightsOpenSearchProcessor.java | 2 +- .../dataQuality/DataQualityWorkflow.java | 2 +- .../WebAnalyticsEntityViewProcessor.java | 2 +- .../WebAnalyticsUserActivityAggregator.java | 2 +- .../WebAnalyticsUserActivityProcessor.java | 2 +- .../searchIndex/ElasticSearchIndexSink.java | 4 +- .../searchIndex/OpenSearchIndexSink.java | 4 +- .../bundles/searchIndex/SearchIndexApp.java | 4 +- .../apps/scheduler/OmAppJobListener.java | 2 +- .../pipeline/airflow/AirflowRESTClient.java | 2 +- .../dataInsight/UnusedAssetsAggregator.java | 2 +- .../service/events/ChangeEventHandler.java | 2 +- .../scheduled/EventSubscriptionScheduler.java | 2 +- .../events/subscription/AlertUtil.java | 2 +- .../subscription/AlertsRuleEvaluator.java | 2 +- .../exception/CatalogExceptionMessage.java | 2 +- .../openmetadata/service/fernet/Fernet.java | 2 +- .../entity/IngestionPipelineFormatter.java | 2 +- .../formatter/entity/PipelineFormatter.java | 2 +- .../formatter/entity/QueryFormatter.java | 2 +- .../formatter/field/AssetsFieldFormatter.java | 2 +- .../field/DefaultFieldFormatter.java | 2 +- .../formatter/field/DomainFormatter.java | 2 +- .../formatter/field/OwnerFormatter.java | 2 +- .../service/formatter/field/TagFormatter.java | 2 +- .../field/TestCaseResultFormatter.java | 2 +- .../service/formatter/util/FormatterUtil.java | 2 +- .../CheckEntityAttributesTask.java | 2 +- .../SetEntityCertificationTask.java | 2 +- .../SetGlossaryTermStatusTask.java | 2 +- .../CreateAndRunIngestionPipelineTask.java | 2 +- .../CreateIngestionPipelineDelegate.java | 2 +- .../CreateIngestionPipelineImpl.java | 2 +- .../RunIngestionPipelineDelegate.java | 2 +- .../impl/CheckEntityAttributesImpl.java | 2 +- .../impl/SetEntityCertificationImpl.java | 2 +- .../impl/SetGlossaryTermStatusImpl.java | 2 +- .../automatedTask/runApp/RunAppDelegate.java | 2 +- .../automatedTask/runApp/RunAppImpl.java | 2 +- .../automatedTask/runApp/RunAppTask.java | 2 +- .../nodes/userTask/UserApprovalTask.java | 2 +- .../userTask/impl/CreateApprovalTaskImpl.java | 2 +- .../impl/SetApprovalAssigneesImpl.java | 2 +- .../userTask/impl/SetCandidateUsersImpl.java | 2 +- .../triggers/EventBasedEntityTrigger.java | 2 +- .../triggers/impl/FetchEntitiesImpl.java | 2 +- .../triggers/impl/FilterEntityImpl.java | 2 +- .../workflows/flowable/BaseDelegate.java | 2 +- .../workflows/flowable/MainWorkflow.java | 2 +- .../service/jdbi3/APIEndpointRepository.java | 2 +- .../service/jdbi3/AppRepository.java | 2 +- .../service/jdbi3/ChangeEventRepository.java | 2 +- .../service/jdbi3/ChangeSummarizer.java | 2 +- .../jdbi3/ClassificationRepository.java | 2 +- .../service/jdbi3/CollectionDAO.java | 2 +- .../service/jdbi3/ColumnRepository.java | 2 +- .../service/jdbi3/ContainerRepository.java | 2 +- .../jdbi3/DashboardDataModelRepository.java | 2 +- .../service/jdbi3/DataProductRepository.java | 2 +- .../service/jdbi3/DatabaseRepository.java | 2 +- .../jdbi3/DatabaseSchemaRepository.java | 2 +- .../service/jdbi3/DocumentRepository.java | 2 +- .../service/jdbi3/DomainRepository.java | 2 +- .../openmetadata/service/jdbi3/EntityDAO.java | 2 +- .../service/jdbi3/EntityRepository.java | 2 +- .../service/jdbi3/EntityTimeSeriesDAO.java | 2 +- .../jdbi3/EntityTimeSeriesRepository.java | 2 +- .../jdbi3/EventSubscriptionRepository.java | 2 +- .../service/jdbi3/FeedRepository.java | 2 +- .../service/jdbi3/GlossaryRepository.java | 2 +- .../service/jdbi3/GlossaryTermRepository.java | 2 +- .../jdbi3/IngestionPipelineRepository.java | 2 +- .../service/jdbi3/LineageRepository.java | 4 +- .../service/jdbi3/MlModelRepository.java | 2 +- .../service/jdbi3/PipelineRepository.java | 2 +- .../service/jdbi3/QueryRepository.java | 2 +- .../service/jdbi3/ReportDataRepository.java | 2 +- .../service/jdbi3/SearchIndexRepository.java | 2 +- .../jdbi3/ServiceEntityRepository.java | 2 +- .../service/jdbi3/SuggestionRepository.java | 2 +- .../service/jdbi3/SystemRepository.java | 2 +- .../service/jdbi3/TableRepository.java | 2 +- .../service/jdbi3/TestCaseRepository.java | 2 +- .../TestCaseResolutionStatusRepository.java | 2 +- .../jdbi3/TestCaseResultRepository.java | 2 +- .../service/jdbi3/TestSuiteRepository.java | 4 +- .../service/jdbi3/TokenRepository.java | 2 +- .../service/jdbi3/TopicRepository.java | 2 +- .../service/jdbi3/TypeRepository.java | 2 +- .../service/jdbi3/UserRepository.java | 2 +- .../jdbi3/WebAnalyticEventRepository.java | 2 +- .../jdbi3/WorkflowInstanceRepository.java | 2 +- .../WorkflowInstanceStateRepository.java | 2 +- .../service/jobs/EnumCleanupHandler.java | 2 +- .../service/jobs/GenericBackgroundWorker.java | 2 +- .../org/openmetadata/service/jobs/JobDAO.java | 2 +- .../service/limits/AppLimits.java | 2 +- .../service/mcp/MCPStreamableHttpServlet.java | 2 +- .../service/mcp/McpAuthFilter.java | 2 +- .../openmetadata/service/mcp/McpServer.java | 2 +- .../openmetadata/service/mcp/McpUtils.java | 2 +- .../service/mcp/tools/CommonUtils.java | 2 +- .../service/mcp/tools/DefaultToolContext.java | 2 +- .../service/mcp/tools/GetEntityTool.java | 2 +- .../service/mcp/tools/GetLineageTool.java | 2 +- .../service/mcp/tools/GlossaryTermTool.java | 2 +- .../service/mcp/tools/GlossaryTool.java | 2 +- .../service/mcp/tools/PatchEntityTool.java | 2 +- .../service/mcp/tools/SearchMetadataTool.java | 2 +- .../migration/utils/V112/MigrationUtil.java | 2 +- .../migration/utils/v110/MigrationUtil.java | 2 +- .../utils/v111/MigrationUtilV111.java | 2 +- .../migration/utils/v120/MigrationUtil.java | 2 +- .../migration/utils/v130/MigrationUtil.java | 2 +- .../migration/utils/v131/MigrationUtil.java | 2 +- .../migration/utils/v132/MigrationUtil.java | 2 +- .../migration/utils/v140/MigrationUtil.java | 2 +- .../migration/utils/v141/MigrationUtil.java | 2 +- .../migration/utils/v150/MigrationUtil.java | 2 +- .../migration/utils/v155/MigrationUtil.java | 2 +- .../migration/utils/v157/MigrationUtil.java | 2 +- .../migration/utils/v159/MigrationUtil.java | 2 +- .../migration/utils/v160/MigrationUtil.java | 2 +- .../migration/utils/v170/MigrationUtil.java | 2 +- .../migration/utils/v180/MigrationUtil.java | 2 +- .../analytics/WebAnalyticEventResource.java | 2 +- .../service/resources/apps/AppMapper.java | 2 +- .../resources/apps/AppMarketPlaceMapper.java | 2 +- .../resources/databases/TableResource.java | 2 +- .../resources/docstore/DocStoreMapper.java | 2 +- .../EventSubscriptionResource.java | 2 +- .../service/resources/feeds/FeedUtil.java | 2 +- .../resources/glossary/GlossaryResource.java | 2 +- .../resources/policies/PolicyResource.java | 2 +- .../apiservices/APIServiceResource.java | 2 +- .../dashboard/DashboardServiceResource.java | 2 +- .../database/DatabaseServiceResource.java | 2 +- .../messaging/MessagingServiceResource.java | 2 +- .../metadata/MetadataServiceResource.java | 2 +- .../mlmodel/MlModelServiceResource.java | 2 +- .../pipeline/PipelineServiceResource.java | 2 +- .../searchIndexes/SearchServiceResource.java | 2 +- .../storage/StorageServiceResource.java | 2 +- .../resources/settings/SettingsCache.java | 2 +- .../resources/system/SystemResource.java | 2 +- .../service/resources/teams/TeamResource.java | 2 +- .../service/resources/teams/UserResource.java | 2 +- .../service/resources/types/TypeResource.java | 2 +- .../service/search/SearchClient.java | 2 +- .../service/search/SearchIndexUtils.java | 2 +- .../service/search/SearchRepository.java | 37 +---- .../service/search/SearchUtils.java | 2 +- .../elasticsearch/ESLineageGraphBuilder.java | 2 +- .../elasticsearch/ElasticSearchClient.java | 10 +- .../ElasticSearchEntitiesProcessor.java | 4 +- ...lasticSearchEntityTimeSeriesProcessor.java | 4 +- .../elasticsearch/ElasticSearchIndexSink.java | 2 +- .../ElasticSearchLineChartAggregator.java | 2 +- .../ElasticSearchSummaryCardAggregator.java | 2 +- .../search/indexes/EntityReportDataIndex.java | 2 +- .../indexes/IngestionPipelineIndex.java | 2 +- .../RawCostAnalysisReportDataIndex.java | 2 +- .../search/indexes/ReportDataIndexes.java | 2 +- .../service/search/indexes/SearchIndex.java | 4 +- .../search/indexes/TestCaseResultIndex.java | 2 +- .../WebAnalyticEntityViewReportDataIndex.java | 2 +- ...ebAnalyticUserActivityReportDataIndex.java | 2 +- .../opensearch/OSLineageGraphBuilder.java | 2 +- .../search/opensearch/OpenSearchClient.java | 7 +- .../OpenSearchEntitiesProcessor.java | 4 +- .../OpenSearchEntityTimeSeriesProcessor.java | 4 +- .../opensearch/OpenSearchIndexSink.java | 2 +- .../OpenSearchLineChartAggregator.java | 2 +- .../OpenSearchSummaryCardAggregator.java | 2 +- .../AirflowConnectionClassConverter.java | 2 +- .../BigQueryConnectionClassConverter.java | 2 +- .../BigTableConnectionClassConverter.java | 2 +- .../CassandraConnectionClassConverter.java | 2 +- .../secrets/converter/ClassConverter.java | 2 +- .../CockroachConnectionClassConverter.java | 2 +- .../DatalakeConnectionClassConverter.java | 2 +- .../converter/DbtGCSConfigClassConverter.java | 2 +- .../converter/DbtPipelineClassConverter.java | 2 +- .../DeltaLakeConnectionClassConverter.java | 2 +- .../DorisConnectionClassConverter.java | 2 +- ...ElasticSearchConnectionClassConverter.java | 2 +- .../converter/GCPConfigClassConverter.java | 2 +- .../GcpConnectionClassConverter.java | 2 +- .../GcpCredentialsClassConverter.java | 2 +- .../GreenplumConnectionClassConverter.java | 2 +- .../HiveConnectionClassConverter.java | 2 +- .../IcebergConnectionClassConverter.java | 2 +- .../IcebergFileSystemClassConverter.java | 2 +- .../LookerConnectionClassConverter.java | 2 +- .../MatillionConnectionClassConverter.java | 2 +- .../MysqlConnectionClassConverter.java | 2 +- .../NifiConnectionClassConverter.java | 2 +- .../PostgresConnectionClassConverter.java | 2 +- .../RedshiftConnectionClassConverter.java | 2 +- .../SSOAuthMechanismClassConverter.java | 2 +- .../SalesforceConnectorClassConverter.java | 2 +- .../SapHanaConnectionClassConverter.java | 2 +- .../SsisConnectionClassConverter.java | 2 +- .../StorageConfigClassConverter.java | 2 +- .../SupersetConnectionClassConverter.java | 2 +- .../TableauConnectionClassConverter.java | 2 +- ...erviceConnectionRequestClassConverter.java | 2 +- .../TrinoConnectionClassConverter.java | 2 +- .../VertexAIConnectionClassConverter.java | 2 +- .../converter/WorkflowClassConverter.java | 2 +- .../AuthenticationCodeFlowHandler.java | 2 +- .../security/auth/BasicAuthenticator.java | 2 +- .../service/security/auth/BotTokenCache.java | 2 +- .../security/auth/LdapAuthenticator.java | 2 +- .../saml/SamlTokenRefreshServlet.java | 2 +- .../service/util/AppMarketPlaceUtil.java | 1 + .../openmetadata/service/util/EntityUtil.java | 1 + .../service/util/JsonPatchUtils.java | 1 + .../openmetadata/service/util/LdapUtil.java | 1 + .../service/util/LineageUtil.java | 3 +- .../util/OpenMetadataConnectionBuilder.java | 1 + .../service/util/OpenMetadataOperations.java | 3 + .../openmetadata/service/util/UserUtil.java | 1 + .../util/WebsocketNotificationHandler.java | 1 + .../workflows/searchIndex/ReindexingUtil.java | 2 +- .../jobs/BackgroundJobWorkerTest.java | 2 +- .../service/OpenMetadataApplicationTest.java | 4 + .../searchIndex/SearchIndexAppTest.java | 2 +- ...SearchIndexCompressionIntegrationTest.java | 2 +- .../searchIndex/SearchIndexEndToEndTest.java | 2 +- .../SearchIndexWebSocketIntegrationTest.java | 2 +- .../ChangeEventParserResourceTest.java | 2 +- .../service/resources/EntityResourceTest.java | 4 +- .../apis/APIEndpointResourceTest.java | 2 +- .../resources/apps/AppsResourceTest.java | 2 +- .../resources/charts/ChartResourceTest.java | 2 +- .../data/DataContractResourceTest.java | 2 +- .../databases/DatabaseResourceTest.java | 2 +- .../StoredProcedureResourceTest.java | 1 + .../databases/TableResourceTest.java | 4 +- .../DashboardDataModelResourceTest.java | 2 +- .../docstore/DocStoreResourceTest.java | 2 +- .../domains/DataProductResourceTest.java | 2 +- .../resources/domains/DomainResourceTest.java | 2 +- .../dqtests/TestCaseResourceTest.java | 4 +- .../dqtests/TestSuiteResourceTest.java | 4 +- .../events/BaseCallbackResource.java | 2 +- .../events/EventSubscriptionResourceTest.java | 2 +- .../resources/feeds/FeedResourceTest.java | 2 +- .../glossary/GlossaryResourceTest.java | 2 +- .../glossary/GlossaryTermResourceTest.java | 2 +- .../resources/kpi/KpiResourceTest.java | 2 +- .../lineage/LineageResourceTest.java | 2 +- .../resources/metadata/TypeResourceTest.java | 2 +- .../resources/metrics/MetricResourceTest.java | 2 +- .../mlmodels/MlModelResourceTest.java | 2 +- .../permissions/PermissionsResourceTest.java | 2 +- .../pipelines/PipelineResourceTest.java | 2 +- .../policies/PolicyResourceTest.java | 2 +- .../resources/query/QueryResourceTest.java | 2 +- .../resources/search/SearchResourceTest.java | 19 +++ .../searchindex/SearchIndexResourceTest.java | 2 +- .../services/APIServiceResourceTest.java | 2 +- .../DashboardServiceResourceTest.java | 2 +- .../services/DatabaseServiceResourceTest.java | 2 +- .../MessagingServiceResourceTest.java | 2 +- .../services/MetadataServiceResourceTest.java | 2 +- .../services/MlModelServiceResourceTest.java | 2 +- .../services/PipelineServiceResourceTest.java | 2 +- .../services/SearchServiceResourceTest.java | 2 +- .../services/StorageServiceResourceTest.java | 2 +- .../IngestionPipelineResourceTest.java | 2 +- .../storages/ContainerResourceTest.java | 2 +- .../resources/system/SystemResourceTest.java | 2 +- .../tags/ClassificationResourceTest.java | 2 +- .../resources/tags/TagResourceTest.java | 2 +- .../resources/teams/PersonaResourceTest.java | 2 +- .../resources/teams/RoleResourceTest.java | 2 +- .../resources/teams/TeamResourceTest.java | 2 +- .../resources/teams/UserResourceTest.java | 2 +- .../resources/topics/TopicResourceTest.java | 2 +- .../secrets/AWSBasedSecretsManagerTest.java | 2 +- .../service/secrets/DBSecretsManagerTest.java | 2 +- .../secrets/ExternalSecretsManagerTest.java | 2 +- .../secrets/SecretsManagerLifecycleTest.java | 2 +- .../secrets/masker/TestEntityMasker.java | 2 +- .../service/util/JsonUtilsTest.java | 1 + openmetadata-spec/pom.xml | 24 +++ .../exception/JsonParsingException.java | 38 +++++ .../openmetadata/schema/utils}/JsonUtils.java | 118 ++++++++++++--- .../openmetadata/search}/IndexMapping.java | 6 +- .../search/IndexMappingLoader.java | 139 ++++++++++++++++++ ...gated_cost_analysis_report_data_index.json | 0 .../en/api_collection_index_mapping.json | 0 .../en/api_endpoint_index_mapping.json | 0 .../en/api_service_index_mapping.json | 0 .../elasticsearch/en/chart_index_mapping.json | 0 .../en/classification_index_mapping.json | 0 .../en/container_index_mapping.json | 0 .../dashboard_data_model_index_mapping.json | 0 .../en/dashboard_index_mapping.json | 0 .../en/dashboard_service_index_mapping.json | 0 .../en/data_products_index_mapping.json | 0 .../en/database_index_mapping.json | 0 .../en/database_schema_index_mapping.json | 0 .../en/database_service_index_mapping.json | 0 .../en/domain_index_mapping.json | 0 .../en/glossary_index_mapping.json | 0 .../en/glossary_term_index_mapping.json | 0 .../en/ingestion_pipeline_index_mapping.json | 0 .../en/messaging_service_index_mapping.json | 0 .../en/metadata_service_index_mapping.json | 0 .../en/metric_index_mapping.json | 0 .../en/mlmodel_index_mapping.json | 0 .../en/mlmodel_service_index_mapping.json | 0 .../en/pipeline_index_mapping.json | 0 .../en/pipeline_service_index_mapping.json | 0 .../en/query_cost_record_index_mapping.json | 0 .../elasticsearch/en/query_index_mapping.json | 0 .../en/search_entity_index_mapping.json | 0 .../en/search_service_index_mapping.json | 0 .../en/storage_service_index_mapping.json | 0 .../en/stored_procedure_index_mapping.json | 0 .../elasticsearch/en/table_index_mapping.json | 0 .../elasticsearch/en/tag_index_mapping.json | 0 .../elasticsearch/en/team_index_mapping.json | 0 .../en/test_case_index_mapping.json | 0 ..._case_resolution_status_index_mapping.json | 0 .../en/test_case_result_index_mapping.json | 0 .../en/test_suite_index_mapping.json | 0 .../elasticsearch/en/topic_index_mapping.json | 0 .../elasticsearch/en/user_index_mapping.json | 0 .../entity_report_data_index.json | 0 .../resources/elasticsearch/indexMapping.json | 0 .../jp/api_collection_index_mapping.json | 0 .../jp/api_endpoint_index_mapping.json | 0 .../jp/api_service_index_mapping.json | 0 .../elasticsearch/jp/chart_index_mapping.json | 0 .../jp/classification_index_mapping.json | 0 .../jp/container_index_mapping.json | 0 .../dashboard_data_model_index_mapping.json | 0 .../jp/dashboard_index_mapping.json | 0 .../jp/dashboard_service_index_mapping.json | 0 .../jp/data_products_index_mapping.json | 0 .../jp/database_index_mapping.json | 0 .../jp/database_schema_index_mapping.json | 0 .../jp/database_service_index_mapping.json | 0 .../jp/domain_index_mapping.json | 0 .../jp/glossary_index_mapping.json | 0 .../jp/glossary_term_index_mapping.json | 0 .../jp/ingestion_pipeline_index_mapping.json | 0 .../jp/messaging_service_index_mapping.json | 0 .../jp/metadata_service_index_mapping.json | 0 .../jp/metric_index_mapping.json | 0 .../jp/mlmodel_index_mapping.json | 0 .../jp/mlmodel_service_index_mapping.json | 0 .../jp/pipeline_index_mapping.json | 0 .../jp/pipeline_service_index_mapping.json | 0 .../jp/query_cost_record_index_mapping.json | 0 .../elasticsearch/jp/query_index_mapping.json | 0 .../jp/search_entity_index_mapping.json | 0 .../jp/search_service_index_mapping.json | 0 .../jp/storage_service_index_mapping.json | 0 .../jp/stored_procedure_index_mapping.json | 0 .../elasticsearch/jp/table_index_mapping.json | 0 .../elasticsearch/jp/tag_index_mapping.json | 0 .../elasticsearch/jp/team_index_mapping.json | 0 .../jp/test_case_index_mapping.json | 0 ..._case_resolution_status_index_mapping.json | 0 .../jp/test_case_result_index_mapping.json | 0 .../jp/test_suite_index_mapping.json | 0 .../elasticsearch/jp/topic_index_mapping.json | 0 .../elasticsearch/jp/user_index_mapping.json | 0 .../raw_cost_analysis_report_data_index.json | 0 ...nalytic_entity_view_report_data_index.json | 0 ...lytic_user_activity_report_data_index.json | 0 .../zh/api_collection_index_mapping.json | 0 .../zh/api_endpoint_index_mapping.json | 0 .../zh/api_service_index_mapping.json | 0 .../elasticsearch/zh/chart_index_mapping.json | 0 .../zh/classification_index_mapping.json | 0 .../zh/container_index_mapping.json | 0 .../dashboard_data_model_index_mapping.json | 0 .../zh/dashboard_index_mapping.json | 0 .../zh/dashboard_service_index_mapping.json | 0 .../zh/data_products_index_mapping.json | 0 .../zh/database_index_mapping.json | 0 .../zh/database_schema_index_mapping.json | 0 .../zh/database_service_index_mapping.json | 0 .../zh/domain_index_mapping.json | 0 .../zh/glossary_index_mapping.json | 0 .../zh/glossary_term_index_mapping.json | 0 .../zh/ingestion_pipeline_index_mapping.json | 0 .../zh/messaging_service_index_mapping.json | 0 .../zh/metadata_service_index_mapping.json | 0 .../zh/metric_index_mapping.json | 0 .../zh/mlmodel_index_mapping.json | 0 .../zh/mlmodel_service_index_mapping.json | 0 .../zh/pipeline_index_mapping.json | 0 .../zh/pipeline_service_index_mapping.json | 0 .../zh/query_cost_record_index_mapping.json | 0 .../elasticsearch/zh/query_index_mapping.json | 0 .../zh/search_entity_index_mapping.json | 0 .../zh/search_service_index_mapping.json | 0 .../zh/storage_service_index_mapping.json | 0 .../zh/stored_procedure_index_mapping.json | 0 .../elasticsearch/zh/table_index_mapping.json | 0 .../elasticsearch/zh/tag_index_mapping.json | 0 .../elasticsearch/zh/team_index_mapping.json | 0 .../zh/test_case_index_mapping.json | 0 ..._case_resolution_status_index_mapping.json | 0 .../zh/test_case_result_index_mapping.json | 0 .../zh/test_suite_index_mapping.json | 0 .../elasticsearch/zh/topic_index_mapping.json | 0 .../elasticsearch/zh/user_index_mapping.json | 0 .../createIngestionPipeline.ts | 15 +- .../ingestionPipelines/ingestionPipeline.ts | 15 +- .../databaseServiceProfilerPipeline.ts | 4 +- 449 files changed, 691 insertions(+), 398 deletions(-) create mode 100644 openmetadata-spec/src/main/java/org/openmetadata/schema/exception/JsonParsingException.java rename {openmetadata-service/src/main/java/org/openmetadata/service/util => openmetadata-spec/src/main/java/org/openmetadata/schema/utils}/JsonUtils.java (85%) rename {openmetadata-service/src/main/java/org/openmetadata/service/search/models => openmetadata-spec/src/main/java/org/openmetadata/search}/IndexMapping.java (90%) create mode 100644 openmetadata-spec/src/main/java/org/openmetadata/search/IndexMappingLoader.java rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/aggregated_cost_analysis_report_data_index.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/api_collection_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/api_endpoint_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/api_service_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/chart_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/classification_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/container_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/dashboard_data_model_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/dashboard_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/dashboard_service_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/data_products_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/database_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/database_schema_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/database_service_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/domain_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/glossary_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/glossary_term_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/ingestion_pipeline_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/messaging_service_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/metadata_service_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/metric_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/mlmodel_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/mlmodel_service_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/pipeline_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/pipeline_service_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/query_cost_record_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/query_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/search_entity_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/search_service_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/storage_service_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/stored_procedure_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/table_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/tag_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/team_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/test_case_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/test_case_resolution_status_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/test_case_result_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/test_suite_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/topic_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/en/user_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/entity_report_data_index.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/indexMapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/api_collection_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/api_endpoint_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/api_service_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/chart_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/classification_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/container_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/dashboard_data_model_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/dashboard_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/dashboard_service_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/data_products_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/database_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/database_schema_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/database_service_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/domain_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/glossary_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/glossary_term_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/ingestion_pipeline_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/messaging_service_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/metadata_service_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/metric_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/mlmodel_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/mlmodel_service_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/pipeline_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/pipeline_service_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/query_cost_record_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/query_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/search_entity_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/search_service_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/storage_service_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/stored_procedure_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/table_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/tag_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/team_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/test_case_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/test_case_resolution_status_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/test_case_result_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/test_suite_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/topic_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/jp/user_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/raw_cost_analysis_report_data_index.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/web_analytic_entity_view_report_data_index.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/web_analytic_user_activity_report_data_index.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/api_collection_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/api_endpoint_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/api_service_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/chart_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/classification_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/container_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/dashboard_data_model_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/dashboard_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/dashboard_service_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/data_products_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/database_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/database_schema_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/database_service_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/domain_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/glossary_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/glossary_term_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/ingestion_pipeline_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/messaging_service_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/metadata_service_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/metric_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/mlmodel_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/mlmodel_service_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/pipeline_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/pipeline_service_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/query_cost_record_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/query_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/search_entity_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/search_service_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/storage_service_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/stored_procedure_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/table_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/tag_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/team_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/test_case_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/test_case_resolution_status_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/test_case_result_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/test_suite_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/topic_index_mapping.json (100%) rename {openmetadata-service => openmetadata-spec}/src/main/resources/elasticsearch/zh/user_index_mapping.json (100%) diff --git a/openmetadata-service/src/main/java/org/openmetadata/csv/EntityCsv.java b/openmetadata-service/src/main/java/org/openmetadata/csv/EntityCsv.java index 8d408009cdb..ff21ce524db 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/csv/EntityCsv.java +++ b/openmetadata-service/src/main/java/org/openmetadata/csv/EntityCsv.java @@ -91,6 +91,7 @@ import org.openmetadata.schema.type.csv.CsvFile; import org.openmetadata.schema.type.csv.CsvHeader; import org.openmetadata.schema.type.csv.CsvImportResult; import org.openmetadata.schema.type.customProperties.TableConfig; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.TypeRegistry; import org.openmetadata.service.exception.EntityNotFoundException; @@ -101,7 +102,6 @@ import org.openmetadata.service.jdbi3.TableRepository; import org.openmetadata.service.util.AsyncService; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.RestUtil.PutResponse; import org.openmetadata.service.util.ValidatorUtil; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/OpenMetadataApplication.java b/openmetadata-service/src/main/java/org/openmetadata/service/OpenMetadataApplication.java index be1a80e1b10..67786ccdef9 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/OpenMetadataApplication.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/OpenMetadataApplication.java @@ -74,6 +74,7 @@ import org.openmetadata.schema.api.security.ClientType; import org.openmetadata.schema.configuration.LimitsConfiguration; import org.openmetadata.schema.service.configuration.elasticsearch.ElasticSearchConfiguration; import org.openmetadata.schema.services.connections.metadata.AuthProvider; +import org.openmetadata.search.IndexMappingLoader; import org.openmetadata.service.apps.ApplicationContext; import org.openmetadata.service.apps.ApplicationHandler; import org.openmetadata.service.apps.scheduler.AppScheduler; @@ -197,6 +198,9 @@ public class OpenMetadataApplication extends Application { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/changeEvent/gchat/GChatPublisher.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/changeEvent/gchat/GChatPublisher.java index b7f7cbc8ee3..a28442595a7 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/changeEvent/gchat/GChatPublisher.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/changeEvent/gchat/GChatPublisher.java @@ -30,12 +30,12 @@ import org.openmetadata.schema.entity.events.EventSubscription; import org.openmetadata.schema.entity.events.SubscriptionDestination; import org.openmetadata.schema.type.ChangeEvent; import org.openmetadata.schema.type.Webhook; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.apps.bundles.changeEvent.Destination; import org.openmetadata.service.events.errors.EventPublisherException; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.formatter.decorators.GChatMessageDecorator; import org.openmetadata.service.formatter.decorators.MessageDecorator; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class GChatPublisher implements Destination { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/changeEvent/generic/GenericPublisher.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/changeEvent/generic/GenericPublisher.java index 773572b5c8f..9587f85905a 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/changeEvent/generic/GenericPublisher.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/changeEvent/generic/GenericPublisher.java @@ -35,12 +35,12 @@ import org.openmetadata.schema.entity.events.EventSubscription; import org.openmetadata.schema.entity.events.SubscriptionDestination; import org.openmetadata.schema.type.ChangeEvent; import org.openmetadata.schema.type.Webhook; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.apps.bundles.changeEvent.Destination; import org.openmetadata.service.events.errors.EventPublisherException; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.fernet.Fernet; import org.openmetadata.service.security.SecurityUtil; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.RestUtil; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/changeEvent/msteams/MSTeamsPublisher.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/changeEvent/msteams/MSTeamsPublisher.java index 28ff0bbef4a..c96a4718097 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/changeEvent/msteams/MSTeamsPublisher.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/changeEvent/msteams/MSTeamsPublisher.java @@ -31,12 +31,12 @@ import org.openmetadata.schema.entity.events.EventSubscription; import org.openmetadata.schema.entity.events.SubscriptionDestination; import org.openmetadata.schema.type.ChangeEvent; import org.openmetadata.schema.type.Webhook; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.apps.bundles.changeEvent.Destination; import org.openmetadata.service.events.errors.EventPublisherException; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.formatter.decorators.MSTeamsMessageDecorator; import org.openmetadata.service.formatter.decorators.MessageDecorator; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.RestUtil; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/changeEvent/slack/SlackEventPublisher.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/changeEvent/slack/SlackEventPublisher.java index 1e9ad4925e5..63db92f807e 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/changeEvent/slack/SlackEventPublisher.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/changeEvent/slack/SlackEventPublisher.java @@ -34,12 +34,12 @@ import org.openmetadata.schema.entity.events.EventSubscription; import org.openmetadata.schema.entity.events.SubscriptionDestination; import org.openmetadata.schema.type.ChangeEvent; import org.openmetadata.schema.type.Webhook; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.apps.bundles.changeEvent.Destination; import org.openmetadata.service.events.errors.EventPublisherException; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.formatter.decorators.MessageDecorator; import org.openmetadata.service.formatter.decorators.SlackMessageDecorator; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.RestUtil; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/dataRetention/DataRetention.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/dataRetention/DataRetention.java index b00e568fbe0..2e85682157d 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/dataRetention/DataRetention.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/dataRetention/DataRetention.java @@ -20,6 +20,7 @@ import org.openmetadata.schema.entity.applications.configuration.internal.DataRe import org.openmetadata.schema.system.EntityStats; import org.openmetadata.schema.system.Stats; import org.openmetadata.schema.system.StepStats; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.apps.AbstractNativeApplication; import org.openmetadata.service.jdbi3.CollectionDAO; @@ -27,7 +28,6 @@ import org.openmetadata.service.jdbi3.FeedRepository; import org.openmetadata.service.search.SearchRepository; import org.openmetadata.service.socket.WebSocketManager; import org.openmetadata.service.util.EntityRelationshipCleanupUtil; -import org.openmetadata.service.util.JsonUtils; import org.quartz.JobExecutionContext; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/DataInsightsApp.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/DataInsightsApp.java index ed4a4d23f66..4d8eb0d3a39 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/DataInsightsApp.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/DataInsightsApp.java @@ -31,6 +31,8 @@ import org.openmetadata.schema.system.EventPublisherJob; import org.openmetadata.schema.system.IndexingError; import org.openmetadata.schema.system.Stats; import org.openmetadata.schema.system.StepStats; +import org.openmetadata.schema.utils.JsonUtils; +import org.openmetadata.search.IndexMapping; import org.openmetadata.service.Entity; import org.openmetadata.service.apps.AbstractNativeApplication; import org.openmetadata.service.apps.bundles.insights.search.DataInsightsSearchInterface; @@ -45,9 +47,7 @@ import org.openmetadata.service.apps.bundles.insights.workflows.webAnalytics.Web import org.openmetadata.service.exception.SearchIndexException; import org.openmetadata.service.jdbi3.CollectionDAO; import org.openmetadata.service.search.SearchRepository; -import org.openmetadata.service.search.models.IndexMapping; import org.openmetadata.service.socket.WebSocketManager; -import org.openmetadata.service.util.JsonUtils; import org.quartz.JobExecutionContext; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/DataInsightsReportApp.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/DataInsightsReportApp.java index e1bd5e20ad8..81686256e55 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/DataInsightsReportApp.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/DataInsightsReportApp.java @@ -31,6 +31,7 @@ import org.openmetadata.schema.entity.teams.Team; import org.openmetadata.schema.entity.teams.User; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.apps.AbstractNativeApplication; import org.openmetadata.service.apps.bundles.insights.utils.TimestampUtils; @@ -45,7 +46,6 @@ import org.openmetadata.service.jdbi3.KpiRepository; import org.openmetadata.service.jdbi3.ListFilter; import org.openmetadata.service.search.SearchClient; import org.openmetadata.service.search.SearchRepository; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.util.Utilities; import org.openmetadata.service.util.email.EmailUtil; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/processors/CreateReportDataProcessor.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/processors/CreateReportDataProcessor.java index 7c7bd238ec8..f8703de9e1d 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/processors/CreateReportDataProcessor.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/processors/CreateReportDataProcessor.java @@ -12,8 +12,8 @@ import org.glassfish.jersey.internal.util.ExceptionUtils; import org.openmetadata.schema.analytics.ReportData; import org.openmetadata.schema.system.IndexingError; import org.openmetadata.schema.system.StepStats; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.exception.SearchIndexException; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.workflows.interfaces.Processor; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/search/DataInsightsSearchInterface.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/search/DataInsightsSearchInterface.java index a859b926185..ee67c34e9f6 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/search/DataInsightsSearchInterface.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/search/DataInsightsSearchInterface.java @@ -3,9 +3,9 @@ package org.openmetadata.service.apps.bundles.insights.search; import java.io.IOException; import java.io.InputStream; import java.util.List; +import org.openmetadata.schema.utils.JsonUtils; +import org.openmetadata.search.IndexMapping; import org.openmetadata.service.exception.UnhandledServerException; -import org.openmetadata.service.search.models.IndexMapping; -import org.openmetadata.service.util.JsonUtils; public interface DataInsightsSearchInterface { String DATA_INSIGHTS_SEARCH_CONFIG_PATH = "/dataInsights/config.json"; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/search/IndexTemplate.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/search/IndexTemplate.java index 9fdd464ae55..5a6db93e21b 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/search/IndexTemplate.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/search/IndexTemplate.java @@ -4,7 +4,7 @@ import static org.openmetadata.service.apps.bundles.insights.search.DataInsights import java.util.List; import java.util.Map; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; public class IndexTemplate { public static final String COMPOSED_OF = "composed_of"; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/search/elasticsearch/ElasticSearchDataInsightsClient.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/search/elasticsearch/ElasticSearchDataInsightsClient.java index c78950b0c0d..eec44cfced9 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/search/elasticsearch/ElasticSearchDataInsightsClient.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/search/elasticsearch/ElasticSearchDataInsightsClient.java @@ -4,9 +4,9 @@ import es.org.elasticsearch.client.Request; import es.org.elasticsearch.client.Response; import es.org.elasticsearch.client.RestClient; import java.io.IOException; +import org.openmetadata.search.IndexMapping; import org.openmetadata.service.apps.bundles.insights.search.DataInsightsSearchInterface; import org.openmetadata.service.apps.bundles.insights.search.IndexTemplate; -import org.openmetadata.service.search.models.IndexMapping; public class ElasticSearchDataInsightsClient implements DataInsightsSearchInterface { private final RestClient client; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/search/opensearch/OpenSearchDataInsightsClient.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/search/opensearch/OpenSearchDataInsightsClient.java index 46f9abccb92..8fd47a62cd1 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/search/opensearch/OpenSearchDataInsightsClient.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/search/opensearch/OpenSearchDataInsightsClient.java @@ -1,9 +1,9 @@ package org.openmetadata.service.apps.bundles.insights.search.opensearch; import java.io.IOException; +import org.openmetadata.search.IndexMapping; import org.openmetadata.service.apps.bundles.insights.search.DataInsightsSearchInterface; import org.openmetadata.service.apps.bundles.insights.search.IndexTemplate; -import org.openmetadata.service.search.models.IndexMapping; import os.org.opensearch.client.Request; import os.org.opensearch.client.Response; import os.org.opensearch.client.RestClient; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/sinks/ReportDataSink.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/sinks/ReportDataSink.java index 3ef3169e6e3..c8f6ae20a74 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/sinks/ReportDataSink.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/sinks/ReportDataSink.java @@ -12,10 +12,10 @@ import org.glassfish.jersey.internal.util.ExceptionUtils; import org.openmetadata.schema.analytics.ReportData; import org.openmetadata.schema.system.IndexingError; import org.openmetadata.schema.system.StepStats; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.SearchIndexException; import org.openmetadata.service.jdbi3.ReportDataRepository; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.workflows.interfaces.Sink; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/costAnalysis/processors/AggregatedCostAnalysisReportDataAggregator.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/costAnalysis/processors/AggregatedCostAnalysisReportDataAggregator.java index ba657e014a6..306d70d1891 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/costAnalysis/processors/AggregatedCostAnalysisReportDataAggregator.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/costAnalysis/processors/AggregatedCostAnalysisReportDataAggregator.java @@ -12,9 +12,9 @@ import org.openmetadata.schema.analytics.AggregatedCostAnalysisReportData; import org.openmetadata.schema.analytics.DataAssetMetrics; import org.openmetadata.schema.system.IndexingError; import org.openmetadata.schema.system.StepStats; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.apps.bundles.insights.workflows.costAnalysis.CostAnalysisWorkflow; import org.openmetadata.service.exception.SearchIndexException; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.workflows.interfaces.Processor; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/costAnalysis/processors/AggregatedCostAnalysisReportDataProcessor.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/costAnalysis/processors/AggregatedCostAnalysisReportDataProcessor.java index e8485c1d3b1..9e1db8c1f39 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/costAnalysis/processors/AggregatedCostAnalysisReportDataProcessor.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/costAnalysis/processors/AggregatedCostAnalysisReportDataProcessor.java @@ -16,11 +16,11 @@ import org.openmetadata.schema.analytics.DataAssetValues; import org.openmetadata.schema.system.IndexingError; import org.openmetadata.schema.system.StepStats; import org.openmetadata.schema.type.LifeCycle; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.apps.bundles.insights.utils.TimestampUtils; import org.openmetadata.service.apps.bundles.insights.workflows.costAnalysis.CostAnalysisWorkflow; import org.openmetadata.service.exception.SearchIndexException; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.workflows.interfaces.Processor; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/costAnalysis/processors/DatabaseServiceTablesProcessor.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/costAnalysis/processors/DatabaseServiceTablesProcessor.java index 575a8226756..8b10e1cb43f 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/costAnalysis/processors/DatabaseServiceTablesProcessor.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/costAnalysis/processors/DatabaseServiceTablesProcessor.java @@ -15,11 +15,11 @@ import org.openmetadata.schema.system.StepStats; import org.openmetadata.schema.type.AccessDetails; import org.openmetadata.schema.type.LifeCycle; import org.openmetadata.schema.type.TableProfile; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.apps.bundles.insights.workflows.costAnalysis.CostAnalysisWorkflow; import org.openmetadata.service.exception.SearchIndexException; import org.openmetadata.service.jdbi3.TableRepository; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.workflows.interfaces.Processor; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/costAnalysis/processors/RawCostAnalysisReportDataProcessor.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/costAnalysis/processors/RawCostAnalysisReportDataProcessor.java index 9161faa6948..479cfd57ee3 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/costAnalysis/processors/RawCostAnalysisReportDataProcessor.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/costAnalysis/processors/RawCostAnalysisReportDataProcessor.java @@ -10,9 +10,9 @@ import org.glassfish.jersey.internal.util.ExceptionUtils; import org.openmetadata.schema.analytics.RawCostAnalysisReportData; import org.openmetadata.schema.system.IndexingError; import org.openmetadata.schema.system.StepStats; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.apps.bundles.insights.workflows.costAnalysis.CostAnalysisWorkflow; import org.openmetadata.service.exception.SearchIndexException; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.workflows.interfaces.Processor; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/dataAssets/processors/DataInsightsElasticSearchProcessor.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/dataAssets/processors/DataInsightsElasticSearchProcessor.java index 2349208e50c..014f7eea9f0 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/dataAssets/processors/DataInsightsElasticSearchProcessor.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/dataAssets/processors/DataInsightsElasticSearchProcessor.java @@ -12,8 +12,8 @@ import lombok.extern.slf4j.Slf4j; import org.glassfish.jersey.internal.util.ExceptionUtils; import org.openmetadata.schema.system.IndexingError; import org.openmetadata.schema.system.StepStats; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.exception.SearchIndexException; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.workflows.interfaces.Processor; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/dataAssets/processors/DataInsightsEntityEnricherProcessor.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/dataAssets/processors/DataInsightsEntityEnricherProcessor.java index 012449e08fd..c420ff715e6 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/dataAssets/processors/DataInsightsEntityEnricherProcessor.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/dataAssets/processors/DataInsightsEntityEnricherProcessor.java @@ -25,13 +25,13 @@ import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.TagLabel; import org.openmetadata.schema.type.change.ChangeSummary; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.apps.bundles.insights.utils.TimestampUtils; import org.openmetadata.service.exception.EntityNotFoundException; import org.openmetadata.service.exception.SearchIndexException; import org.openmetadata.service.jdbi3.EntityRepository; import org.openmetadata.service.search.SearchIndexUtils; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.workflows.interfaces.Processor; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/dataAssets/processors/DataInsightsOpenSearchProcessor.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/dataAssets/processors/DataInsightsOpenSearchProcessor.java index 0284ed03674..3c79613acb6 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/dataAssets/processors/DataInsightsOpenSearchProcessor.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/dataAssets/processors/DataInsightsOpenSearchProcessor.java @@ -9,8 +9,8 @@ import lombok.extern.slf4j.Slf4j; import org.glassfish.jersey.internal.util.ExceptionUtils; import org.openmetadata.schema.system.IndexingError; import org.openmetadata.schema.system.StepStats; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.exception.SearchIndexException; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.workflows.interfaces.Processor; import os.org.opensearch.action.bulk.BulkRequest; import os.org.opensearch.action.index.IndexRequest; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/dataQuality/DataQualityWorkflow.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/dataQuality/DataQualityWorkflow.java index 6c1b2df45c3..4f91e629b22 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/dataQuality/DataQualityWorkflow.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/dataQuality/DataQualityWorkflow.java @@ -19,6 +19,7 @@ import org.openmetadata.schema.entity.applications.configuration.internal.DataQu import org.openmetadata.schema.service.configuration.elasticsearch.ElasticSearchConfiguration; import org.openmetadata.schema.system.IndexingError; import org.openmetadata.schema.system.StepStats; +import org.openmetadata.search.IndexMapping; import org.openmetadata.service.apps.bundles.insights.DataInsightsApp; import org.openmetadata.service.apps.bundles.insights.utils.TimestampUtils; import org.openmetadata.service.apps.bundles.insights.workflows.WorkflowStats; @@ -27,7 +28,6 @@ import org.openmetadata.service.jdbi3.CollectionDAO; import org.openmetadata.service.search.SearchRepository; import org.openmetadata.service.search.elasticsearch.ElasticSearchEntityTimeSeriesProcessor; import org.openmetadata.service.search.elasticsearch.ElasticSearchIndexSink; -import org.openmetadata.service.search.models.IndexMapping; import org.openmetadata.service.search.opensearch.OpenSearchEntityTimeSeriesProcessor; import org.openmetadata.service.search.opensearch.OpenSearchIndexSink; import org.openmetadata.service.util.ResultList; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/webAnalytics/processors/WebAnalyticsEntityViewProcessor.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/webAnalytics/processors/WebAnalyticsEntityViewProcessor.java index 10db85b432f..834ea3bc547 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/webAnalytics/processors/WebAnalyticsEntityViewProcessor.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/webAnalytics/processors/WebAnalyticsEntityViewProcessor.java @@ -22,10 +22,10 @@ import org.openmetadata.schema.system.StepStats; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.TagLabel; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.EntityNotFoundException; import org.openmetadata.service.exception.SearchIndexException; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.workflows.interfaces.Processor; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/webAnalytics/processors/WebAnalyticsUserActivityAggregator.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/webAnalytics/processors/WebAnalyticsUserActivityAggregator.java index b1ea0dfb8f3..f1a5d5e79a5 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/webAnalytics/processors/WebAnalyticsUserActivityAggregator.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/webAnalytics/processors/WebAnalyticsUserActivityAggregator.java @@ -14,9 +14,9 @@ import org.glassfish.jersey.internal.util.ExceptionUtils; import org.openmetadata.schema.analytics.WebAnalyticUserActivityReportData; import org.openmetadata.schema.system.IndexingError; import org.openmetadata.schema.system.StepStats; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.apps.bundles.insights.workflows.webAnalytics.WebAnalyticsWorkflow; import org.openmetadata.service.exception.SearchIndexException; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.workflows.interfaces.Processor; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/webAnalytics/processors/WebAnalyticsUserActivityProcessor.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/webAnalytics/processors/WebAnalyticsUserActivityProcessor.java index eb8376b3c0b..0c22a24bebb 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/webAnalytics/processors/WebAnalyticsUserActivityProcessor.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/webAnalytics/processors/WebAnalyticsUserActivityProcessor.java @@ -16,12 +16,12 @@ import org.openmetadata.schema.entity.teams.User; import org.openmetadata.schema.system.IndexingError; import org.openmetadata.schema.system.StepStats; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.apps.bundles.insights.workflows.webAnalytics.WebAnalyticsWorkflow; import org.openmetadata.service.exception.EntityNotFoundException; import org.openmetadata.service.exception.SearchIndexException; import org.openmetadata.service.util.EntityUtil; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.workflows.interfaces.Processor; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/ElasticSearchIndexSink.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/ElasticSearchIndexSink.java index a07b4ddf9f2..d125a855c51 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/ElasticSearchIndexSink.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/ElasticSearchIndexSink.java @@ -30,11 +30,11 @@ import org.openmetadata.schema.EntityTimeSeriesInterface; import org.openmetadata.schema.system.EntityError; import org.openmetadata.schema.system.IndexingError; import org.openmetadata.schema.system.StepStats; +import org.openmetadata.schema.utils.JsonUtils; +import org.openmetadata.search.IndexMapping; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.SearchIndexException; import org.openmetadata.service.search.SearchClient; -import org.openmetadata.service.search.models.IndexMapping; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class ElasticSearchIndexSink implements BulkSink, Closeable { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/OpenSearchIndexSink.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/OpenSearchIndexSink.java index b77fdcea73e..23a8f00bda5 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/OpenSearchIndexSink.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/OpenSearchIndexSink.java @@ -19,11 +19,11 @@ import org.openmetadata.schema.EntityTimeSeriesInterface; import org.openmetadata.schema.system.EntityError; import org.openmetadata.schema.system.IndexingError; import org.openmetadata.schema.system.StepStats; +import org.openmetadata.schema.utils.JsonUtils; +import org.openmetadata.search.IndexMapping; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.SearchIndexException; import org.openmetadata.service.search.SearchClient; -import org.openmetadata.service.search.models.IndexMapping; -import org.openmetadata.service.util.JsonUtils; import os.org.opensearch.OpenSearchException; import os.org.opensearch.action.ActionListener; import os.org.opensearch.action.DocWriteRequest; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexApp.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexApp.java index 129e821272d..386e92259f2 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexApp.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexApp.java @@ -39,6 +39,8 @@ import org.openmetadata.schema.system.EventPublisherJob; import org.openmetadata.schema.system.IndexingError; import org.openmetadata.schema.system.Stats; import org.openmetadata.schema.system.StepStats; +import org.openmetadata.schema.utils.JsonUtils; +import org.openmetadata.search.IndexMapping; import org.openmetadata.service.Entity; import org.openmetadata.service.apps.AbstractNativeApplication; import org.openmetadata.service.exception.AppException; @@ -49,10 +51,8 @@ import org.openmetadata.service.jdbi3.EntityTimeSeriesRepository; import org.openmetadata.service.jdbi3.ListFilter; import org.openmetadata.service.search.SearchClusterMetrics; import org.openmetadata.service.search.SearchRepository; -import org.openmetadata.service.search.models.IndexMapping; import org.openmetadata.service.socket.WebSocketManager; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.RestUtil; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.workflows.interfaces.Source; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/scheduler/OmAppJobListener.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/scheduler/OmAppJobListener.java index 021e9ff5760..c70a87d79d4 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/scheduler/OmAppJobListener.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/scheduler/OmAppJobListener.java @@ -18,10 +18,10 @@ import org.openmetadata.schema.entity.applications.configuration.ApplicationConf import org.openmetadata.schema.system.Stats; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.apps.ApplicationHandler; import org.openmetadata.service.jdbi3.AppRepository; import org.openmetadata.service.socket.WebSocketManager; -import org.openmetadata.service.util.JsonUtils; import org.quartz.JobDataMap; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/clients/pipeline/airflow/AirflowRESTClient.java b/openmetadata-service/src/main/java/org/openmetadata/service/clients/pipeline/airflow/AirflowRESTClient.java index 0d71a9c3fce..c64f55849a6 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/clients/pipeline/airflow/AirflowRESTClient.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/clients/pipeline/airflow/AirflowRESTClient.java @@ -39,10 +39,10 @@ import org.openmetadata.schema.entity.automations.Workflow; import org.openmetadata.schema.entity.services.ingestionPipelines.IngestionPipeline; import org.openmetadata.schema.entity.services.ingestionPipelines.PipelineServiceClientResponse; import org.openmetadata.schema.entity.services.ingestionPipelines.PipelineStatus; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.sdk.exception.PipelineServiceClientException; import org.openmetadata.service.clients.pipeline.PipelineServiceClient; import org.openmetadata.service.exception.IngestionPipelineDeploymentException; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.SSLUtil; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/dataInsight/UnusedAssetsAggregator.java b/openmetadata-service/src/main/java/org/openmetadata/service/dataInsight/UnusedAssetsAggregator.java index e7d335d397a..234ac28577a 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/dataInsight/UnusedAssetsAggregator.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/dataInsight/UnusedAssetsAggregator.java @@ -8,7 +8,7 @@ import org.openmetadata.schema.analytics.RawCostAnalysisReportData; import org.openmetadata.schema.dataInsight.DataInsightChartResult; import org.openmetadata.schema.dataInsight.type.UnusedAssets; import org.openmetadata.schema.type.EntityReference; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; @Slf4j public abstract class UnusedAssetsAggregator, S, T> diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/events/ChangeEventHandler.java b/openmetadata-service/src/main/java/org/openmetadata/service/events/ChangeEventHandler.java index 2d1f11e74b8..0739cb2a93e 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/events/ChangeEventHandler.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/events/ChangeEventHandler.java @@ -23,9 +23,9 @@ import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.openmetadata.schema.type.ChangeEvent; import org.openmetadata.schema.type.EventType; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.OpenMetadataApplicationConfig; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.WebsocketNotificationHandler; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/events/scheduled/EventSubscriptionScheduler.java b/openmetadata-service/src/main/java/org/openmetadata/service/events/scheduled/EventSubscriptionScheduler.java index be703ce11d0..12eda70e27b 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/events/scheduled/EventSubscriptionScheduler.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/events/scheduled/EventSubscriptionScheduler.java @@ -40,6 +40,7 @@ import org.openmetadata.schema.entity.events.FailedEventResponse; import org.openmetadata.schema.entity.events.SubscriptionDestination; import org.openmetadata.schema.entity.events.SubscriptionStatus; import org.openmetadata.schema.type.ChangeEvent; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.sdk.PipelineServiceClientInterface; import org.openmetadata.service.Entity; import org.openmetadata.service.OpenMetadataApplicationConfig; @@ -51,7 +52,6 @@ import org.openmetadata.service.jdbi3.EntityRepository; import org.openmetadata.service.jdbi3.EventSubscriptionRepository; import org.openmetadata.service.resources.events.subscription.TypedEvent; import org.openmetadata.service.util.DIContainer; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.OpenMetadataConnectionBuilder; import org.quartz.Job; import org.quartz.JobBuilder; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/events/subscription/AlertUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/events/subscription/AlertUtil.java index 5983f989466..42882aa4167 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/events/subscription/AlertUtil.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/events/subscription/AlertUtil.java @@ -44,9 +44,9 @@ import org.openmetadata.schema.entity.events.SubscriptionStatus; import org.openmetadata.schema.entity.events.TestDestinationStatus; import org.openmetadata.schema.entity.feed.Thread; import org.openmetadata.schema.type.ChangeEvent; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.CatalogExceptionMessage; -import org.openmetadata.service.util.JsonUtils; import org.springframework.expression.Expression; import org.springframework.expression.spel.support.SimpleEvaluationContext; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/events/subscription/AlertsRuleEvaluator.java b/openmetadata-service/src/main/java/org/openmetadata/service/events/subscription/AlertsRuleEvaluator.java index 525275fe353..8679e535996 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/events/subscription/AlertsRuleEvaluator.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/events/subscription/AlertsRuleEvaluator.java @@ -38,10 +38,10 @@ import org.openmetadata.schema.type.FieldChange; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.Post; import org.openmetadata.schema.type.StatusType; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.formatter.util.FormatterUtil; import org.openmetadata.service.resources.feeds.MessageParser; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class AlertsRuleEvaluator { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/exception/CatalogExceptionMessage.java b/openmetadata-service/src/main/java/org/openmetadata/service/exception/CatalogExceptionMessage.java index e8e15342c48..a7a538f686c 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/exception/CatalogExceptionMessage.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/exception/CatalogExceptionMessage.java @@ -24,8 +24,8 @@ import org.openmetadata.schema.type.ChangeEvent; import org.openmetadata.schema.type.MetadataOperation; import org.openmetadata.schema.type.TagLabel; import org.openmetadata.schema.type.TaskType; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.resources.feeds.MessageParser.EntityLink; -import org.openmetadata.service.util.JsonUtils; public final class CatalogExceptionMessage { public static final String REINDEXING_ALREADY_RUNNING = "REINDEXING_ALREADY_RUNNING"; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/fernet/Fernet.java b/openmetadata-service/src/main/java/org/openmetadata/service/fernet/Fernet.java index ea0f46d9346..ad13fbfc8f5 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/fernet/Fernet.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/fernet/Fernet.java @@ -36,8 +36,8 @@ import lombok.NonNull; import org.openmetadata.schema.api.fernet.FernetConfiguration; import org.openmetadata.schema.entity.events.SubscriptionDestination; import org.openmetadata.schema.type.Webhook; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.OpenMetadataApplicationConfig; -import org.openmetadata.service.util.JsonUtils; public class Fernet { private static final Fernet instance = new Fernet(); diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/formatter/entity/IngestionPipelineFormatter.java b/openmetadata-service/src/main/java/org/openmetadata/service/formatter/entity/IngestionPipelineFormatter.java index 0cd63ae1907..c1b96937951 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/formatter/entity/IngestionPipelineFormatter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/formatter/entity/IngestionPipelineFormatter.java @@ -26,10 +26,10 @@ import org.openmetadata.schema.entity.services.ingestionPipelines.PipelineType; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.FieldChange; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.formatter.decorators.MessageDecorator; import org.openmetadata.service.formatter.util.FormatterUtil; -import org.openmetadata.service.util.JsonUtils; public class IngestionPipelineFormatter implements EntityFormatter { private static final String PIPELINE_STATUS_FIELD = "pipelineStatus"; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/formatter/entity/PipelineFormatter.java b/openmetadata-service/src/main/java/org/openmetadata/service/formatter/entity/PipelineFormatter.java index 7dd17916be6..e92f952e3a0 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/formatter/entity/PipelineFormatter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/formatter/entity/PipelineFormatter.java @@ -22,10 +22,10 @@ import org.openmetadata.schema.entity.data.PipelineStatus; import org.openmetadata.schema.entity.feed.Thread; import org.openmetadata.schema.type.FieldChange; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.formatter.decorators.MessageDecorator; import org.openmetadata.service.formatter.util.FormatterUtil; -import org.openmetadata.service.util.JsonUtils; public class PipelineFormatter implements EntityFormatter { private static final String PIPELINE_STATUS_FIELD = "pipelineStatus"; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/formatter/entity/QueryFormatter.java b/openmetadata-service/src/main/java/org/openmetadata/service/formatter/entity/QueryFormatter.java index 8592ab0872a..41b861195fc 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/formatter/entity/QueryFormatter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/formatter/entity/QueryFormatter.java @@ -22,10 +22,10 @@ import org.openmetadata.schema.entity.feed.Thread; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.FieldChange; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.formatter.decorators.MessageDecorator; import org.openmetadata.service.formatter.util.FormatterUtil; -import org.openmetadata.service.util.JsonUtils; public class QueryFormatter implements EntityFormatter { private static final String QUERY_USED_IN_FIELD = "queryUsedIn"; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/AssetsFieldFormatter.java b/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/AssetsFieldFormatter.java index 91b4171dd34..3b3da1dbfaa 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/AssetsFieldFormatter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/AssetsFieldFormatter.java @@ -7,8 +7,8 @@ import org.openmetadata.schema.entity.feed.FeedInfo; import org.openmetadata.schema.entity.feed.Thread; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.FieldChange; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.formatter.decorators.MessageDecorator; -import org.openmetadata.service.util.JsonUtils; public class AssetsFieldFormatter extends DefaultFieldFormatter { private static final String HEADER_MESSAGE = "%s %s the assets in %s %s"; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/DefaultFieldFormatter.java b/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/DefaultFieldFormatter.java index 694f116d64c..5e98e9f8c51 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/DefaultFieldFormatter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/DefaultFieldFormatter.java @@ -31,10 +31,10 @@ import org.apache.commons.lang.StringUtils; import org.openmetadata.schema.entity.feed.FeedInfo; import org.openmetadata.schema.entity.feed.Thread; import org.openmetadata.schema.type.FieldChange; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.formatter.decorators.MessageDecorator; import org.openmetadata.service.formatter.util.FormatterUtil; import org.openmetadata.service.resources.feeds.MessageParser; -import org.openmetadata.service.util.JsonUtils; public class DefaultFieldFormatter implements FieldFormatter { protected final Thread thread; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/DomainFormatter.java b/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/DomainFormatter.java index 3970fd7f602..6fc770bf4f4 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/DomainFormatter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/DomainFormatter.java @@ -7,9 +7,9 @@ import org.openmetadata.schema.entity.feed.FeedInfo; import org.openmetadata.schema.entity.feed.Thread; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.FieldChange; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.formatter.decorators.MessageDecorator; -import org.openmetadata.service.util.JsonUtils; public class DomainFormatter extends DefaultFieldFormatter { private static final String HEADER_MESSAGE = "%s %s asset %s in Domain %s"; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/OwnerFormatter.java b/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/OwnerFormatter.java index 6dc6a779068..82b0ccf333c 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/OwnerFormatter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/OwnerFormatter.java @@ -21,8 +21,8 @@ import org.openmetadata.schema.entity.feed.OwnerFeedInfo; import org.openmetadata.schema.entity.feed.Thread; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.FieldChange; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.formatter.decorators.MessageDecorator; -import org.openmetadata.service.util.JsonUtils; public class OwnerFormatter extends DefaultFieldFormatter { private static final String HEADER_MESSAGE = "%s %s the owner for %s %s"; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/TagFormatter.java b/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/TagFormatter.java index d4adc83cfcf..0ab3fb83105 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/TagFormatter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/TagFormatter.java @@ -21,8 +21,8 @@ import org.openmetadata.schema.entity.feed.TagFeedInfo; import org.openmetadata.schema.entity.feed.Thread; import org.openmetadata.schema.type.FieldChange; import org.openmetadata.schema.type.TagLabel; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.formatter.decorators.MessageDecorator; -import org.openmetadata.service.util.JsonUtils; public class TagFormatter extends DefaultFieldFormatter { private static final String HEADER_MESSAGE = "%s %s the tags for %s %s"; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/TestCaseResultFormatter.java b/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/TestCaseResultFormatter.java index 704c664ccd2..5852954f1b4 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/TestCaseResultFormatter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/TestCaseResultFormatter.java @@ -11,13 +11,13 @@ import org.openmetadata.schema.tests.type.TestCaseResult; import org.openmetadata.schema.tests.type.TestCaseStatus; import org.openmetadata.schema.type.FieldChange; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.formatter.decorators.EmailMessageDecorator; import org.openmetadata.service.formatter.decorators.FeedMessageDecorator; import org.openmetadata.service.formatter.decorators.MessageDecorator; import org.openmetadata.service.jdbi3.TestCaseResultRepository; import org.openmetadata.service.resources.feeds.MessageParser; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; public class TestCaseResultFormatter extends DefaultFieldFormatter { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/formatter/util/FormatterUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/formatter/util/FormatterUtil.java index b06fe98c13e..32967f0ae23 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/formatter/util/FormatterUtil.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/formatter/util/FormatterUtil.java @@ -42,13 +42,13 @@ import org.openmetadata.schema.type.ChangeEvent; import org.openmetadata.schema.type.EventType; import org.openmetadata.schema.type.FieldChange; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.formatter.decorators.MessageDecorator; import org.openmetadata.service.formatter.factory.ParserFactory; import org.openmetadata.service.formatter.field.DefaultFieldFormatter; import org.openmetadata.service.resources.feeds.MessageParser; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.RestUtil; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/CheckEntityAttributesTask.java b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/CheckEntityAttributesTask.java index 17ed9ea64fc..87c3a29f98c 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/CheckEntityAttributesTask.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/CheckEntityAttributesTask.java @@ -13,6 +13,7 @@ import org.flowable.bpmn.model.StartEvent; import org.flowable.bpmn.model.SubProcess; import org.openmetadata.schema.governance.workflows.WorkflowConfiguration; import org.openmetadata.schema.governance.workflows.elements.nodes.automatedTask.CheckEntityAttributesTaskDefinition; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.governance.workflows.elements.NodeInterface; import org.openmetadata.service.governance.workflows.elements.nodes.automatedTask.impl.CheckEntityAttributesImpl; import org.openmetadata.service.governance.workflows.flowable.builders.EndEventBuilder; @@ -20,7 +21,6 @@ import org.openmetadata.service.governance.workflows.flowable.builders.FieldExte import org.openmetadata.service.governance.workflows.flowable.builders.ServiceTaskBuilder; import org.openmetadata.service.governance.workflows.flowable.builders.StartEventBuilder; import org.openmetadata.service.governance.workflows.flowable.builders.SubProcessBuilder; -import org.openmetadata.service.util.JsonUtils; public class CheckEntityAttributesTask implements NodeInterface { private final SubProcess subProcess; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/SetEntityCertificationTask.java b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/SetEntityCertificationTask.java index d75b8687b19..c5a53a943e9 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/SetEntityCertificationTask.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/SetEntityCertificationTask.java @@ -15,6 +15,7 @@ import org.flowable.bpmn.model.SubProcess; import org.openmetadata.schema.governance.workflows.WorkflowConfiguration; import org.openmetadata.schema.governance.workflows.elements.nodes.automatedTask.CertificationConfiguration; import org.openmetadata.schema.governance.workflows.elements.nodes.automatedTask.SetEntityCertificationTaskDefinition; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.governance.workflows.elements.NodeInterface; import org.openmetadata.service.governance.workflows.elements.nodes.automatedTask.impl.SetEntityCertificationImpl; import org.openmetadata.service.governance.workflows.flowable.builders.EndEventBuilder; @@ -22,7 +23,6 @@ import org.openmetadata.service.governance.workflows.flowable.builders.FieldExte import org.openmetadata.service.governance.workflows.flowable.builders.ServiceTaskBuilder; import org.openmetadata.service.governance.workflows.flowable.builders.StartEventBuilder; import org.openmetadata.service.governance.workflows.flowable.builders.SubProcessBuilder; -import org.openmetadata.service.util.JsonUtils; public class SetEntityCertificationTask implements NodeInterface { private final SubProcess subProcess; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/SetGlossaryTermStatusTask.java b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/SetGlossaryTermStatusTask.java index 33515f16e52..cd5543a2a16 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/SetGlossaryTermStatusTask.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/SetGlossaryTermStatusTask.java @@ -13,6 +13,7 @@ import org.flowable.bpmn.model.StartEvent; import org.flowable.bpmn.model.SubProcess; import org.openmetadata.schema.governance.workflows.WorkflowConfiguration; import org.openmetadata.schema.governance.workflows.elements.nodes.automatedTask.SetGlossaryTermStatusTaskDefinition; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.governance.workflows.elements.NodeInterface; import org.openmetadata.service.governance.workflows.elements.nodes.automatedTask.impl.SetGlossaryTermStatusImpl; import org.openmetadata.service.governance.workflows.flowable.builders.EndEventBuilder; @@ -20,7 +21,6 @@ import org.openmetadata.service.governance.workflows.flowable.builders.FieldExte import org.openmetadata.service.governance.workflows.flowable.builders.ServiceTaskBuilder; import org.openmetadata.service.governance.workflows.flowable.builders.StartEventBuilder; import org.openmetadata.service.governance.workflows.flowable.builders.SubProcessBuilder; -import org.openmetadata.service.util.JsonUtils; public class SetGlossaryTermStatusTask implements NodeInterface { private final SubProcess subProcess; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/createAndRunIngestionPipeline/CreateAndRunIngestionPipelineTask.java b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/createAndRunIngestionPipeline/CreateAndRunIngestionPipelineTask.java index 848cdaad49a..b86e01036b5 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/createAndRunIngestionPipeline/CreateAndRunIngestionPipelineTask.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/createAndRunIngestionPipeline/CreateAndRunIngestionPipelineTask.java @@ -16,13 +16,13 @@ import org.flowable.bpmn.model.SubProcess; import org.openmetadata.schema.entity.services.ingestionPipelines.PipelineType; import org.openmetadata.schema.governance.workflows.WorkflowConfiguration; import org.openmetadata.schema.governance.workflows.elements.nodes.automatedTask.CreateAndRunIngestionPipelineTaskDefinition; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.governance.workflows.elements.NodeInterface; import org.openmetadata.service.governance.workflows.flowable.builders.EndEventBuilder; import org.openmetadata.service.governance.workflows.flowable.builders.FieldExtensionBuilder; import org.openmetadata.service.governance.workflows.flowable.builders.ServiceTaskBuilder; import org.openmetadata.service.governance.workflows.flowable.builders.StartEventBuilder; import org.openmetadata.service.governance.workflows.flowable.builders.SubProcessBuilder; -import org.openmetadata.service.util.JsonUtils; public class CreateAndRunIngestionPipelineTask implements NodeInterface { private final SubProcess subProcess; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/createAndRunIngestionPipeline/CreateIngestionPipelineDelegate.java b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/createAndRunIngestionPipeline/CreateIngestionPipelineDelegate.java index 4170af2f63b..421843d9d2a 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/createAndRunIngestionPipeline/CreateIngestionPipelineDelegate.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/createAndRunIngestionPipeline/CreateIngestionPipelineDelegate.java @@ -18,12 +18,12 @@ import org.flowable.engine.delegate.JavaDelegate; import org.openmetadata.schema.ServiceEntityInterface; import org.openmetadata.schema.entity.services.ingestionPipelines.PipelineType; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.sdk.PipelineServiceClientInterface; import org.openmetadata.service.Entity; import org.openmetadata.service.governance.workflows.WorkflowVariableHandler; import org.openmetadata.service.resources.feeds.MessageParser; import org.openmetadata.service.resources.services.ingestionpipelines.IngestionPipelineMapper; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class CreateIngestionPipelineDelegate implements JavaDelegate { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/createAndRunIngestionPipeline/CreateIngestionPipelineImpl.java b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/createAndRunIngestionPipeline/CreateIngestionPipelineImpl.java index 368182e587c..88b7d0805c9 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/createAndRunIngestionPipeline/CreateIngestionPipelineImpl.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/createAndRunIngestionPipeline/CreateIngestionPipelineImpl.java @@ -44,11 +44,11 @@ import org.openmetadata.schema.metadataIngestion.SourceConfig; import org.openmetadata.schema.metadataIngestion.StorageServiceMetadataPipeline; import org.openmetadata.schema.services.connections.metadata.OpenMetadataConnection; import org.openmetadata.schema.type.ProviderType; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.sdk.PipelineServiceClientInterface; import org.openmetadata.service.Entity; import org.openmetadata.service.jdbi3.IngestionPipelineRepository; import org.openmetadata.service.resources.services.ingestionpipelines.IngestionPipelineMapper; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.OpenMetadataConnectionBuilder; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/createAndRunIngestionPipeline/RunIngestionPipelineDelegate.java b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/createAndRunIngestionPipeline/RunIngestionPipelineDelegate.java index 5812ec907a0..02dc635cfb0 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/createAndRunIngestionPipeline/RunIngestionPipelineDelegate.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/createAndRunIngestionPipeline/RunIngestionPipelineDelegate.java @@ -15,9 +15,9 @@ import org.flowable.common.engine.api.delegate.Expression; import org.flowable.engine.delegate.BpmnError; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.JavaDelegate; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.sdk.PipelineServiceClientInterface; import org.openmetadata.service.governance.workflows.WorkflowVariableHandler; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class RunIngestionPipelineDelegate implements JavaDelegate { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/impl/CheckEntityAttributesImpl.java b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/impl/CheckEntityAttributesImpl.java index 9467b6b40c7..22d6ba41422 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/impl/CheckEntityAttributesImpl.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/impl/CheckEntityAttributesImpl.java @@ -17,10 +17,10 @@ import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.JavaDelegate; import org.openmetadata.schema.EntityInterface; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.governance.workflows.WorkflowVariableHandler; import org.openmetadata.service.resources.feeds.MessageParser; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class CheckEntityAttributesImpl implements JavaDelegate { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/impl/SetEntityCertificationImpl.java b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/impl/SetEntityCertificationImpl.java index 87ddeb750d9..dd912df1492 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/impl/SetEntityCertificationImpl.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/impl/SetEntityCertificationImpl.java @@ -19,11 +19,11 @@ import org.openmetadata.schema.EntityInterface; import org.openmetadata.schema.type.AssetCertification; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.TagLabel; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.governance.workflows.WorkflowVariableHandler; import org.openmetadata.service.jdbi3.EntityRepository; import org.openmetadata.service.resources.feeds.MessageParser; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class SetEntityCertificationImpl implements JavaDelegate { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/impl/SetGlossaryTermStatusImpl.java b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/impl/SetGlossaryTermStatusImpl.java index 198ae890134..41e0d5a052f 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/impl/SetGlossaryTermStatusImpl.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/impl/SetGlossaryTermStatusImpl.java @@ -18,11 +18,11 @@ import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.JavaDelegate; import org.openmetadata.schema.entity.data.GlossaryTerm; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.governance.workflows.WorkflowVariableHandler; import org.openmetadata.service.jdbi3.GlossaryTermRepository; import org.openmetadata.service.resources.feeds.MessageParser; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class SetGlossaryTermStatusImpl implements JavaDelegate { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/runApp/RunAppDelegate.java b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/runApp/RunAppDelegate.java index 2ba4bbb4546..faee109fabd 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/runApp/RunAppDelegate.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/runApp/RunAppDelegate.java @@ -13,10 +13,10 @@ import org.flowable.common.engine.api.delegate.Expression; import org.flowable.engine.delegate.BpmnError; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.JavaDelegate; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.sdk.PipelineServiceClientInterface; import org.openmetadata.service.governance.workflows.WorkflowVariableHandler; import org.openmetadata.service.resources.feeds.MessageParser; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class RunAppDelegate implements JavaDelegate { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/runApp/RunAppImpl.java b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/runApp/RunAppImpl.java index b5213e0d6b1..aeb68e9c0eb 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/runApp/RunAppImpl.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/runApp/RunAppImpl.java @@ -28,6 +28,7 @@ import org.openmetadata.schema.entity.services.ingestionPipelines.PipelineStatus import org.openmetadata.schema.entity.services.ingestionPipelines.PipelineStatusType; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.sdk.PipelineServiceClientInterface; import org.openmetadata.service.Entity; import org.openmetadata.service.OpenMetadataApplicationConfig; @@ -38,7 +39,6 @@ import org.openmetadata.service.jdbi3.AppRepository; import org.openmetadata.service.jdbi3.IngestionPipelineRepository; import org.openmetadata.service.resources.feeds.MessageParser; import org.openmetadata.service.util.EntityUtil; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.OpenMetadataConnectionBuilder; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/runApp/RunAppTask.java b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/runApp/RunAppTask.java index 0a740ebba06..60dd5154465 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/runApp/RunAppTask.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/runApp/RunAppTask.java @@ -13,13 +13,13 @@ import org.flowable.bpmn.model.StartEvent; import org.flowable.bpmn.model.SubProcess; import org.openmetadata.schema.governance.workflows.WorkflowConfiguration; import org.openmetadata.schema.governance.workflows.elements.nodes.automatedTask.RunAppTaskDefinition; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.governance.workflows.elements.NodeInterface; import org.openmetadata.service.governance.workflows.flowable.builders.EndEventBuilder; import org.openmetadata.service.governance.workflows.flowable.builders.FieldExtensionBuilder; import org.openmetadata.service.governance.workflows.flowable.builders.ServiceTaskBuilder; import org.openmetadata.service.governance.workflows.flowable.builders.StartEventBuilder; import org.openmetadata.service.governance.workflows.flowable.builders.SubProcessBuilder; -import org.openmetadata.service.util.JsonUtils; public class RunAppTask implements NodeInterface { private final SubProcess subProcess; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/userTask/UserApprovalTask.java b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/userTask/UserApprovalTask.java index b4e083d2c48..642d4350702 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/userTask/UserApprovalTask.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/userTask/UserApprovalTask.java @@ -20,6 +20,7 @@ import org.flowable.bpmn.model.TerminateEventDefinition; import org.flowable.bpmn.model.UserTask; import org.openmetadata.schema.governance.workflows.WorkflowConfiguration; import org.openmetadata.schema.governance.workflows.elements.nodes.userTask.UserApprovalTaskDefinition; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.governance.workflows.elements.NodeInterface; import org.openmetadata.service.governance.workflows.elements.nodes.userTask.impl.CreateApprovalTaskImpl; import org.openmetadata.service.governance.workflows.elements.nodes.userTask.impl.SetApprovalAssigneesImpl; @@ -31,7 +32,6 @@ import org.openmetadata.service.governance.workflows.flowable.builders.ServiceTa import org.openmetadata.service.governance.workflows.flowable.builders.StartEventBuilder; import org.openmetadata.service.governance.workflows.flowable.builders.SubProcessBuilder; import org.openmetadata.service.governance.workflows.flowable.builders.UserTaskBuilder; -import org.openmetadata.service.util.JsonUtils; public class UserApprovalTask implements NodeInterface { private final SubProcess subProcess; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/userTask/impl/CreateApprovalTaskImpl.java b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/userTask/impl/CreateApprovalTaskImpl.java index 23ee3c86e68..0ed1f480951 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/userTask/impl/CreateApprovalTaskImpl.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/userTask/impl/CreateApprovalTaskImpl.java @@ -25,6 +25,7 @@ import org.openmetadata.schema.type.TaskDetails; import org.openmetadata.schema.type.TaskStatus; import org.openmetadata.schema.type.TaskType; import org.openmetadata.schema.type.ThreadType; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.EntityNotFoundException; import org.openmetadata.service.governance.workflows.WorkflowHandler; @@ -32,7 +33,6 @@ import org.openmetadata.service.governance.workflows.WorkflowVariableHandler; import org.openmetadata.service.jdbi3.FeedRepository; import org.openmetadata.service.resources.feeds.FeedMapper; import org.openmetadata.service.resources.feeds.MessageParser; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.WebsocketNotificationHandler; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/userTask/impl/SetApprovalAssigneesImpl.java b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/userTask/impl/SetApprovalAssigneesImpl.java index 014027b6a6d..f7ef2664805 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/userTask/impl/SetApprovalAssigneesImpl.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/userTask/impl/SetApprovalAssigneesImpl.java @@ -18,10 +18,10 @@ import org.flowable.engine.delegate.JavaDelegate; import org.openmetadata.schema.EntityInterface; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.governance.workflows.WorkflowVariableHandler; import org.openmetadata.service.resources.feeds.MessageParser; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class SetApprovalAssigneesImpl implements JavaDelegate { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/userTask/impl/SetCandidateUsersImpl.java b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/userTask/impl/SetCandidateUsersImpl.java index e754ad0d345..deef8337129 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/userTask/impl/SetCandidateUsersImpl.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/userTask/impl/SetCandidateUsersImpl.java @@ -11,8 +11,8 @@ import org.flowable.common.engine.api.delegate.Expression; import org.flowable.engine.delegate.BpmnError; import org.flowable.engine.delegate.TaskListener; import org.flowable.task.service.delegate.DelegateTask; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.governance.workflows.WorkflowVariableHandler; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class SetCandidateUsersImpl implements TaskListener { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/triggers/EventBasedEntityTrigger.java b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/triggers/EventBasedEntityTrigger.java index ecab328d516..a45e9dbf85b 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/triggers/EventBasedEntityTrigger.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/triggers/EventBasedEntityTrigger.java @@ -27,6 +27,7 @@ import org.flowable.bpmn.model.SignalEventDefinition; import org.flowable.bpmn.model.StartEvent; import org.openmetadata.schema.governance.workflows.elements.triggers.Event; import org.openmetadata.schema.governance.workflows.elements.triggers.EventBasedEntityTriggerDefinition; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.governance.workflows.elements.TriggerInterface; import org.openmetadata.service.governance.workflows.elements.triggers.impl.FilterEntityImpl; import org.openmetadata.service.governance.workflows.flowable.builders.CallActivityBuilder; @@ -35,7 +36,6 @@ import org.openmetadata.service.governance.workflows.flowable.builders.FieldExte import org.openmetadata.service.governance.workflows.flowable.builders.ServiceTaskBuilder; import org.openmetadata.service.governance.workflows.flowable.builders.SignalBuilder; import org.openmetadata.service.governance.workflows.flowable.builders.StartEventBuilder; -import org.openmetadata.service.util.JsonUtils; public class EventBasedEntityTrigger implements TriggerInterface { private final Process process; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/triggers/impl/FetchEntitiesImpl.java b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/triggers/impl/FetchEntitiesImpl.java index a6d27442752..c673e3fa9a7 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/triggers/impl/FetchEntitiesImpl.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/triggers/impl/FetchEntitiesImpl.java @@ -10,12 +10,12 @@ import java.util.Optional; import org.flowable.common.engine.api.delegate.Expression; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.JavaDelegate; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.feeds.MessageParser; import org.openmetadata.service.search.SearchRepository; import org.openmetadata.service.search.SearchResultListMapper; import org.openmetadata.service.search.SearchSortFilter; -import org.openmetadata.service.util.JsonUtils; public class FetchEntitiesImpl implements JavaDelegate { private Expression entityTypeExpr; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/triggers/impl/FilterEntityImpl.java b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/triggers/impl/FilterEntityImpl.java index 834e9462e0b..02e94d0d5e9 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/triggers/impl/FilterEntityImpl.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/triggers/impl/FilterEntityImpl.java @@ -13,10 +13,10 @@ import org.openmetadata.schema.EntityInterface; import org.openmetadata.schema.type.ChangeDescription; import org.openmetadata.schema.type.FieldChange; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.governance.workflows.WorkflowVariableHandler; import org.openmetadata.service.resources.feeds.MessageParser; -import org.openmetadata.service.util.JsonUtils; public class FilterEntityImpl implements JavaDelegate { private Expression excludedFilterExpr; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/flowable/BaseDelegate.java b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/flowable/BaseDelegate.java index 01fea92c5e4..031d32049a5 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/flowable/BaseDelegate.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/flowable/BaseDelegate.java @@ -10,8 +10,8 @@ import org.flowable.common.engine.api.delegate.Expression; import org.flowable.engine.delegate.BpmnError; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.JavaDelegate; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.governance.workflows.WorkflowVariableHandler; -import org.openmetadata.service.util.JsonUtils; @Slf4j public abstract class BaseDelegate implements JavaDelegate { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/flowable/MainWorkflow.java b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/flowable/MainWorkflow.java index 6ac8af43dfb..8c06381798d 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/flowable/MainWorkflow.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/flowable/MainWorkflow.java @@ -16,11 +16,11 @@ import org.flowable.bpmn.model.SequenceFlow; import org.openmetadata.schema.governance.workflows.WorkflowDefinition; import org.openmetadata.schema.governance.workflows.elements.EdgeDefinition; import org.openmetadata.schema.governance.workflows.elements.WorkflowNodeDefinitionInterface; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.governance.workflows.elements.Edge; import org.openmetadata.service.governance.workflows.elements.NodeFactory; import org.openmetadata.service.governance.workflows.elements.NodeInterface; import org.openmetadata.service.governance.workflows.elements.nodes.endEvent.EndEvent; -import org.openmetadata.service.util.JsonUtils; @Getter public class MainWorkflow { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/APIEndpointRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/APIEndpointRepository.java index 96e55ac72ff..089a28a685a 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/APIEndpointRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/APIEndpointRepository.java @@ -42,6 +42,7 @@ import org.openmetadata.schema.type.Relationship; import org.openmetadata.schema.type.TagLabel; import org.openmetadata.schema.type.TaskType; import org.openmetadata.schema.type.change.ChangeSource; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.jdbi3.FeedRepository.TaskWorkflow; @@ -51,7 +52,6 @@ import org.openmetadata.service.resources.feeds.MessageParser.EntityLink; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.EntityUtil.Fields; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; public class APIEndpointRepository extends EntityRepository { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/AppRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/AppRepository.java index c636a869133..dc26442dd9c 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/AppRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/AppRepository.java @@ -23,13 +23,13 @@ import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.ProviderType; import org.openmetadata.schema.type.Relationship; import org.openmetadata.schema.type.change.ChangeSource; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.AppException; import org.openmetadata.service.exception.EntityNotFoundException; import org.openmetadata.service.resources.apps.AppResource; import org.openmetadata.service.security.jwt.JWTTokenGenerator; import org.openmetadata.service.util.EntityUtil; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ChangeEventRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ChangeEventRepository.java index e16aa4382b9..ab0bf73282e 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ChangeEventRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ChangeEventRepository.java @@ -23,8 +23,8 @@ import java.util.ArrayList; import java.util.List; import org.jdbi.v3.sqlobject.transaction.Transaction; import org.openmetadata.schema.type.ChangeEvent; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; -import org.openmetadata.service.util.JsonUtils; @Repository public class ChangeEventRepository { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ChangeSummarizer.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ChangeSummarizer.java index f4e720a1db8..994fc3864c1 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ChangeSummarizer.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ChangeSummarizer.java @@ -13,9 +13,9 @@ import org.openmetadata.schema.EntityInterface; import org.openmetadata.schema.type.FieldChange; import org.openmetadata.schema.type.change.ChangeSource; import org.openmetadata.schema.type.change.ChangeSummary; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.exception.UnhandledServerException; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class ChangeSummarizer { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ClassificationRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ClassificationRepository.java index 2cc82fc25cc..6dfff8514e3 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ClassificationRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ClassificationRepository.java @@ -35,12 +35,12 @@ import org.openmetadata.schema.type.Relationship; import org.openmetadata.schema.type.TagLabel; import org.openmetadata.schema.type.TagLabel.TagSource; import org.openmetadata.schema.type.change.ChangeSource; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.jdbi3.CollectionDAO.EntityRelationshipRecord; import org.openmetadata.service.resources.tags.ClassificationResource; import org.openmetadata.service.util.EntityUtil.Fields; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class ClassificationRepository extends EntityRepository { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/CollectionDAO.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/CollectionDAO.java index 546f628dd7d..838bed856ed 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/CollectionDAO.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/CollectionDAO.java @@ -143,6 +143,7 @@ import org.openmetadata.schema.type.UsageStats; import org.openmetadata.schema.util.EntitiesCount; import org.openmetadata.schema.util.ServicesCount; import org.openmetadata.schema.utils.EntityInterfaceUtil; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.jdbi3.CollectionDAO.TagUsageDAO.TagLabelMapper; import org.openmetadata.service.jdbi3.CollectionDAO.UsageDAO.UsageDetailsMapper; @@ -155,7 +156,6 @@ import org.openmetadata.service.resources.feeds.MessageParser.EntityLink; import org.openmetadata.service.resources.tags.TagLabelUtil; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.jdbi.BindConcat; import org.openmetadata.service.util.jdbi.BindFQN; import org.openmetadata.service.util.jdbi.BindJsonContains; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ColumnRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ColumnRepository.java index f9bd5c34a72..e7eabe5cf1b 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ColumnRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ColumnRepository.java @@ -28,6 +28,7 @@ import org.openmetadata.schema.entity.data.Table; import org.openmetadata.schema.type.Column; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.EntityNotFoundException; import org.openmetadata.service.security.Authorizer; @@ -35,7 +36,6 @@ import org.openmetadata.service.security.policyevaluator.OperationContext; import org.openmetadata.service.security.policyevaluator.ResourceContext; import org.openmetadata.service.security.policyevaluator.ResourceContextInterface; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class ColumnRepository { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ContainerRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ContainerRepository.java index 67d9268c1a4..03ab1645cd6 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ContainerRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ContainerRepository.java @@ -27,6 +27,7 @@ import org.openmetadata.schema.type.Relationship; import org.openmetadata.schema.type.TagLabel; import org.openmetadata.schema.type.TaskType; import org.openmetadata.schema.type.change.ChangeSource; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.jdbi3.FeedRepository.TaskWorkflow; import org.openmetadata.service.jdbi3.FeedRepository.ThreadContext; @@ -34,7 +35,6 @@ import org.openmetadata.service.resources.feeds.MessageParser.EntityLink; import org.openmetadata.service.resources.storages.ContainerResource; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; public class ContainerRepository extends EntityRepository { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DashboardDataModelRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DashboardDataModelRepository.java index e8fd5bf788c..b79acf2afe2 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DashboardDataModelRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DashboardDataModelRepository.java @@ -35,6 +35,7 @@ import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.TagLabel; import org.openmetadata.schema.type.TaskType; import org.openmetadata.schema.type.change.ChangeSource; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.jdbi3.FeedRepository.TaskWorkflow; import org.openmetadata.service.jdbi3.FeedRepository.ThreadContext; @@ -44,7 +45,6 @@ import org.openmetadata.service.resources.feeds.MessageParser.EntityLink; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.EntityUtil.Fields; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DataProductRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DataProductRepository.java index a63e23afa50..b48670b08f7 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DataProductRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DataProductRepository.java @@ -41,11 +41,11 @@ import org.openmetadata.schema.type.api.BulkAssets; import org.openmetadata.schema.type.api.BulkOperationResult; import org.openmetadata.schema.type.api.BulkResponse; import org.openmetadata.schema.type.change.ChangeSource; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.domains.DataProductResource; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.EntityUtil.Fields; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.LineageUtil; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DatabaseRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DatabaseRepository.java index 7629369f84f..69932c4a699 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DatabaseRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DatabaseRepository.java @@ -55,13 +55,13 @@ import org.openmetadata.schema.type.csv.CsvDocumentation; import org.openmetadata.schema.type.csv.CsvFile; import org.openmetadata.schema.type.csv.CsvHeader; import org.openmetadata.schema.type.csv.CsvImportResult; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.EntityNotFoundException; import org.openmetadata.service.resources.databases.DatabaseResource; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.EntityUtil.Fields; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class DatabaseRepository extends EntityRepository { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DatabaseSchemaRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DatabaseSchemaRepository.java index deebf465311..0646a35d692 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DatabaseSchemaRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DatabaseSchemaRepository.java @@ -55,13 +55,13 @@ import org.openmetadata.schema.type.csv.CsvDocumentation; import org.openmetadata.schema.type.csv.CsvFile; import org.openmetadata.schema.type.csv.CsvHeader; import org.openmetadata.schema.type.csv.CsvImportResult; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.EntityNotFoundException; import org.openmetadata.service.resources.databases.DatabaseSchemaResource; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.EntityUtil.Fields; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class DatabaseSchemaRepository extends EntityRepository { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DocumentRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DocumentRepository.java index 83b6c3d6aee..66d8fae198c 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DocumentRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DocumentRepository.java @@ -27,12 +27,12 @@ import org.openmetadata.schema.entities.docStore.Data; import org.openmetadata.schema.entities.docStore.Document; import org.openmetadata.schema.settings.SettingsType; import org.openmetadata.schema.type.change.ChangeSource; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.EntityNotFoundException; import org.openmetadata.service.resources.docstore.DocStoreResource; import org.openmetadata.service.resources.settings.SettingsCache; import org.openmetadata.service.util.EntityUtil.Fields; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.email.DefaultTemplateProvider; import org.openmetadata.service.util.email.TemplateProvider; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DomainRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DomainRepository.java index feef0be59b7..bd85453c31e 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DomainRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DomainRepository.java @@ -40,12 +40,12 @@ import org.openmetadata.schema.type.api.BulkAssets; import org.openmetadata.schema.type.api.BulkOperationResult; import org.openmetadata.schema.type.api.BulkResponse; import org.openmetadata.schema.type.change.ChangeSource; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.domains.DomainResource; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.EntityUtil.Fields; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.LineageUtil; import org.openmetadata.service.util.ResultList; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityDAO.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityDAO.java index 16a0771d59c..db04bc5d32f 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityDAO.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityDAO.java @@ -39,6 +39,7 @@ import org.jdbi.v3.sqlobject.statement.SqlUpdate; import org.jdbi.v3.sqlobject.transaction.Transaction; import org.openmetadata.schema.EntityInterface; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.exception.EntityNotFoundException; @@ -46,7 +47,6 @@ import org.openmetadata.service.jdbi3.locator.ConnectionAwareSqlBatch; import org.openmetadata.service.jdbi3.locator.ConnectionAwareSqlQuery; import org.openmetadata.service.jdbi3.locator.ConnectionAwareSqlUpdate; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.jdbi.BindFQN; import org.openmetadata.service.util.jdbi.BindUUID; import org.openmetadata.service.workflows.searchIndex.ReindexingUtil; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java index ec86cede2a8..cedc921200f 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java @@ -175,6 +175,7 @@ import org.openmetadata.schema.type.change.ChangeSummary; import org.openmetadata.schema.type.csv.CsvImportResult; import org.openmetadata.schema.type.customProperties.EnumConfig; import org.openmetadata.schema.type.customProperties.TableConfig; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.OpenMetadataApplicationConfig; import org.openmetadata.service.TypeRegistry; @@ -197,7 +198,6 @@ import org.openmetadata.service.search.SearchSortFilter; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.EntityUtil.Fields; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ListWithOffsetFunction; import org.openmetadata.service.util.RestUtil; import org.openmetadata.service.util.RestUtil.DeleteResponse; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityTimeSeriesDAO.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityTimeSeriesDAO.java index 88428799537..cab0bc8adae 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityTimeSeriesDAO.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityTimeSeriesDAO.java @@ -17,9 +17,9 @@ import org.jdbi.v3.sqlobject.customizer.Define; import org.jdbi.v3.sqlobject.statement.SqlQuery; import org.jdbi.v3.sqlobject.statement.SqlUpdate; import org.openmetadata.schema.analytics.ReportData; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.jdbi3.locator.ConnectionAwareSqlQuery; import org.openmetadata.service.jdbi3.locator.ConnectionAwareSqlUpdate; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.jdbi.BindFQN; public interface EntityTimeSeriesDAO { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityTimeSeriesRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityTimeSeriesRepository.java index f2e9516df4f..acdde6e2248 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityTimeSeriesRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityTimeSeriesRepository.java @@ -27,6 +27,7 @@ import org.openmetadata.schema.EntityTimeSeriesInterface; import org.openmetadata.schema.system.EntityError; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.Relationship; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.EntityNotFoundException; import org.openmetadata.service.search.SearchAggregation; @@ -36,7 +37,6 @@ import org.openmetadata.service.search.SearchRepository; import org.openmetadata.service.search.SearchResultListMapper; import org.openmetadata.service.search.SearchSortFilter; import org.openmetadata.service.util.EntityUtil; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.RestUtil; import org.openmetadata.service.util.ResultList; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EventSubscriptionRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EventSubscriptionRepository.java index 99ae38f89e8..e8e4fcc5106 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EventSubscriptionRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EventSubscriptionRepository.java @@ -32,12 +32,12 @@ import org.openmetadata.schema.entity.events.EventSubscription; import org.openmetadata.schema.entity.events.EventSubscriptionOffset; import org.openmetadata.schema.entity.events.SubscriptionDestination; import org.openmetadata.schema.type.change.ChangeSource; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.events.scheduled.EventSubscriptionScheduler; import org.openmetadata.service.events.subscription.AlertUtil; import org.openmetadata.service.resources.events.subscription.EventSubscriptionResource; import org.openmetadata.service.util.EntityUtil.Fields; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class EventSubscriptionRepository extends EntityRepository { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/FeedRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/FeedRepository.java index a5770ad6261..4b3aca92cd8 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/FeedRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/FeedRepository.java @@ -80,6 +80,7 @@ import org.openmetadata.schema.type.TaskStatus; import org.openmetadata.schema.type.TaskType; import org.openmetadata.schema.type.ThreadType; import org.openmetadata.schema.utils.EntityInterfaceUtil; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.ResourceRegistry; import org.openmetadata.service.exception.CatalogExceptionMessage; @@ -97,7 +98,6 @@ import org.openmetadata.service.security.policyevaluator.OperationContext; import org.openmetadata.service.security.policyevaluator.ResourceContext; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.RestUtil.DeleteResponse; import org.openmetadata.service.util.RestUtil.PatchResponse; import org.openmetadata.service.util.ResultList; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/GlossaryRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/GlossaryRepository.java index c45a13508d8..25ce9945e9f 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/GlossaryRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/GlossaryRepository.java @@ -65,6 +65,7 @@ import org.openmetadata.schema.type.csv.CsvDocumentation; import org.openmetadata.schema.type.csv.CsvFile; import org.openmetadata.schema.type.csv.CsvHeader; import org.openmetadata.schema.type.csv.CsvImportResult; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.jdbi3.CollectionDAO.EntityRelationshipRecord; @@ -72,7 +73,6 @@ import org.openmetadata.service.resources.feeds.MessageParser; import org.openmetadata.service.resources.glossary.GlossaryResource; import org.openmetadata.service.util.EntityUtil.Fields; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class GlossaryRepository extends EntityRepository { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/GlossaryTermRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/GlossaryTermRepository.java index e30c2264a4c..39b63e3e196 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/GlossaryTermRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/GlossaryTermRepository.java @@ -86,6 +86,7 @@ import org.openmetadata.schema.type.TaskType; import org.openmetadata.schema.type.api.BulkOperationResult; import org.openmetadata.schema.type.api.BulkResponse; import org.openmetadata.schema.type.change.ChangeSource; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.exception.EntityNotFoundException; @@ -100,7 +101,6 @@ import org.openmetadata.service.security.AuthorizationException; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.EntityUtil.Fields; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.RestUtil; import org.openmetadata.service.util.WebsocketNotificationHandler; import org.openmetadata.service.workflows.searchIndex.ReindexingUtil; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/IngestionPipelineRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/IngestionPipelineRepository.java index 5cacffbcd8c..f37990b4fa1 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/IngestionPipelineRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/IngestionPipelineRepository.java @@ -43,6 +43,7 @@ import org.openmetadata.schema.type.FieldChange; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.Relationship; import org.openmetadata.schema.type.change.ChangeSource; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.sdk.PipelineServiceClientInterface; import org.openmetadata.service.Entity; import org.openmetadata.service.OpenMetadataApplicationConfig; @@ -52,7 +53,6 @@ import org.openmetadata.service.secrets.SecretsManagerFactory; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.EntityUtil.Fields; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.RestUtil; import org.openmetadata.service.util.ResultList; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/LineageRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/LineageRepository.java index 43fb33e03a9..974f9348ecd 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/LineageRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/LineageRepository.java @@ -90,15 +90,15 @@ import org.openmetadata.schema.type.Relationship; import org.openmetadata.schema.type.csv.CsvDocumentation; import org.openmetadata.schema.type.csv.CsvFile; import org.openmetadata.schema.type.csv.CsvHeader; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.sdk.exception.CSVExportException; +import org.openmetadata.search.IndexMapping; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.exception.EntityNotFoundException; import org.openmetadata.service.jdbi3.CollectionDAO.EntityRelationshipRecord; import org.openmetadata.service.search.SearchClient; -import org.openmetadata.service.search.models.IndexMapping; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.RestUtil; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/MlModelRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/MlModelRepository.java index aa4c00c5dc1..81e3480abe4 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/MlModelRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/MlModelRepository.java @@ -40,6 +40,7 @@ import org.openmetadata.schema.type.Relationship; import org.openmetadata.schema.type.TagLabel; import org.openmetadata.schema.type.TaskType; import org.openmetadata.schema.type.change.ChangeSource; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.jdbi3.FeedRepository.TaskWorkflow; @@ -49,7 +50,6 @@ import org.openmetadata.service.resources.mlmodels.MlModelResource; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.EntityUtil.Fields; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class MlModelRepository extends EntityRepository { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/PipelineRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/PipelineRepository.java index 9730dc4757e..27feeec4d3d 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/PipelineRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/PipelineRepository.java @@ -48,6 +48,7 @@ import org.openmetadata.schema.type.TagLabel; import org.openmetadata.schema.type.Task; import org.openmetadata.schema.type.TaskType; import org.openmetadata.schema.type.change.ChangeSource; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.exception.EntityNotFoundException; @@ -58,7 +59,6 @@ import org.openmetadata.service.resources.pipelines.PipelineResource; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.EntityUtil.Fields; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.RestUtil; import org.openmetadata.service.util.ResultList; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/QueryRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/QueryRepository.java index 043c2a2d746..e8ba40a78a4 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/QueryRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/QueryRepository.java @@ -21,11 +21,11 @@ import org.openmetadata.schema.type.FieldChange; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.Relationship; import org.openmetadata.schema.type.change.ChangeSource; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.query.QueryResource; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.RestUtil; public class QueryRepository extends EntityRepository { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ReportDataRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ReportDataRepository.java index 64dad4dc754..593b2d0a128 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ReportDataRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ReportDataRepository.java @@ -4,8 +4,8 @@ import java.util.HashMap; import java.util.List; import org.openmetadata.schema.analytics.ReportData; import org.openmetadata.schema.analytics.ReportData.ReportDataType; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; public class ReportDataRepository extends EntityTimeSeriesRepository { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/SearchIndexRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/SearchIndexRepository.java index 2272c07e96c..f3d77d9dae3 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/SearchIndexRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/SearchIndexRepository.java @@ -44,6 +44,7 @@ import org.openmetadata.schema.type.TagLabel; import org.openmetadata.schema.type.TaskType; import org.openmetadata.schema.type.change.ChangeSource; import org.openmetadata.schema.type.searchindex.SearchIndexSampleData; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.jdbi3.FeedRepository.TaskWorkflow; @@ -54,7 +55,6 @@ import org.openmetadata.service.security.mask.PIIMasker; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.EntityUtil.Fields; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; public class SearchIndexRepository extends EntityRepository { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ServiceEntityRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ServiceEntityRepository.java index 34a45295586..f05c34f275b 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ServiceEntityRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ServiceEntityRepository.java @@ -26,10 +26,10 @@ import org.openmetadata.schema.entity.services.connections.TestConnectionResult; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.Relationship; import org.openmetadata.schema.type.change.ChangeSource; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.secrets.SecretsManager; import org.openmetadata.service.secrets.SecretsManagerFactory; import org.openmetadata.service.util.EntityUtil; -import org.openmetadata.service.util.JsonUtils; public abstract class ServiceEntityRepository< T extends ServiceEntityInterface, S extends ServiceConnectionEntityInterface> diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/SuggestionRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/SuggestionRepository.java index 2ec32643d79..6501b74e494 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/SuggestionRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/SuggestionRepository.java @@ -35,6 +35,7 @@ import org.openmetadata.schema.type.SuggestionStatus; import org.openmetadata.schema.type.SuggestionType; import org.openmetadata.schema.type.TagLabel; import org.openmetadata.schema.type.change.ChangeSource; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.sdk.exception.SuggestionException; import org.openmetadata.service.Entity; import org.openmetadata.service.ResourceRegistry; @@ -49,7 +50,6 @@ import org.openmetadata.service.security.policyevaluator.OperationContext; import org.openmetadata.service.security.policyevaluator.ResourceContext; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.RestUtil; import org.openmetadata.service.util.ResultList; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/SystemRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/SystemRepository.java index d596238afe7..bdc7abd511f 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/SystemRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/SystemRepository.java @@ -35,6 +35,7 @@ import org.openmetadata.schema.system.StepValidation; import org.openmetadata.schema.system.ValidationResponse; import org.openmetadata.schema.util.EntitiesCount; import org.openmetadata.schema.util.ServicesCount; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.sdk.PipelineServiceClientInterface; import org.openmetadata.service.Entity; import org.openmetadata.service.OpenMetadataApplicationConfig; @@ -52,7 +53,6 @@ import org.openmetadata.service.secrets.masker.PasswordEntityMasker; import org.openmetadata.service.security.JwtFilter; import org.openmetadata.service.security.auth.LoginAttemptCache; import org.openmetadata.service.util.EntityUtil; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.OpenMetadataConnectionBuilder; import org.openmetadata.service.util.RestUtil; import org.openmetadata.service.util.ResultList; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TableRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TableRepository.java index 35d2b44f8c3..a8b474a0304 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TableRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TableRepository.java @@ -94,6 +94,7 @@ import org.openmetadata.schema.type.csv.CsvDocumentation; import org.openmetadata.schema.type.csv.CsvFile; import org.openmetadata.schema.type.csv.CsvHeader; import org.openmetadata.schema.type.csv.CsvImportResult; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.sdk.exception.EntitySpecViolationException; import org.openmetadata.sdk.exception.SuggestionException; import org.openmetadata.service.Entity; @@ -109,7 +110,6 @@ import org.openmetadata.service.security.mask.PIIMasker; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.EntityUtil.Fields; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.RestUtil; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.util.ValidatorUtil; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestCaseRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestCaseRepository.java index c3225b0b4fe..57c422cebb0 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestCaseRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestCaseRepository.java @@ -62,6 +62,7 @@ import org.openmetadata.schema.type.TestCaseParameterValidationRuleType; import org.openmetadata.schema.type.TestDefinitionEntityType; import org.openmetadata.schema.type.change.ChangeSource; import org.openmetadata.schema.utils.EntityInterfaceUtil; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.EntityNotFoundException; import org.openmetadata.service.resources.dqtests.TestSuiteMapper; @@ -70,7 +71,6 @@ import org.openmetadata.service.search.SearchListFilter; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.EntityUtil.Fields; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.RestUtil; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestCaseResolutionStatusRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestCaseResolutionStatusRepository.java index 060cac10905..177885cede7 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestCaseResolutionStatusRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestCaseResolutionStatusRepository.java @@ -37,12 +37,12 @@ import org.openmetadata.schema.type.TaskDetails; import org.openmetadata.schema.type.TaskStatus; import org.openmetadata.schema.type.TaskType; import org.openmetadata.schema.type.ThreadType; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.EntityNotFoundException; import org.openmetadata.service.exception.IncidentManagerException; import org.openmetadata.service.resources.feeds.MessageParser; import org.openmetadata.service.util.EntityUtil; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.RestUtil; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.util.WebsocketNotificationHandler; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestCaseResultRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestCaseResultRepository.java index 7fd5fa1da55..22d59fdc077 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestCaseResultRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestCaseResultRepository.java @@ -24,11 +24,11 @@ import org.openmetadata.schema.tests.type.TestCaseResult; import org.openmetadata.schema.tests.type.TestCaseStatus; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.EntityNotFoundException; import org.openmetadata.service.search.SearchListFilter; import org.openmetadata.service.util.EntityUtil; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.RestUtil; import org.openmetadata.service.util.ResultList; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestSuiteRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestSuiteRepository.java index a0ab4a9e111..cfa7b50d4d6 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestSuiteRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestSuiteRepository.java @@ -45,6 +45,8 @@ import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.EventType; import org.openmetadata.schema.type.Relationship; import org.openmetadata.schema.type.change.ChangeSource; +import org.openmetadata.schema.utils.JsonUtils; +import org.openmetadata.search.IndexMapping; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.dqtests.TestSuiteResource; import org.openmetadata.service.resources.feeds.MessageParser; @@ -53,12 +55,10 @@ import org.openmetadata.service.search.SearchClient; import org.openmetadata.service.search.SearchIndexUtils; import org.openmetadata.service.search.SearchListFilter; import org.openmetadata.service.search.indexes.SearchIndex; -import org.openmetadata.service.search.models.IndexMapping; import org.openmetadata.service.util.AsyncService; import org.openmetadata.service.util.DeleteEntityResponse; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.RestUtil; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.util.WebsocketNotificationHandler; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TokenRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TokenRepository.java index ba74b4c2384..4641435bf0f 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TokenRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TokenRepository.java @@ -4,9 +4,9 @@ import java.util.List; import java.util.UUID; import lombok.extern.slf4j.Slf4j; import org.openmetadata.schema.TokenInterface; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.EntityNotFoundException; -import org.openmetadata.service.util.JsonUtils; @Slf4j @Repository diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TopicRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TopicRepository.java index c3d41f1a645..13646aab5ad 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TopicRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TopicRepository.java @@ -46,6 +46,7 @@ import org.openmetadata.schema.type.TaskType; import org.openmetadata.schema.type.change.ChangeSource; import org.openmetadata.schema.type.topic.CleanupPolicy; import org.openmetadata.schema.type.topic.TopicSampleData; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.jdbi3.FeedRepository.TaskWorkflow; @@ -56,7 +57,6 @@ import org.openmetadata.service.security.mask.PIIMasker; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.EntityUtil.Fields; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; public class TopicRepository extends EntityRepository { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TypeRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TypeRepository.java index 30c5cacb61f..424ccb85b47 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TypeRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TypeRepository.java @@ -48,6 +48,7 @@ import org.openmetadata.schema.type.Relationship; import org.openmetadata.schema.type.change.ChangeSource; import org.openmetadata.schema.type.customProperties.EnumConfig; import org.openmetadata.schema.type.customProperties.TableConfig; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.TypeRegistry; import org.openmetadata.service.exception.CatalogExceptionMessage; @@ -55,7 +56,6 @@ import org.openmetadata.service.jobs.EnumCleanupHandler; import org.openmetadata.service.resources.types.TypeResource; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.EntityUtil.Fields; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.RestUtil.PutResponse; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/UserRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/UserRepository.java index 0f06281f7cd..f1e70c6eed0 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/UserRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/UserRepository.java @@ -63,6 +63,7 @@ import org.openmetadata.schema.type.csv.CsvFile; import org.openmetadata.schema.type.csv.CsvHeader; import org.openmetadata.schema.type.csv.CsvImportResult; import org.openmetadata.schema.utils.EntityInterfaceUtil; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.OpenMetadataApplicationConfig; import org.openmetadata.service.exception.BadRequestException; @@ -78,7 +79,6 @@ import org.openmetadata.service.security.auth.BotTokenCache; import org.openmetadata.service.security.policyevaluator.SubjectContext; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.EntityUtil.Fields; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.UserUtil; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/WebAnalyticEventRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/WebAnalyticEventRepository.java index 21a03e6ed1d..0b01426863f 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/WebAnalyticEventRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/WebAnalyticEventRepository.java @@ -12,10 +12,10 @@ import org.openmetadata.schema.analytics.WebAnalyticEvent; import org.openmetadata.schema.analytics.WebAnalyticEventData; import org.openmetadata.schema.analytics.type.WebAnalyticEventType; import org.openmetadata.schema.system.EntityError; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.RestUtil; import org.openmetadata.service.util.ResultList; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/WorkflowInstanceRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/WorkflowInstanceRepository.java index 48d5e9602ae..064a8d4dd17 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/WorkflowInstanceRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/WorkflowInstanceRepository.java @@ -10,10 +10,10 @@ import java.util.UUID; import org.openmetadata.schema.governance.workflows.WorkflowDefinition; import org.openmetadata.schema.governance.workflows.WorkflowInstance; import org.openmetadata.schema.governance.workflows.WorkflowInstanceState; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.governance.WorkflowInstanceResource; import org.openmetadata.service.util.EntityUtil; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; public class WorkflowInstanceRepository extends EntityTimeSeriesRepository { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/WorkflowInstanceStateRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/WorkflowInstanceStateRepository.java index 63788f7e78d..c8d2068aeb4 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/WorkflowInstanceStateRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/WorkflowInstanceStateRepository.java @@ -12,10 +12,10 @@ import java.util.UUID; import org.openmetadata.schema.governance.workflows.Stage; import org.openmetadata.schema.governance.workflows.WorkflowInstance; import org.openmetadata.schema.governance.workflows.WorkflowInstanceState; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.governance.WorkflowInstanceStateResource; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; public class WorkflowInstanceStateRepository diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jobs/EnumCleanupHandler.java b/openmetadata-service/src/main/java/org/openmetadata/service/jobs/EnumCleanupHandler.java index 28dceacde87..39f7b03530b 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jobs/EnumCleanupHandler.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jobs/EnumCleanupHandler.java @@ -10,8 +10,8 @@ import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.openmetadata.schema.jobs.BackgroundJob; import org.openmetadata.schema.jobs.EnumCleanupArgs; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.jdbi3.CollectionDAO; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class EnumCleanupHandler implements JobHandler { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jobs/GenericBackgroundWorker.java b/openmetadata-service/src/main/java/org/openmetadata/service/jobs/GenericBackgroundWorker.java index e5887b92ba3..1860c29d90c 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jobs/GenericBackgroundWorker.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jobs/GenericBackgroundWorker.java @@ -5,10 +5,10 @@ import java.util.Optional; import lombok.extern.slf4j.Slf4j; import org.openmetadata.schema.entity.teams.User; import org.openmetadata.schema.jobs.BackgroundJob; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.socket.WebSocketManager; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class GenericBackgroundWorker implements Managed { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jobs/JobDAO.java b/openmetadata-service/src/main/java/org/openmetadata/service/jobs/JobDAO.java index 4a008560884..94da1d7b1b5 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jobs/JobDAO.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jobs/JobDAO.java @@ -15,9 +15,9 @@ import org.jdbi.v3.sqlobject.customizer.Bind; import org.jdbi.v3.sqlobject.statement.GetGeneratedKeys; import org.jdbi.v3.sqlobject.statement.SqlQuery; import org.openmetadata.schema.jobs.BackgroundJob; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.jdbi3.locator.ConnectionAwareSqlQuery; import org.openmetadata.service.jdbi3.locator.ConnectionAwareSqlUpdate; -import org.openmetadata.service.util.JsonUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/limits/AppLimits.java b/openmetadata-service/src/main/java/org/openmetadata/service/limits/AppLimits.java index d2bc00d7a23..867b886b6e6 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/limits/AppLimits.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/limits/AppLimits.java @@ -5,12 +5,12 @@ import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.openmetadata.schema.entity.app.App; import org.openmetadata.schema.entity.app.AppExtension; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.exception.LimitsException; import org.openmetadata.service.jdbi3.AppRepository; import org.openmetadata.service.jdbi3.CollectionDAO; import org.openmetadata.service.security.policyevaluator.OperationContext; import org.openmetadata.service.security.policyevaluator.ResourceContextInterface; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/mcp/MCPStreamableHttpServlet.java b/openmetadata-service/src/main/java/org/openmetadata/service/mcp/MCPStreamableHttpServlet.java index 7d1134297f1..58d58f8409a 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/mcp/MCPStreamableHttpServlet.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/mcp/MCPStreamableHttpServlet.java @@ -40,6 +40,7 @@ import org.openmetadata.schema.api.configuration.OpenMetadataBaseUrlConfiguratio import org.openmetadata.schema.entity.app.App; import org.openmetadata.schema.settings.SettingsType; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.config.MCPConfiguration; import org.openmetadata.service.exception.BadRequestException; @@ -49,7 +50,6 @@ import org.openmetadata.service.mcp.tools.DefaultToolContext; import org.openmetadata.service.resources.settings.SettingsCache; import org.openmetadata.service.security.Authorizer; import org.openmetadata.service.security.JwtFilter; -import org.openmetadata.service.util.JsonUtils; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/mcp/McpAuthFilter.java b/openmetadata-service/src/main/java/org/openmetadata/service/mcp/McpAuthFilter.java index 16e87e26362..379723206ba 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/mcp/McpAuthFilter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/mcp/McpAuthFilter.java @@ -12,9 +12,9 @@ import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.HashMap; import java.util.Map; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.apps.ApplicationContext; import org.openmetadata.service.security.JwtFilter; -import org.openmetadata.service.util.JsonUtils; public class McpAuthFilter implements Filter { private final JwtFilter jwtFilter; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/mcp/McpServer.java b/openmetadata-service/src/main/java/org/openmetadata/service/mcp/McpServer.java index 55d5a70e1fe..4c9a518f519 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/mcp/McpServer.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/mcp/McpServer.java @@ -12,13 +12,13 @@ import java.util.List; import lombok.extern.slf4j.Slf4j; import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.ServletHolder; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.OpenMetadataApplicationConfig; import org.openmetadata.service.limits.Limits; import org.openmetadata.service.mcp.prompts.DefaultPromptsContext; import org.openmetadata.service.mcp.tools.DefaultToolContext; import org.openmetadata.service.security.Authorizer; import org.openmetadata.service.security.JwtFilter; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class McpServer { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/mcp/McpUtils.java b/openmetadata-service/src/main/java/org/openmetadata/service/mcp/McpUtils.java index 78486a67747..c0375c2c27e 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/mcp/McpUtils.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/mcp/McpUtils.java @@ -11,8 +11,8 @@ import java.util.List; import java.util.Map; import lombok.extern.slf4j.Slf4j; import org.openmetadata.common.utils.CommonUtil; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.security.JwtFilter; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class McpUtils { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/CommonUtils.java b/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/CommonUtils.java index 48c37855140..926f0782c2f 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/CommonUtils.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/CommonUtils.java @@ -8,10 +8,10 @@ import org.openmetadata.schema.entity.teams.Team; import org.openmetadata.schema.entity.teams.User; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.jdbi3.TeamRepository; import org.openmetadata.service.jdbi3.UserRepository; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class CommonUtils { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/DefaultToolContext.java b/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/DefaultToolContext.java index 32aa1d85c85..9429888fe15 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/DefaultToolContext.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/DefaultToolContext.java @@ -6,12 +6,12 @@ import io.modelcontextprotocol.spec.McpSchema; import java.util.List; import java.util.Map; import lombok.extern.slf4j.Slf4j; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.limits.Limits; import org.openmetadata.service.security.AuthorizationException; import org.openmetadata.service.security.Authorizer; import org.openmetadata.service.security.JwtFilter; import org.openmetadata.service.security.auth.CatalogSecurityContext; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class DefaultToolContext { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/GetEntityTool.java b/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/GetEntityTool.java index 6580115b5c3..bd2206e164d 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/GetEntityTool.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/GetEntityTool.java @@ -5,13 +5,13 @@ import static org.openmetadata.schema.type.MetadataOperation.VIEW_ALL; import java.io.IOException; import java.util.Map; import lombok.extern.slf4j.Slf4j; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.limits.Limits; import org.openmetadata.service.security.Authorizer; import org.openmetadata.service.security.auth.CatalogSecurityContext; import org.openmetadata.service.security.policyevaluator.OperationContext; import org.openmetadata.service.security.policyevaluator.ResourceContext; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class GetEntityTool implements McpTool { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/GetLineageTool.java b/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/GetLineageTool.java index daaa9ad2bc2..a002acb0f78 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/GetLineageTool.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/GetLineageTool.java @@ -3,11 +3,11 @@ package org.openmetadata.service.mcp.tools; import java.io.IOException; import java.util.Map; import lombok.extern.slf4j.Slf4j; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.jdbi3.LineageRepository; import org.openmetadata.service.limits.Limits; import org.openmetadata.service.security.Authorizer; import org.openmetadata.service.security.auth.CatalogSecurityContext; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class GetLineageTool implements McpTool { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/GlossaryTermTool.java b/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/GlossaryTermTool.java index e8b8d437221..bb7d78a7323 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/GlossaryTermTool.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/GlossaryTermTool.java @@ -8,6 +8,7 @@ import org.openmetadata.schema.entity.data.Glossary; import org.openmetadata.schema.entity.data.GlossaryTerm; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.MetadataOperation; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.jdbi3.GlossaryRepository; import org.openmetadata.service.jdbi3.GlossaryTermRepository; @@ -17,7 +18,6 @@ import org.openmetadata.service.security.Authorizer; import org.openmetadata.service.security.auth.CatalogSecurityContext; import org.openmetadata.service.security.policyevaluator.CreateResourceContext; import org.openmetadata.service.security.policyevaluator.OperationContext; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.RestUtil; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/GlossaryTool.java b/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/GlossaryTool.java index 8b7275f5d5a..640d3a6cadc 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/GlossaryTool.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/GlossaryTool.java @@ -7,6 +7,7 @@ import org.openmetadata.schema.api.data.CreateGlossary; import org.openmetadata.schema.entity.data.Glossary; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.MetadataOperation; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.jdbi3.GlossaryRepository; import org.openmetadata.service.limits.Limits; @@ -15,7 +16,6 @@ import org.openmetadata.service.security.Authorizer; import org.openmetadata.service.security.auth.CatalogSecurityContext; import org.openmetadata.service.security.policyevaluator.CreateResourceContext; import org.openmetadata.service.security.policyevaluator.OperationContext; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.RestUtil; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/PatchEntityTool.java b/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/PatchEntityTool.java index 3ee91adc894..da34c2ae70a 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/PatchEntityTool.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/PatchEntityTool.java @@ -5,6 +5,7 @@ import java.util.Map; import lombok.extern.slf4j.Slf4j; import org.openmetadata.schema.EntityInterface; import org.openmetadata.schema.type.change.ChangeSource; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.jdbi3.EntityRepository; import org.openmetadata.service.limits.Limits; @@ -12,7 +13,6 @@ import org.openmetadata.service.security.Authorizer; import org.openmetadata.service.security.auth.CatalogSecurityContext; import org.openmetadata.service.security.policyevaluator.OperationContext; import org.openmetadata.service.security.policyevaluator.ResourceContext; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.RestUtil; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/SearchMetadataTool.java b/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/SearchMetadataTool.java index e622e3111a5..161ec87e80d 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/SearchMetadataTool.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/mcp/tools/SearchMetadataTool.java @@ -11,12 +11,12 @@ import java.util.List; import java.util.Map; import lombok.extern.slf4j.Slf4j; import org.openmetadata.schema.search.SearchRequest; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.limits.Limits; import org.openmetadata.service.security.Authorizer; import org.openmetadata.service.security.auth.CatalogSecurityContext; import org.openmetadata.service.security.policyevaluator.SubjectContext; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class SearchMetadataTool implements McpTool { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/V112/MigrationUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/V112/MigrationUtil.java index 1c4c0cd0065..79989ac8b8c 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/V112/MigrationUtil.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/V112/MigrationUtil.java @@ -7,12 +7,12 @@ import org.openmetadata.schema.entity.teams.User; import org.openmetadata.schema.tests.TestSuite; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.utils.EntityInterfaceUtil; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.jdbi3.CollectionDAO; import org.openmetadata.service.jdbi3.ListFilter; import org.openmetadata.service.jdbi3.TestSuiteRepository; import org.openmetadata.service.util.EntityUtil; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class MigrationUtil { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v110/MigrationUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v110/MigrationUtil.java index bc566088178..3ff35ca93aa 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v110/MigrationUtil.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v110/MigrationUtil.java @@ -60,6 +60,7 @@ import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.Relationship; import org.openmetadata.schema.utils.EntityInterfaceUtil; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.jdbi3.CollectionDAO; import org.openmetadata.service.jdbi3.EntityDAO; @@ -72,7 +73,6 @@ import org.openmetadata.service.resources.databases.DatasourceConfig; import org.openmetadata.service.resources.feeds.MessageParser; import org.openmetadata.service.util.EntityUtil.Fields; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class MigrationUtil { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v111/MigrationUtilV111.java b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v111/MigrationUtilV111.java index 0bffc8871e8..8516f6e79f3 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v111/MigrationUtilV111.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v111/MigrationUtilV111.java @@ -16,9 +16,9 @@ import org.openmetadata.schema.tests.TestSuite; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.Relationship; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.jdbi3.CollectionDAO; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.postgresql.util.PGobject; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v120/MigrationUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v120/MigrationUtil.java index 15766dad217..b955060a920 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v120/MigrationUtil.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v120/MigrationUtil.java @@ -9,12 +9,12 @@ import org.openmetadata.schema.entity.data.GlossaryTerm; import org.openmetadata.schema.entity.data.Query; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.Relationship; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.jdbi3.CollectionDAO; import org.openmetadata.service.jdbi3.GlossaryTermRepository; import org.openmetadata.service.jdbi3.QueryRepository; import org.openmetadata.service.resources.databases.DatasourceConfig; -import org.openmetadata.service.util.JsonUtils; import org.postgresql.util.PGobject; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v130/MigrationUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v130/MigrationUtil.java index 5b35fc49e97..d345b37effd 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v130/MigrationUtil.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v130/MigrationUtil.java @@ -8,7 +8,7 @@ import java.util.Map; import lombok.extern.slf4j.Slf4j; import org.jdbi.v3.core.Handle; import org.openmetadata.schema.entity.services.DatabaseService; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; @Slf4j public class MigrationUtil { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v131/MigrationUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v131/MigrationUtil.java index 70f76fc2506..b1c614b3452 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v131/MigrationUtil.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v131/MigrationUtil.java @@ -10,9 +10,9 @@ import java.util.List; import lombok.extern.slf4j.Slf4j; import org.openmetadata.schema.entity.app.App; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.jdbi3.CollectionDAO; import org.openmetadata.service.jdbi3.ListFilter; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class MigrationUtil { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v132/MigrationUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v132/MigrationUtil.java index 27fe3e7c62c..b3a14e13a3c 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v132/MigrationUtil.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v132/MigrationUtil.java @@ -11,8 +11,8 @@ import org.openmetadata.schema.metadataIngestion.dbtconfig.DbtGCSConfig; import org.openmetadata.schema.metadataIngestion.dbtconfig.DbtHttpConfig; import org.openmetadata.schema.metadataIngestion.dbtconfig.DbtLocalConfig; import org.openmetadata.schema.metadataIngestion.dbtconfig.DbtS3Config; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.exception.UnhandledServerException; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class MigrationUtil { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v140/MigrationUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v140/MigrationUtil.java index b452472b70b..1175ea22c7a 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v140/MigrationUtil.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v140/MigrationUtil.java @@ -22,10 +22,10 @@ import org.openmetadata.schema.type.PartitionColumnDetails; import org.openmetadata.schema.type.PartitionIntervalTypes; import org.openmetadata.schema.type.Relationship; import org.openmetadata.schema.type.TablePartition; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.jdbi3.CollectionDAO; import org.openmetadata.service.resources.databases.DatasourceConfig; -import org.openmetadata.service.util.JsonUtils; import org.postgresql.util.PGobject; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v141/MigrationUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v141/MigrationUtil.java index f3a1b91c2b3..07591d03fa8 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v141/MigrationUtil.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v141/MigrationUtil.java @@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j; import org.jdbi.v3.core.Handle; import org.openmetadata.schema.entity.feed.Thread; import org.openmetadata.schema.type.AnnouncementDetails; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; @Slf4j public class MigrationUtil { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v150/MigrationUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v150/MigrationUtil.java index c8b914eff82..a4abd0207eb 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v150/MigrationUtil.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v150/MigrationUtil.java @@ -25,6 +25,7 @@ import org.openmetadata.schema.entity.services.ingestionPipelines.IngestionPipel import org.openmetadata.schema.tests.TestDefinition; import org.openmetadata.schema.type.DataQualityDimensions; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.sdk.PipelineServiceClientInterface; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.EntityNotFoundException; @@ -34,7 +35,6 @@ import org.openmetadata.service.jdbi3.CollectionDAO; import org.openmetadata.service.jdbi3.DataInsightSystemChartRepository; import org.openmetadata.service.jdbi3.IngestionPipelineRepository; import org.openmetadata.service.resources.databases.DatasourceConfig; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class MigrationUtil { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v155/MigrationUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v155/MigrationUtil.java index 28967d860bf..7aeb90d2c1f 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v155/MigrationUtil.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v155/MigrationUtil.java @@ -7,8 +7,8 @@ import org.openmetadata.schema.api.security.AuthenticationConfiguration; import org.openmetadata.schema.entity.teams.User; import org.openmetadata.schema.services.connections.metadata.AuthProvider; import org.openmetadata.schema.utils.EntityInterfaceUtil; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.jdbi3.CollectionDAO; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class MigrationUtil { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v157/MigrationUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v157/MigrationUtil.java index e251afe5f92..ddba4e9d1d7 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v157/MigrationUtil.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v157/MigrationUtil.java @@ -12,8 +12,8 @@ import org.openmetadata.schema.tests.TestCase; import org.openmetadata.schema.tests.TestCaseParameterValue; import org.openmetadata.schema.tests.TestDefinition; import org.openmetadata.schema.type.Relationship; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.jdbi3.CollectionDAO; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class MigrationUtil { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v159/MigrationUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v159/MigrationUtil.java index 08f477fb272..f14a4ae27f1 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v159/MigrationUtil.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v159/MigrationUtil.java @@ -9,11 +9,11 @@ import org.openmetadata.schema.api.security.AuthenticationConfiguration; import org.openmetadata.schema.entity.app.App; import org.openmetadata.schema.entity.app.AppExtension; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.EntityNotFoundException; import org.openmetadata.service.jdbi3.AppRepository; import org.openmetadata.service.jdbi3.CollectionDAO; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class MigrationUtil { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v160/MigrationUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v160/MigrationUtil.java index ac5ac327c04..87b7dab3336 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v160/MigrationUtil.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v160/MigrationUtil.java @@ -20,13 +20,13 @@ import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.MetadataOperation; import org.openmetadata.schema.type.Relationship; import org.openmetadata.schema.type.TableConstraint; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.EntityNotFoundException; import org.openmetadata.service.jdbi3.CollectionDAO; import org.openmetadata.service.jdbi3.PolicyRepository; import org.openmetadata.service.jdbi3.TableRepository; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class MigrationUtil { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v170/MigrationUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v170/MigrationUtil.java index e2c6993a5cf..385c786b03d 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v170/MigrationUtil.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v170/MigrationUtil.java @@ -32,6 +32,7 @@ import org.openmetadata.schema.type.LineageDetails; import org.openmetadata.schema.type.MetadataOperation; import org.openmetadata.schema.type.Relationship; import org.openmetadata.schema.utils.EntityInterfaceUtil; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.EntityNotFoundException; import org.openmetadata.service.governance.workflows.flowable.MainWorkflow; @@ -46,7 +47,6 @@ import org.openmetadata.service.jdbi3.WorkflowDefinitionRepository; import org.openmetadata.service.resources.databases.DatasourceConfig; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class MigrationUtil { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v180/MigrationUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v180/MigrationUtil.java index 2ab975bda94..0e1ab3698f6 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v180/MigrationUtil.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v180/MigrationUtil.java @@ -8,11 +8,11 @@ import org.openmetadata.schema.entity.policies.Policy; import org.openmetadata.schema.entity.policies.accessControl.Rule; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.MetadataOperation; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.EntityNotFoundException; import org.openmetadata.service.jdbi3.CollectionDAO; import org.openmetadata.service.jdbi3.PolicyRepository; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class MigrationUtil { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/analytics/WebAnalyticEventResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/analytics/WebAnalyticEventResource.java index 83a1945b07c..6ad43182675 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/analytics/WebAnalyticEventResource.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/analytics/WebAnalyticEventResource.java @@ -46,6 +46,7 @@ import org.openmetadata.schema.api.tests.CreateWebAnalyticEvent; import org.openmetadata.schema.type.EntityHistory; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.MetadataOperation; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.OpenMetadataApplicationConfig; import org.openmetadata.service.jdbi3.ListFilter; @@ -55,7 +56,6 @@ import org.openmetadata.service.resources.Collection; import org.openmetadata.service.resources.EntityResource; import org.openmetadata.service.security.Authorizer; import org.openmetadata.service.security.policyevaluator.OperationContext; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/apps/AppMapper.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/apps/AppMapper.java index 8653d704de6..be84e8aceca 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/apps/AppMapper.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/apps/AppMapper.java @@ -12,13 +12,13 @@ import org.openmetadata.schema.entity.app.AppMarketPlaceDefinition; import org.openmetadata.schema.entity.app.CreateApp; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.BadRequestException; import org.openmetadata.service.jdbi3.AppMarketPlaceRepository; import org.openmetadata.service.jdbi3.AppRepository; import org.openmetadata.service.mapper.EntityMapper; import org.openmetadata.service.util.EntityUtil; -import org.openmetadata.service.util.JsonUtils; public class AppMapper implements EntityMapper { @Override diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/apps/AppMarketPlaceMapper.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/apps/AppMarketPlaceMapper.java index 3de29a89506..722500c66bd 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/apps/AppMarketPlaceMapper.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/apps/AppMarketPlaceMapper.java @@ -7,10 +7,10 @@ import org.openmetadata.schema.entity.app.AppMarketPlaceDefinition; import org.openmetadata.schema.entity.app.AppType; import org.openmetadata.schema.entity.app.CreateAppMarketPlaceDefinitionReq; import org.openmetadata.schema.entity.services.ingestionPipelines.PipelineServiceClientResponse; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.sdk.PipelineServiceClientInterface; import org.openmetadata.service.apps.NativeApplication; import org.openmetadata.service.mapper.EntityMapper; -import org.openmetadata.service.util.JsonUtils; public class AppMarketPlaceMapper implements EntityMapper { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/databases/TableResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/databases/TableResource.java index 065e3b788ef..33eedf26ad1 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/databases/TableResource.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/databases/TableResource.java @@ -70,6 +70,7 @@ import org.openmetadata.schema.type.TableProfile; import org.openmetadata.schema.type.TableProfilerConfig; import org.openmetadata.schema.type.change.ChangeSource; import org.openmetadata.schema.type.csv.CsvImportResult; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.jdbi3.ListFilter; import org.openmetadata.service.jdbi3.TableRepository; @@ -80,7 +81,6 @@ import org.openmetadata.service.security.Authorizer; import org.openmetadata.service.security.policyevaluator.OperationContext; import org.openmetadata.service.security.policyevaluator.ResourceContext; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; @Path("/v1/tables") diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/docstore/DocStoreMapper.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/docstore/DocStoreMapper.java index f5c51df0ce6..18858d164aa 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/docstore/DocStoreMapper.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/docstore/DocStoreMapper.java @@ -5,12 +5,12 @@ import org.openmetadata.schema.email.EmailTemplate; import org.openmetadata.schema.email.TemplateValidationResponse; import org.openmetadata.schema.entities.docStore.CreateDocument; import org.openmetadata.schema.entities.docStore.Document; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.CustomExceptionMessage; import org.openmetadata.service.jdbi3.DocumentRepository; import org.openmetadata.service.mapper.EntityMapper; import org.openmetadata.service.security.Authorizer; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.email.DefaultTemplateProvider; public class DocStoreMapper implements EntityMapper { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/events/subscription/EventSubscriptionResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/events/subscription/EventSubscriptionResource.java index eab75caddb5..2175437ba0b 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/events/subscription/EventSubscriptionResource.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/events/subscription/EventSubscriptionResource.java @@ -72,6 +72,7 @@ import org.openmetadata.schema.type.EntityHistory; import org.openmetadata.schema.type.FilterResourceDescriptor; import org.openmetadata.schema.type.MetadataOperation; import org.openmetadata.schema.type.NotificationResourceDescriptor; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.OpenMetadataApplicationConfig; import org.openmetadata.service.apps.bundles.changeEvent.AlertFactory; @@ -89,7 +90,6 @@ import org.openmetadata.service.resources.EntityResource; import org.openmetadata.service.security.Authorizer; import org.openmetadata.service.security.policyevaluator.OperationContext; import org.openmetadata.service.util.EntityUtil; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.quartz.SchedulerException; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/feeds/FeedUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/feeds/FeedUtil.java index 4de74a9a00a..6c5e931b141 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/feeds/FeedUtil.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/feeds/FeedUtil.java @@ -18,8 +18,8 @@ import java.util.UUID; import org.openmetadata.schema.entity.feed.Thread; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.Post; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; -import org.openmetadata.service.util.JsonUtils; public final class FeedUtil { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/glossary/GlossaryResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/glossary/GlossaryResource.java index 52049bab668..f12280362b8 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/glossary/GlossaryResource.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/glossary/GlossaryResource.java @@ -55,6 +55,7 @@ import org.openmetadata.schema.type.EntityHistory; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.MetadataOperation; import org.openmetadata.schema.type.csv.CsvImportResult; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.jdbi3.GlossaryRepository; import org.openmetadata.service.jdbi3.GlossaryRepository.GlossaryCsv; @@ -64,7 +65,6 @@ import org.openmetadata.service.resources.Collection; import org.openmetadata.service.resources.EntityResource; import org.openmetadata.service.security.Authorizer; import org.openmetadata.service.util.CSVExportResponse; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; @Path("/v1/glossaries") diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/policies/PolicyResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/policies/PolicyResource.java index f83b63ddea1..4d5b31eac2e 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/policies/PolicyResource.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/policies/PolicyResource.java @@ -55,6 +55,7 @@ import org.openmetadata.schema.type.Function; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.MetadataOperation; import org.openmetadata.schema.type.ResourceDescriptor; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.FunctionList; import org.openmetadata.service.OpenMetadataApplicationConfig; @@ -69,7 +70,6 @@ import org.openmetadata.service.security.Authorizer; import org.openmetadata.service.security.policyevaluator.CompiledRule; import org.openmetadata.service.security.policyevaluator.OperationContext; import org.openmetadata.service.security.policyevaluator.RuleEvaluator; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/apiservices/APIServiceResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/apiservices/APIServiceResource.java index b761492a2ca..83d5629951b 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/apiservices/APIServiceResource.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/apiservices/APIServiceResource.java @@ -57,6 +57,7 @@ import org.openmetadata.schema.type.EntityHistory; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.MetadataOperation; import org.openmetadata.schema.utils.EntityInterfaceUtil; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.jdbi3.APIServiceRepository; import org.openmetadata.service.limits.Limits; @@ -64,7 +65,6 @@ import org.openmetadata.service.resources.Collection; import org.openmetadata.service.resources.services.ServiceEntityResource; import org.openmetadata.service.security.Authorizer; import org.openmetadata.service.security.policyevaluator.OperationContext; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/dashboard/DashboardServiceResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/dashboard/DashboardServiceResource.java index 133d83b5dd0..6e051e8fb19 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/dashboard/DashboardServiceResource.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/dashboard/DashboardServiceResource.java @@ -55,6 +55,7 @@ import org.openmetadata.schema.type.DashboardConnection; import org.openmetadata.schema.type.EntityHistory; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.MetadataOperation; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.jdbi3.DashboardServiceRepository; import org.openmetadata.service.limits.Limits; @@ -62,7 +63,6 @@ import org.openmetadata.service.resources.Collection; import org.openmetadata.service.resources.services.ServiceEntityResource; import org.openmetadata.service.security.Authorizer; import org.openmetadata.service.security.policyevaluator.OperationContext; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; @Path("/v1/services/dashboardServices") diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/database/DatabaseServiceResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/database/DatabaseServiceResource.java index 78bf9135a56..ddfc6a61224 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/database/DatabaseServiceResource.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/database/DatabaseServiceResource.java @@ -58,6 +58,7 @@ import org.openmetadata.schema.type.EntityHistory; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.MetadataOperation; import org.openmetadata.schema.type.csv.CsvImportResult; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.jdbi3.DatabaseServiceRepository; import org.openmetadata.service.limits.Limits; @@ -66,7 +67,6 @@ import org.openmetadata.service.resources.services.ServiceEntityResource; import org.openmetadata.service.security.Authorizer; import org.openmetadata.service.security.policyevaluator.OperationContext; import org.openmetadata.service.util.CSVExportResponse; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/messaging/MessagingServiceResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/messaging/MessagingServiceResource.java index 7230f293838..ea97c862067 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/messaging/MessagingServiceResource.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/messaging/MessagingServiceResource.java @@ -55,6 +55,7 @@ import org.openmetadata.schema.type.EntityHistory; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.MessagingConnection; import org.openmetadata.schema.type.MetadataOperation; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.jdbi3.MessagingServiceRepository; import org.openmetadata.service.limits.Limits; @@ -62,7 +63,6 @@ import org.openmetadata.service.resources.Collection; import org.openmetadata.service.resources.services.ServiceEntityResource; import org.openmetadata.service.security.Authorizer; import org.openmetadata.service.security.policyevaluator.OperationContext; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; @Path("/v1/services/messagingServices") diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/metadata/MetadataServiceResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/metadata/MetadataServiceResource.java index e3e61c2ed77..fe6a108ef14 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/metadata/MetadataServiceResource.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/metadata/MetadataServiceResource.java @@ -51,6 +51,7 @@ import org.openmetadata.schema.type.ChangeEvent; import org.openmetadata.schema.type.EntityHistory; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.MetadataOperation; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.OpenMetadataApplicationConfig; import org.openmetadata.service.jdbi3.MetadataServiceRepository; @@ -59,7 +60,6 @@ import org.openmetadata.service.resources.Collection; import org.openmetadata.service.resources.services.ServiceEntityResource; import org.openmetadata.service.security.Authorizer; import org.openmetadata.service.security.policyevaluator.OperationContext; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.OpenMetadataConnectionBuilder; import org.openmetadata.service.util.ResultList; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/mlmodel/MlModelServiceResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/mlmodel/MlModelServiceResource.java index bfba2aced77..3bdf0fe1dd5 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/mlmodel/MlModelServiceResource.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/mlmodel/MlModelServiceResource.java @@ -57,6 +57,7 @@ import org.openmetadata.schema.type.EntityHistory; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.MetadataOperation; import org.openmetadata.schema.type.MlModelConnection; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.jdbi3.MlModelServiceRepository; import org.openmetadata.service.limits.Limits; @@ -64,7 +65,6 @@ import org.openmetadata.service.resources.Collection; import org.openmetadata.service.resources.services.ServiceEntityResource; import org.openmetadata.service.security.Authorizer; import org.openmetadata.service.security.policyevaluator.OperationContext; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; @Path("/v1/services/mlmodelServices") diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/pipeline/PipelineServiceResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/pipeline/PipelineServiceResource.java index 882372085dd..6fa097c84de 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/pipeline/PipelineServiceResource.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/pipeline/PipelineServiceResource.java @@ -55,6 +55,7 @@ import org.openmetadata.schema.type.EntityHistory; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.MetadataOperation; import org.openmetadata.schema.type.PipelineConnection; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.jdbi3.PipelineServiceRepository; import org.openmetadata.service.limits.Limits; @@ -62,7 +63,6 @@ import org.openmetadata.service.resources.Collection; import org.openmetadata.service.resources.services.ServiceEntityResource; import org.openmetadata.service.security.Authorizer; import org.openmetadata.service.security.policyevaluator.OperationContext; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; @Path("/v1/services/pipelineServices") diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/searchIndexes/SearchServiceResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/searchIndexes/SearchServiceResource.java index f3e3610fb8b..8618c549f1c 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/searchIndexes/SearchServiceResource.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/searchIndexes/SearchServiceResource.java @@ -44,6 +44,7 @@ import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.MetadataOperation; import org.openmetadata.schema.type.SearchConnection; import org.openmetadata.schema.utils.EntityInterfaceUtil; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.jdbi3.SearchServiceRepository; import org.openmetadata.service.limits.Limits; @@ -51,7 +52,6 @@ import org.openmetadata.service.resources.Collection; import org.openmetadata.service.resources.services.ServiceEntityResource; import org.openmetadata.service.security.Authorizer; import org.openmetadata.service.security.policyevaluator.OperationContext; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/storage/StorageServiceResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/storage/StorageServiceResource.java index 7ec74124feb..3399d011c47 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/storage/StorageServiceResource.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/storage/StorageServiceResource.java @@ -44,6 +44,7 @@ import org.openmetadata.schema.type.EntityHistory; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.MetadataOperation; import org.openmetadata.schema.type.StorageConnection; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.jdbi3.StorageServiceRepository; import org.openmetadata.service.limits.Limits; @@ -51,7 +52,6 @@ import org.openmetadata.service.resources.Collection; import org.openmetadata.service.resources.services.ServiceEntityResource; import org.openmetadata.service.security.Authorizer; import org.openmetadata.service.security.policyevaluator.OperationContext; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/settings/SettingsCache.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/settings/SettingsCache.java index 421b5da1247..2bc8fb9244f 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/settings/SettingsCache.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/settings/SettingsCache.java @@ -47,12 +47,12 @@ import org.openmetadata.schema.configuration.WorkflowSettings; import org.openmetadata.schema.email.SmtpSettings; import org.openmetadata.schema.settings.Settings; import org.openmetadata.schema.settings.SettingsType; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.OpenMetadataApplicationConfig; import org.openmetadata.service.exception.EntityNotFoundException; import org.openmetadata.service.jdbi3.EntityRepository; import org.openmetadata.service.util.EntityUtil; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class SettingsCache { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/system/SystemResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/system/SystemResource.java index 806f35ce819..31c49dc243f 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/system/SystemResource.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/system/SystemResource.java @@ -43,6 +43,7 @@ import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.MetadataOperation; import org.openmetadata.schema.util.EntitiesCount; import org.openmetadata.schema.util.ServicesCount; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.sdk.PipelineServiceClientInterface; import org.openmetadata.service.Entity; import org.openmetadata.service.OpenMetadataApplicationConfig; @@ -59,7 +60,6 @@ import org.openmetadata.service.security.JwtFilter; import org.openmetadata.service.security.policyevaluator.OperationContext; import org.openmetadata.service.security.policyevaluator.ResourceContext; import org.openmetadata.service.util.EntityUtil; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.util.email.EmailUtil; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/teams/TeamResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/teams/TeamResource.java index e0d375ce6b8..645f8dd5ea2 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/teams/TeamResource.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/teams/TeamResource.java @@ -60,6 +60,7 @@ import org.openmetadata.schema.type.MetadataOperation; import org.openmetadata.schema.type.api.BulkAssets; import org.openmetadata.schema.type.api.BulkOperationResult; import org.openmetadata.schema.type.csv.CsvImportResult; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.OpenMetadataApplicationConfig; import org.openmetadata.service.jdbi3.ListFilter; @@ -71,7 +72,6 @@ import org.openmetadata.service.resources.EntityResource; import org.openmetadata.service.security.Authorizer; import org.openmetadata.service.security.policyevaluator.OperationContext; import org.openmetadata.service.util.CSVExportResponse; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/teams/UserResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/teams/UserResource.java index 5aabac0b329..59d3833b51e 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/teams/UserResource.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/teams/UserResource.java @@ -121,6 +121,7 @@ import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.MetadataOperation; import org.openmetadata.schema.type.Relationship; import org.openmetadata.schema.type.csv.CsvImportResult; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.OpenMetadataApplicationConfig; import org.openmetadata.service.auth.JwtResponse; @@ -154,7 +155,6 @@ import org.openmetadata.service.security.saml.JwtTokenCacheManager; import org.openmetadata.service.util.CSVExportResponse; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.EntityUtil.Fields; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.PasswordUtil; import org.openmetadata.service.util.RestUtil.PutResponse; import org.openmetadata.service.util.ResultList; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/types/TypeResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/types/TypeResource.java index 98bde0f90a5..5ff57928f65 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/types/TypeResource.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/types/TypeResource.java @@ -57,6 +57,7 @@ import org.openmetadata.schema.entity.type.CustomProperty; import org.openmetadata.schema.type.EntityHistory; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.MetadataOperation; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.OpenMetadataApplicationConfig; import org.openmetadata.service.jdbi3.ListFilter; @@ -67,7 +68,6 @@ import org.openmetadata.service.resources.EntityResource; import org.openmetadata.service.security.Authorizer; import org.openmetadata.service.security.policyevaluator.OperationContext; import org.openmetadata.service.util.EntityUtil.Fields; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.RestUtil.PutResponse; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.util.SchemaFieldExtractor; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchClient.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchClient.java index 9e3457fa5a3..eb4ba380810 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchClient.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchClient.java @@ -25,8 +25,8 @@ import org.openmetadata.schema.search.SearchRequest; import org.openmetadata.schema.service.configuration.elasticsearch.ElasticSearchConfiguration; import org.openmetadata.schema.tests.DataQualityReport; import org.openmetadata.schema.type.EntityReference; +import org.openmetadata.search.IndexMapping; import org.openmetadata.service.exception.CustomExceptionMessage; -import org.openmetadata.service.search.models.IndexMapping; import org.openmetadata.service.security.policyevaluator.SubjectContext; import org.openmetadata.service.util.ResultList; import os.org.opensearch.action.bulk.BulkRequest; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchIndexUtils.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchIndexUtils.java index 5eead3b8924..46b1e5a77fd 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchIndexUtils.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchIndexUtils.java @@ -30,7 +30,7 @@ import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.TagLabel; import org.openmetadata.schema.type.change.ChangeSource; import org.openmetadata.schema.type.change.ChangeSummary; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.util.Utilities; public final class SearchIndexUtils { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchRepository.java index 554af577971..68f619a659c 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchRepository.java @@ -1,6 +1,7 @@ package org.openmetadata.service.search; import static org.openmetadata.common.utils.CommonUtil.nullOrEmpty; +import static org.openmetadata.search.IndexMapping.INDEX_NAME_SEPARATOR; import static org.openmetadata.service.Entity.AGGREGATED_COST_ANALYSIS_REPORT_DATA; import static org.openmetadata.service.Entity.ENTITY_REPORT_DATA; import static org.openmetadata.service.Entity.FIELD_DISPLAY_NAME; @@ -46,7 +47,6 @@ import static org.openmetadata.service.search.SearchConstants.SERVICE_ID; import static org.openmetadata.service.search.SearchConstants.TAGS_FQN; import static org.openmetadata.service.search.SearchConstants.TEST_SUITES; import static org.openmetadata.service.search.SearchUtils.isConnectedVia; -import static org.openmetadata.service.search.models.IndexMapping.INDEX_NAME_SEPARATOR; import static org.openmetadata.service.util.EntityUtil.compareEntityReferenceById; import static org.openmetadata.service.util.EntityUtil.isNullOrEmptyChangeDescription; @@ -99,6 +99,9 @@ import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.FieldChange; import org.openmetadata.schema.type.TagLabel; import org.openmetadata.schema.type.UsageDetails; +import org.openmetadata.schema.utils.JsonUtils; +import org.openmetadata.search.IndexMapping; +import org.openmetadata.search.IndexMappingLoader; import org.openmetadata.service.Entity; import org.openmetadata.service.events.lifecycle.EntityLifecycleEventDispatcher; import org.openmetadata.service.events.lifecycle.handlers.SearchIndexHandler; @@ -106,14 +109,12 @@ import org.openmetadata.service.exception.UnhandledServerException; import org.openmetadata.service.jdbi3.EntityRepository; import org.openmetadata.service.search.elasticsearch.ElasticSearchClient; import org.openmetadata.service.search.indexes.SearchIndex; -import org.openmetadata.service.search.models.IndexMapping; import org.openmetadata.service.search.nlq.NLQService; import org.openmetadata.service.search.nlq.NLQServiceFactory; import org.openmetadata.service.search.opensearch.OpenSearchClient; import org.openmetadata.service.security.policyevaluator.SubjectContext; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.workflows.searchIndex.ReindexingUtil; @Slf4j @@ -194,32 +195,8 @@ public class SearchRepository { } private void loadIndexMappings() { - Set entities; - entityIndexMap = new HashMap<>(); - try (InputStream in = getClass().getResourceAsStream("/elasticsearch/indexMapping.json")) { - assert in != null; - JsonObject jsonPayload = JsonUtils.readJson(new String(in.readAllBytes())).asJsonObject(); - entities = jsonPayload.keySet(); - for (String s : entities) { - entityIndexMap.put( - s, JsonUtils.readValue(jsonPayload.get(s).toString(), IndexMapping.class)); - } - } catch (Exception e) { - throw new UnhandledServerException("Failed to load indexMapping.json", e); - } - try (InputStream in2 = - getClass().getResourceAsStream("/elasticsearch/collate/indexMapping.json")) { - if (in2 != null) { - JsonObject jsonPayload = JsonUtils.readJson(new String(in2.readAllBytes())).asJsonObject(); - entities = jsonPayload.keySet(); - for (String s : entities) { - entityIndexMap.put( - s, JsonUtils.readValue(jsonPayload.get(s).toString(), IndexMapping.class)); - } - } - } catch (Exception e) { - LOG.warn("Failed to load indexMapping.json"); - } + IndexMappingLoader mappingLoader = IndexMappingLoader.getInstance(); + entityIndexMap = mappingLoader.getIndexMapping(); } public SearchClient buildSearchClient(ElasticSearchConfiguration config) { @@ -380,7 +357,7 @@ public class SearchRepository { public void createEntitiesIndex(List entities) { if (!nullOrEmpty(entities)) { // All entities in the list are of the same type - String entityType = entities.get(0).getEntityReference().getType(); + String entityType = entities.getFirst().getEntityReference().getType(); IndexMapping indexMapping = entityIndexMap.get(entityType); List> docs = new ArrayList<>(); for (EntityInterface entity : entities) { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchUtils.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchUtils.java index 402973edd90..3b192a2bd22 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchUtils.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchUtils.java @@ -24,12 +24,12 @@ import org.openmetadata.schema.api.lineage.RelationshipRef; import org.openmetadata.schema.api.search.SearchSettings; import org.openmetadata.schema.service.configuration.elasticsearch.ElasticSearchConfiguration; import org.openmetadata.schema.settings.SettingsType; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.settings.SettingsCache; import org.openmetadata.service.search.security.RBACConditionEvaluator; import org.openmetadata.service.security.policyevaluator.SubjectContext; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.SSLUtil; public final class SearchUtils { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ESLineageGraphBuilder.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ESLineageGraphBuilder.java index 5354942ed47..45c4c9c771b 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ESLineageGraphBuilder.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ESLineageGraphBuilder.java @@ -34,8 +34,8 @@ import org.openmetadata.schema.api.lineage.SearchLineageRequest; import org.openmetadata.schema.api.lineage.SearchLineageResult; import org.openmetadata.schema.type.LayerPaging; import org.openmetadata.schema.type.lineage.NodeInformation; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class ESLineageGraphBuilder { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchClient.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchClient.java index dbdf35d826d..63a9eefb7c1 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchClient.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchClient.java @@ -148,8 +148,10 @@ import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.LayerPaging; import org.openmetadata.schema.type.lineage.NodeInformation; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.sdk.exception.SearchException; import org.openmetadata.sdk.exception.SearchIndexNotFoundException; +import org.openmetadata.search.IndexMapping; import org.openmetadata.service.Entity; import org.openmetadata.service.dataInsight.DataInsightAggregatorInterface; import org.openmetadata.service.jdbi3.DataInsightChartRepository; @@ -181,14 +183,12 @@ import org.openmetadata.service.search.elasticsearch.dataInsightAggregators.Elas import org.openmetadata.service.search.elasticsearch.dataInsightAggregators.QueryCostRecordsAggregator; import org.openmetadata.service.search.elasticsearch.queries.ElasticQueryBuilder; import org.openmetadata.service.search.elasticsearch.queries.ElasticQueryBuilderFactory; -import org.openmetadata.service.search.models.IndexMapping; import org.openmetadata.service.search.nlq.NLQService; import org.openmetadata.service.search.queries.OMQueryBuilder; import org.openmetadata.service.search.queries.QueryBuilderFactory; import org.openmetadata.service.search.security.RBACConditionEvaluator; import org.openmetadata.service.security.policyevaluator.SubjectContext; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.workflows.searchIndex.ReindexingUtil; @Slf4j @@ -2526,8 +2526,7 @@ public class ElasticSearchClient implements SearchClient { es.org.elasticsearch.client.Response catResponse = client.getLowLevelClient().performRequest(catRequest); String responseBody = org.apache.http.util.EntityUtils.toString(catResponse.getEntity()); - com.fasterxml.jackson.databind.JsonNode indices = - org.openmetadata.service.util.JsonUtils.readTree(responseBody); + com.fasterxml.jackson.databind.JsonNode indices = JsonUtils.readTree(responseBody); if (!indices.isArray()) { LOG.warn("No indices found matching pattern: {}", indexPattern); return; @@ -2566,8 +2565,7 @@ public class ElasticSearchClient implements SearchClient { es.org.elasticsearch.client.Response getResponse = client.getLowLevelClient().performRequest(getRequest); String responseBody = org.apache.http.util.EntityUtils.toString(getResponse.getEntity()); - com.fasterxml.jackson.databind.JsonNode templateNode = - org.openmetadata.service.util.JsonUtils.readTree(responseBody); + com.fasterxml.jackson.databind.JsonNode templateNode = JsonUtils.readTree(responseBody); if (!templateNode.has("component_templates") || templateNode.get("component_templates").isEmpty()) { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchEntitiesProcessor.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchEntitiesProcessor.java index 13313aeb034..7202d4f1a8e 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchEntitiesProcessor.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchEntitiesProcessor.java @@ -15,10 +15,10 @@ import org.openmetadata.common.utils.CommonUtil; import org.openmetadata.schema.EntityInterface; import org.openmetadata.schema.system.IndexingError; import org.openmetadata.schema.system.StepStats; +import org.openmetadata.schema.utils.JsonUtils; +import org.openmetadata.search.IndexMapping; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.SearchIndexException; -import org.openmetadata.service.search.models.IndexMapping; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.workflows.interfaces.Processor; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchEntityTimeSeriesProcessor.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchEntityTimeSeriesProcessor.java index f5902350232..00342fb9c15 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchEntityTimeSeriesProcessor.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchEntityTimeSeriesProcessor.java @@ -15,10 +15,10 @@ import org.openmetadata.common.utils.CommonUtil; import org.openmetadata.schema.EntityTimeSeriesInterface; import org.openmetadata.schema.system.IndexingError; import org.openmetadata.schema.system.StepStats; +import org.openmetadata.schema.utils.JsonUtils; +import org.openmetadata.search.IndexMapping; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.SearchIndexException; -import org.openmetadata.service.search.models.IndexMapping; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.workflows.interfaces.Processor; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchIndexSink.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchIndexSink.java index dedd9ac74cf..fb105e8b0af 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchIndexSink.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchIndexSink.java @@ -19,9 +19,9 @@ import org.glassfish.jersey.internal.util.ExceptionUtils; import org.openmetadata.schema.system.EntityError; import org.openmetadata.schema.system.IndexingError; import org.openmetadata.schema.system.StepStats; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.exception.SearchIndexException; import org.openmetadata.service.search.SearchRepository; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.workflows.interfaces.Sink; @Slf4j diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/dataInsightAggregators/ElasticSearchLineChartAggregator.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/dataInsightAggregators/ElasticSearchLineChartAggregator.java index 7d7e80da22d..3e9d83f65b2 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/dataInsightAggregators/ElasticSearchLineChartAggregator.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/dataInsightAggregators/ElasticSearchLineChartAggregator.java @@ -27,8 +27,8 @@ import org.openmetadata.schema.dataInsight.custom.DataInsightCustomChartResultLi import org.openmetadata.schema.dataInsight.custom.FormulaHolder; import org.openmetadata.schema.dataInsight.custom.LineChart; import org.openmetadata.schema.dataInsight.custom.LineChartMetric; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.jdbi3.DataInsightSystemChartRepository; -import org.openmetadata.service.util.JsonUtils; public class ElasticSearchLineChartAggregator implements ElasticSearchDynamicChartAggregatorInterface { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/dataInsightAggregators/ElasticSearchSummaryCardAggregator.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/dataInsightAggregators/ElasticSearchSummaryCardAggregator.java index a37adb8f1af..ad4876fe638 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/dataInsightAggregators/ElasticSearchSummaryCardAggregator.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/dataInsightAggregators/ElasticSearchSummaryCardAggregator.java @@ -21,8 +21,8 @@ import org.openmetadata.schema.dataInsight.custom.DataInsightCustomChartResult; import org.openmetadata.schema.dataInsight.custom.DataInsightCustomChartResultList; import org.openmetadata.schema.dataInsight.custom.FormulaHolder; import org.openmetadata.schema.dataInsight.custom.SummaryCard; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.jdbi3.DataInsightSystemChartRepository; -import org.openmetadata.service.util.JsonUtils; public class ElasticSearchSummaryCardAggregator implements ElasticSearchDynamicChartAggregatorInterface { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/EntityReportDataIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/EntityReportDataIndex.java index 2919a13c7d7..e0be6e40e52 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/EntityReportDataIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/EntityReportDataIndex.java @@ -2,7 +2,7 @@ package org.openmetadata.service.search.indexes; import java.util.Map; import org.openmetadata.schema.analytics.ReportData; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; public record EntityReportDataIndex(ReportData reportData) implements SearchIndex { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/IngestionPipelineIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/IngestionPipelineIndex.java index f40f7a11298..bcf7fd82bb2 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/IngestionPipelineIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/IngestionPipelineIndex.java @@ -7,9 +7,9 @@ import java.util.Set; import org.json.JSONObject; import org.openmetadata.schema.entity.services.ingestionPipelines.AirflowConfig; import org.openmetadata.schema.entity.services.ingestionPipelines.IngestionPipeline; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.search.ParseTags; -import org.openmetadata.service.util.JsonUtils; public class IngestionPipelineIndex implements SearchIndex { final IngestionPipeline ingestionPipeline; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/RawCostAnalysisReportDataIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/RawCostAnalysisReportDataIndex.java index ac7fecdb83e..4468a36e5c0 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/RawCostAnalysisReportDataIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/RawCostAnalysisReportDataIndex.java @@ -2,7 +2,7 @@ package org.openmetadata.service.search.indexes; import java.util.Map; import org.openmetadata.schema.analytics.ReportData; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; public record RawCostAnalysisReportDataIndex(ReportData reportData) implements SearchIndex { @Override diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/ReportDataIndexes.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/ReportDataIndexes.java index 432351fbf22..e81ec7e375e 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/ReportDataIndexes.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/ReportDataIndexes.java @@ -2,7 +2,7 @@ package org.openmetadata.service.search.indexes; import java.util.Map; import org.openmetadata.schema.analytics.ReportData; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; public record ReportDataIndexes(ReportData reportData) implements SearchIndex { @Override diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/SearchIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/SearchIndex.java index 87374d8101d..a203626473a 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/SearchIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/SearchIndex.java @@ -36,15 +36,15 @@ import org.openmetadata.schema.type.Relationship; import org.openmetadata.schema.type.TableConstraint; import org.openmetadata.schema.type.TagLabel; import org.openmetadata.schema.type.change.ChangeSummary; +import org.openmetadata.schema.utils.JsonUtils; +import org.openmetadata.search.IndexMapping; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.EntityNotFoundException; import org.openmetadata.service.jdbi3.CollectionDAO; import org.openmetadata.service.search.ParseTags; import org.openmetadata.service.search.SearchClient; import org.openmetadata.service.search.SearchIndexUtils; -import org.openmetadata.service.search.models.IndexMapping; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; public interface SearchIndex { Set DEFAULT_EXCLUDED_FIELDS = diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TestCaseResultIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TestCaseResultIndex.java index 31f8acd5c05..537519ea7fe 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TestCaseResultIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TestCaseResultIndex.java @@ -10,10 +10,10 @@ import org.openmetadata.schema.tests.TestDefinition; import org.openmetadata.schema.tests.type.TestCaseResult; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.feeds.MessageParser; import org.openmetadata.service.search.SearchIndexUtils; -import org.openmetadata.service.util.JsonUtils; public record TestCaseResultIndex(TestCaseResult testCaseResult) implements SearchIndex { private static final Set excludeFields = diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/WebAnalyticEntityViewReportDataIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/WebAnalyticEntityViewReportDataIndex.java index 904dd0ed77b..e8d6981a592 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/WebAnalyticEntityViewReportDataIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/WebAnalyticEntityViewReportDataIndex.java @@ -2,7 +2,7 @@ package org.openmetadata.service.search.indexes; import java.util.Map; import org.openmetadata.schema.analytics.ReportData; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; public record WebAnalyticEntityViewReportDataIndex(ReportData reportData) implements SearchIndex { @Override diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/WebAnalyticUserActivityReportDataIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/WebAnalyticUserActivityReportDataIndex.java index ad8234beccc..a22b5a50597 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/WebAnalyticUserActivityReportDataIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/WebAnalyticUserActivityReportDataIndex.java @@ -2,7 +2,7 @@ package org.openmetadata.service.search.indexes; import java.util.Map; import org.openmetadata.schema.analytics.ReportData; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; public record WebAnalyticUserActivityReportDataIndex(ReportData reportData) implements SearchIndex { @Override diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OSLineageGraphBuilder.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OSLineageGraphBuilder.java index 60d98d7634e..a0475a8c693 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OSLineageGraphBuilder.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OSLineageGraphBuilder.java @@ -28,8 +28,8 @@ import org.openmetadata.schema.api.lineage.SearchLineageRequest; import org.openmetadata.schema.api.lineage.SearchLineageResult; import org.openmetadata.schema.type.LayerPaging; import org.openmetadata.schema.type.lineage.NodeInformation; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import os.org.opensearch.action.search.SearchResponse; import os.org.opensearch.client.RequestOptions; import os.org.opensearch.client.RestHighLevelClient; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchClient.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchClient.java index fc2282aeab8..c640ab3af9f 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchClient.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchClient.java @@ -85,8 +85,10 @@ import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.LayerPaging; import org.openmetadata.schema.type.lineage.NodeInformation; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.sdk.exception.SearchException; import org.openmetadata.sdk.exception.SearchIndexNotFoundException; +import org.openmetadata.search.IndexMapping; import org.openmetadata.service.Entity; import org.openmetadata.service.dataInsight.DataInsightAggregatorInterface; import org.openmetadata.service.jdbi3.DataInsightChartRepository; @@ -101,7 +103,6 @@ import org.openmetadata.service.search.SearchHealthStatus; import org.openmetadata.service.search.SearchIndexUtils; import org.openmetadata.service.search.SearchResultListMapper; import org.openmetadata.service.search.SearchSortFilter; -import org.openmetadata.service.search.models.IndexMapping; import org.openmetadata.service.search.nlq.NLQService; import org.openmetadata.service.search.opensearch.aggregations.OpenAggregations; import org.openmetadata.service.search.opensearch.aggregations.OpenAggregationsBuilder; @@ -125,7 +126,6 @@ import org.openmetadata.service.search.queries.QueryBuilderFactory; import org.openmetadata.service.search.security.RBACConditionEvaluator; import org.openmetadata.service.security.policyevaluator.SubjectContext; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.workflows.searchIndex.ReindexingUtil; import os.org.opensearch.OpenSearchException; import os.org.opensearch.OpenSearchStatusException; @@ -2646,8 +2646,7 @@ public class OpenSearchClient implements SearchClient { os.org.opensearch.client.Response catResponse = client.getLowLevelClient().performRequest(catRequest); String responseBody = org.apache.http.util.EntityUtils.toString(catResponse.getEntity()); - com.fasterxml.jackson.databind.JsonNode indices = - org.openmetadata.service.util.JsonUtils.readTree(responseBody); + com.fasterxml.jackson.databind.JsonNode indices = JsonUtils.readTree(responseBody); if (!indices.isArray()) { LOG.warn("No indices found matching pattern: {}", indexPattern); return; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchEntitiesProcessor.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchEntitiesProcessor.java index be66b53eeed..d8fc4ce2144 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchEntitiesProcessor.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchEntitiesProcessor.java @@ -12,10 +12,10 @@ import org.openmetadata.common.utils.CommonUtil; import org.openmetadata.schema.EntityInterface; import org.openmetadata.schema.system.IndexingError; import org.openmetadata.schema.system.StepStats; +import org.openmetadata.schema.utils.JsonUtils; +import org.openmetadata.search.IndexMapping; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.SearchIndexException; -import org.openmetadata.service.search.models.IndexMapping; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.workflows.interfaces.Processor; import os.org.opensearch.action.bulk.BulkRequest; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchEntityTimeSeriesProcessor.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchEntityTimeSeriesProcessor.java index 8a6a79f12f0..ed92996760d 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchEntityTimeSeriesProcessor.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchEntityTimeSeriesProcessor.java @@ -12,10 +12,10 @@ import org.openmetadata.common.utils.CommonUtil; import org.openmetadata.schema.EntityTimeSeriesInterface; import org.openmetadata.schema.system.IndexingError; import org.openmetadata.schema.system.StepStats; +import org.openmetadata.schema.utils.JsonUtils; +import org.openmetadata.search.IndexMapping; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.SearchIndexException; -import org.openmetadata.service.search.models.IndexMapping; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.workflows.interfaces.Processor; import os.org.opensearch.action.bulk.BulkRequest; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchIndexSink.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchIndexSink.java index 205b65cf3ea..fe6f7d957c0 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchIndexSink.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchIndexSink.java @@ -15,9 +15,9 @@ import org.glassfish.jersey.internal.util.ExceptionUtils; import org.openmetadata.schema.system.EntityError; import org.openmetadata.schema.system.IndexingError; import org.openmetadata.schema.system.StepStats; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.exception.SearchIndexException; import org.openmetadata.service.search.SearchRepository; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.workflows.interfaces.Sink; import os.org.opensearch.action.DocWriteRequest; import os.org.opensearch.action.bulk.BulkRequest; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/dataInsightAggregator/OpenSearchLineChartAggregator.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/dataInsightAggregator/OpenSearchLineChartAggregator.java index 6b87b300f36..488c8b7d1d9 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/dataInsightAggregator/OpenSearchLineChartAggregator.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/dataInsightAggregator/OpenSearchLineChartAggregator.java @@ -13,9 +13,9 @@ import org.openmetadata.schema.dataInsight.custom.DataInsightCustomChartResultLi import org.openmetadata.schema.dataInsight.custom.FormulaHolder; import org.openmetadata.schema.dataInsight.custom.LineChart; import org.openmetadata.schema.dataInsight.custom.LineChartMetric; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.jdbi3.DataInsightSystemChartRepository; import org.openmetadata.service.search.elasticsearch.dataInsightAggregators.ElasticSearchDynamicChartAggregatorInterface; -import org.openmetadata.service.util.JsonUtils; import os.org.opensearch.action.search.SearchRequest; import os.org.opensearch.action.search.SearchResponse; import os.org.opensearch.index.query.QueryBuilder; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/dataInsightAggregator/OpenSearchSummaryCardAggregator.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/dataInsightAggregator/OpenSearchSummaryCardAggregator.java index c80d09ce08f..35468c4b1a0 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/dataInsightAggregator/OpenSearchSummaryCardAggregator.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/dataInsightAggregator/OpenSearchSummaryCardAggregator.java @@ -11,8 +11,8 @@ import org.openmetadata.schema.dataInsight.custom.DataInsightCustomChartResult; import org.openmetadata.schema.dataInsight.custom.DataInsightCustomChartResultList; import org.openmetadata.schema.dataInsight.custom.FormulaHolder; import org.openmetadata.schema.dataInsight.custom.SummaryCard; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.jdbi3.DataInsightSystemChartRepository; -import org.openmetadata.service.util.JsonUtils; import os.org.opensearch.action.search.SearchRequest; import os.org.opensearch.action.search.SearchResponse; import os.org.opensearch.index.query.QueryBuilder; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/AirflowConnectionClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/AirflowConnectionClassConverter.java index 0ac6283a394..76d7e09ff5b 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/AirflowConnectionClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/AirflowConnectionClassConverter.java @@ -20,7 +20,7 @@ import org.openmetadata.schema.services.connections.database.PostgresConnection; import org.openmetadata.schema.services.connections.database.SQLiteConnection; import org.openmetadata.schema.services.connections.pipeline.AirflowConnection; import org.openmetadata.schema.services.connections.pipeline.BackendConnection; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** Converter class to get an `AirflowConnection` object. */ public class AirflowConnectionClassConverter extends ClassConverter { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/BigQueryConnectionClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/BigQueryConnectionClassConverter.java index 50a4617e994..0008e46df0e 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/BigQueryConnectionClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/BigQueryConnectionClassConverter.java @@ -16,7 +16,7 @@ package org.openmetadata.service.secrets.converter; import java.util.List; import org.openmetadata.schema.security.credentials.GCPCredentials; import org.openmetadata.schema.services.connections.database.BigQueryConnection; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** Converter class to get an `DbtGCSConfig` object. */ public class BigQueryConnectionClassConverter extends ClassConverter { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/BigTableConnectionClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/BigTableConnectionClassConverter.java index b26383645d1..a7461da8101 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/BigTableConnectionClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/BigTableConnectionClassConverter.java @@ -16,7 +16,7 @@ package org.openmetadata.service.secrets.converter; import java.util.List; import org.openmetadata.schema.security.credentials.GCPCredentials; import org.openmetadata.schema.services.connections.database.BigTableConnection; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** Converter class to get an `BigTableConnection` object. */ public class BigTableConnectionClassConverter extends ClassConverter { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/CassandraConnectionClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/CassandraConnectionClassConverter.java index 9e8370f7a04..b17e067783a 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/CassandraConnectionClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/CassandraConnectionClassConverter.java @@ -17,7 +17,7 @@ import java.util.List; import org.openmetadata.schema.services.connections.database.CassandraConnection; import org.openmetadata.schema.services.connections.database.cassandra.CloudConfig; import org.openmetadata.schema.services.connections.database.common.basicAuth; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** * Converter class to get an `CassandraConnection` object. diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/ClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/ClassConverter.java index 4dd1befd848..b3d627c6c84 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/ClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/ClassConverter.java @@ -16,7 +16,7 @@ package org.openmetadata.service.secrets.converter; import java.util.List; import java.util.Objects; import java.util.Optional; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** * Currently when an object is converted into a specific class using `JsonUtils.convertValue` there`Object` fields that diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/CockroachConnectionClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/CockroachConnectionClassConverter.java index 67b545a541f..462ce17fcdf 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/CockroachConnectionClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/CockroachConnectionClassConverter.java @@ -4,7 +4,7 @@ import java.util.List; import org.openmetadata.schema.security.ssl.ValidateSSLClientConfig; import org.openmetadata.schema.services.connections.database.CockroachConnection; import org.openmetadata.schema.services.connections.database.common.basicAuth; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** * Converter class to get an `CockroachConnection` object. diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/DatalakeConnectionClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/DatalakeConnectionClassConverter.java index d4a1d012fed..f9390b7402f 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/DatalakeConnectionClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/DatalakeConnectionClassConverter.java @@ -18,7 +18,7 @@ import org.openmetadata.schema.services.connections.database.DatalakeConnection; import org.openmetadata.schema.services.connections.database.datalake.AzureConfig; import org.openmetadata.schema.services.connections.database.datalake.GCSConfig; import org.openmetadata.schema.services.connections.database.datalake.S3Config; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** Converter class to get an `DatalakeConnection` object. */ public class DatalakeConnectionClassConverter extends ClassConverter { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/DbtGCSConfigClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/DbtGCSConfigClassConverter.java index 1b129feefad..61451f51c9f 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/DbtGCSConfigClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/DbtGCSConfigClassConverter.java @@ -16,7 +16,7 @@ package org.openmetadata.service.secrets.converter; import java.util.List; import org.openmetadata.schema.metadataIngestion.dbtconfig.DbtGCSConfig; import org.openmetadata.schema.security.credentials.GCPCredentials; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** Converter class to get an `DbtGCSConfig` object. */ public class DbtGCSConfigClassConverter extends ClassConverter { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/DbtPipelineClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/DbtPipelineClassConverter.java index 032ad011713..66d770df73d 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/DbtPipelineClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/DbtPipelineClassConverter.java @@ -21,7 +21,7 @@ import org.openmetadata.schema.metadataIngestion.dbtconfig.DbtGCSConfig; import org.openmetadata.schema.metadataIngestion.dbtconfig.DbtHttpConfig; import org.openmetadata.schema.metadataIngestion.dbtconfig.DbtLocalConfig; import org.openmetadata.schema.metadataIngestion.dbtconfig.DbtS3Config; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** Converter class to get an `DbtPipeline` object. */ public class DbtPipelineClassConverter extends ClassConverter { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/DeltaLakeConnectionClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/DeltaLakeConnectionClassConverter.java index bdc9faae76e..8613a727d1b 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/DeltaLakeConnectionClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/DeltaLakeConnectionClassConverter.java @@ -17,7 +17,7 @@ import java.util.List; import org.openmetadata.schema.services.connections.database.DeltaLakeConnection; import org.openmetadata.schema.services.connections.database.deltalake.MetastoreConfig; import org.openmetadata.schema.services.connections.database.deltalake.StorageConfig; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** Converter class to get an `DeltaLakeConnection` object. */ public class DeltaLakeConnectionClassConverter extends ClassConverter { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/DorisConnectionClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/DorisConnectionClassConverter.java index f4d922cb28d..e7b2fd9a665 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/DorisConnectionClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/DorisConnectionClassConverter.java @@ -18,7 +18,7 @@ import org.openmetadata.schema.security.ssl.ValidateSSLClientConfig; import org.openmetadata.schema.services.connections.database.DorisConnection; import org.openmetadata.schema.services.connections.database.common.IamAuthConfig; import org.openmetadata.schema.services.connections.database.common.basicAuth; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** * Converter class to get an `DatalakeConnection` object. diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/ElasticSearchConnectionClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/ElasticSearchConnectionClassConverter.java index 0ea9ad23727..573dbac71c6 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/ElasticSearchConnectionClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/ElasticSearchConnectionClassConverter.java @@ -17,7 +17,7 @@ import java.util.List; import org.openmetadata.schema.services.connections.search.ElasticSearchConnection; import org.openmetadata.schema.services.connections.search.elasticSearch.ESAPIAuth; import org.openmetadata.schema.services.connections.search.elasticSearch.ESBasicAuth; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** Converter class to get an `ElasticSearchConnection` object. */ public class ElasticSearchConnectionClassConverter extends ClassConverter { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/GCPConfigClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/GCPConfigClassConverter.java index 779c22b77b4..40685bf63f2 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/GCPConfigClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/GCPConfigClassConverter.java @@ -16,7 +16,7 @@ package org.openmetadata.service.secrets.converter; import java.util.List; import org.openmetadata.schema.security.credentials.GCPCredentials; import org.openmetadata.schema.services.connections.database.datalake.GCSConfig; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** Converter class to get an `GCSConfig` object. */ public class GCPConfigClassConverter extends ClassConverter { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/GcpConnectionClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/GcpConnectionClassConverter.java index e480d6c2e1d..523b1ac7319 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/GcpConnectionClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/GcpConnectionClassConverter.java @@ -16,7 +16,7 @@ package org.openmetadata.service.secrets.converter; import java.util.List; import org.openmetadata.schema.security.credentials.GCPCredentials; import org.openmetadata.schema.services.connections.storage.GCSConnection; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** Converter class to get an `GCSConnection` object. */ public class GcpConnectionClassConverter extends ClassConverter { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/GcpCredentialsClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/GcpCredentialsClassConverter.java index 1287e896547..06a0ff41c5c 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/GcpCredentialsClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/GcpCredentialsClassConverter.java @@ -16,7 +16,7 @@ package org.openmetadata.service.secrets.converter; import java.util.List; import org.openmetadata.schema.security.credentials.GCPCredentials; import org.openmetadata.schema.security.credentials.GCPValues; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** Converter class to get an `GCPCredentials` object. */ public class GcpCredentialsClassConverter extends ClassConverter { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/GreenplumConnectionClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/GreenplumConnectionClassConverter.java index 34bd1d76422..4a9d1880345 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/GreenplumConnectionClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/GreenplumConnectionClassConverter.java @@ -18,7 +18,7 @@ import org.openmetadata.schema.security.ssl.ValidateSSLClientConfig; import org.openmetadata.schema.services.connections.database.GreenplumConnection; import org.openmetadata.schema.services.connections.database.common.IamAuthConfig; import org.openmetadata.schema.services.connections.database.common.basicAuth; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** * Converter class to get an `GreenplumConnection` object. diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/HiveConnectionClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/HiveConnectionClassConverter.java index 4eeec5d82cd..ad266c57578 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/HiveConnectionClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/HiveConnectionClassConverter.java @@ -17,7 +17,7 @@ import java.util.List; import org.openmetadata.schema.services.connections.database.HiveConnection; import org.openmetadata.schema.services.connections.database.MysqlConnection; import org.openmetadata.schema.services.connections.database.PostgresConnection; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** Converter class to get an `DatalakeConnection` object. */ public class HiveConnectionClassConverter extends ClassConverter { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/IcebergConnectionClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/IcebergConnectionClassConverter.java index 1b8dacd9ce7..959962a4633 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/IcebergConnectionClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/IcebergConnectionClassConverter.java @@ -20,7 +20,7 @@ import org.openmetadata.schema.services.connections.database.iceberg.GlueCatalog import org.openmetadata.schema.services.connections.database.iceberg.HiveCatalogConnection; import org.openmetadata.schema.services.connections.database.iceberg.IcebergCatalog; import org.openmetadata.schema.services.connections.database.iceberg.RestCatalogConnection; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** Converter class to get an `IcebergConnection` object. */ public class IcebergConnectionClassConverter extends ClassConverter { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/IcebergFileSystemClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/IcebergFileSystemClassConverter.java index a9a78080f15..8da41dfaa4a 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/IcebergFileSystemClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/IcebergFileSystemClassConverter.java @@ -17,7 +17,7 @@ import java.util.List; import org.openmetadata.schema.security.credentials.AWSCredentials; import org.openmetadata.schema.security.credentials.AzureCredentials; import org.openmetadata.schema.services.connections.database.iceberg.IcebergFileSystem; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** Converter class to get an `IcebergConnection` object. */ public class IcebergFileSystemClassConverter extends ClassConverter { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/LookerConnectionClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/LookerConnectionClassConverter.java index 6abc1e1cdbc..b78f24219f6 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/LookerConnectionClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/LookerConnectionClassConverter.java @@ -5,7 +5,7 @@ import org.openmetadata.schema.security.credentials.BitBucketCredentials; import org.openmetadata.schema.security.credentials.GitHubCredentials; import org.openmetadata.schema.security.credentials.GitlabCredentials; import org.openmetadata.schema.services.connections.dashboard.LookerConnection; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; public class LookerConnectionClassConverter extends ClassConverter { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/MatillionConnectionClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/MatillionConnectionClassConverter.java index 90b4a572fc3..d6e0d797e15 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/MatillionConnectionClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/MatillionConnectionClassConverter.java @@ -16,7 +16,7 @@ package org.openmetadata.service.secrets.converter; import java.util.List; import org.openmetadata.schema.services.connections.pipeline.MatillionConnection; import org.openmetadata.schema.services.connections.pipeline.matillion.MatillionETLAuth; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** Converter class to get an `MatillionConnection` object. */ public class MatillionConnectionClassConverter extends ClassConverter { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/MysqlConnectionClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/MysqlConnectionClassConverter.java index e85a4bafe22..5f28b943358 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/MysqlConnectionClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/MysqlConnectionClassConverter.java @@ -19,7 +19,7 @@ import org.openmetadata.schema.services.connections.database.MysqlConnection; import org.openmetadata.schema.services.connections.database.common.AzureConfig; import org.openmetadata.schema.services.connections.database.common.IamAuthConfig; import org.openmetadata.schema.services.connections.database.common.basicAuth; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** * Converter class to get an `DatalakeConnection` object. diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/NifiConnectionClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/NifiConnectionClassConverter.java index 234456b3963..41a32673923 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/NifiConnectionClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/NifiConnectionClassConverter.java @@ -17,7 +17,7 @@ import java.util.List; import org.openmetadata.schema.services.connections.pipeline.NifiConnection; import org.openmetadata.schema.services.connections.pipeline.nifi.BasicAuth; import org.openmetadata.schema.services.connections.pipeline.nifi.ClientCertificateAuth; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** Converter class to get an `NifiConnection` object. */ public class NifiConnectionClassConverter extends ClassConverter { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/PostgresConnectionClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/PostgresConnectionClassConverter.java index a112ccf41fa..ab2a82c3b2f 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/PostgresConnectionClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/PostgresConnectionClassConverter.java @@ -19,7 +19,7 @@ import org.openmetadata.schema.services.connections.database.PostgresConnection; import org.openmetadata.schema.services.connections.database.common.AzureConfig; import org.openmetadata.schema.services.connections.database.common.IamAuthConfig; import org.openmetadata.schema.services.connections.database.common.basicAuth; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** * Converter class to get an `Postgres` object. diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/RedshiftConnectionClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/RedshiftConnectionClassConverter.java index 48323caa2a6..01434eace42 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/RedshiftConnectionClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/RedshiftConnectionClassConverter.java @@ -16,7 +16,7 @@ package org.openmetadata.service.secrets.converter; import java.util.List; import org.openmetadata.schema.security.ssl.ValidateSSLClientConfig; import org.openmetadata.schema.services.connections.database.RedshiftConnection; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** * Converter class to get an `DatalakeConnection` object. diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/SSOAuthMechanismClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/SSOAuthMechanismClassConverter.java index a757ed41446..254c0106cd8 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/SSOAuthMechanismClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/SSOAuthMechanismClassConverter.java @@ -20,7 +20,7 @@ import org.openmetadata.schema.security.client.AzureSSOClientConfig; import org.openmetadata.schema.security.client.CustomOIDCSSOClientConfig; import org.openmetadata.schema.security.client.GoogleSSOClientConfig; import org.openmetadata.schema.security.client.OktaSSOClientConfig; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** Converter class to get an `SSOAuthMechanism` object. */ public class SSOAuthMechanismClassConverter extends ClassConverter { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/SalesforceConnectorClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/SalesforceConnectorClassConverter.java index cbe193fd93e..bef926080ed 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/SalesforceConnectorClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/SalesforceConnectorClassConverter.java @@ -16,7 +16,7 @@ package org.openmetadata.service.secrets.converter; import java.util.List; import org.openmetadata.schema.security.ssl.ValidateSSLClientConfig; import org.openmetadata.schema.services.connections.database.SalesforceConnection; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** * Converter class to get an `Salesforce` object. diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/SapHanaConnectionClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/SapHanaConnectionClassConverter.java index 287f944d60a..d6fd6305cc4 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/SapHanaConnectionClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/SapHanaConnectionClassConverter.java @@ -17,7 +17,7 @@ import java.util.List; import org.openmetadata.schema.services.connections.database.SapHanaConnection; import org.openmetadata.schema.services.connections.database.sapHana.SapHanaHDBConnection; import org.openmetadata.schema.services.connections.database.sapHana.SapHanaSQLConnection; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** Converter class to get an `Sap Hana` object. */ public class SapHanaConnectionClassConverter extends ClassConverter { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/SsisConnectionClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/SsisConnectionClassConverter.java index 5e4e7416e5f..8af62d133df 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/SsisConnectionClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/SsisConnectionClassConverter.java @@ -3,7 +3,7 @@ package org.openmetadata.service.secrets.converter; import java.util.List; import org.openmetadata.schema.services.connections.pipeline.SSISConnection; import org.openmetadata.schema.services.connections.storage.S3Connection; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** Converter class to get an `SsisConnection` object. */ public class SsisConnectionClassConverter extends ClassConverter { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/StorageConfigClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/StorageConfigClassConverter.java index d5be8e81d82..ff22822839b 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/StorageConfigClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/StorageConfigClassConverter.java @@ -3,7 +3,7 @@ package org.openmetadata.service.secrets.converter; import java.util.List; import org.openmetadata.schema.services.connections.database.datalake.S3Config; import org.openmetadata.schema.services.connections.database.deltalake.StorageConfig; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** Converter class to get an `StorageConfig` object for DeltaLakeConnection. */ public class StorageConfigClassConverter extends ClassConverter { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/SupersetConnectionClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/SupersetConnectionClassConverter.java index de4daf3a112..b1993881087 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/SupersetConnectionClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/SupersetConnectionClassConverter.java @@ -18,7 +18,7 @@ import org.openmetadata.schema.entity.utils.SupersetApiConnection; import org.openmetadata.schema.services.connections.dashboard.SupersetConnection; import org.openmetadata.schema.services.connections.database.MysqlConnection; import org.openmetadata.schema.services.connections.database.PostgresConnection; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** Converter class to get an `SupersetConnection` object. */ public class SupersetConnectionClassConverter extends ClassConverter { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/TableauConnectionClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/TableauConnectionClassConverter.java index eba9cbe6ce0..79555d0de0d 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/TableauConnectionClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/TableauConnectionClassConverter.java @@ -4,7 +4,7 @@ import java.util.List; import org.openmetadata.schema.security.credentials.AccessTokenAuth; import org.openmetadata.schema.security.credentials.BasicAuth; import org.openmetadata.schema.services.connections.dashboard.TableauConnection; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; public class TableauConnectionClassConverter extends ClassConverter { private static final List> CONNECTION_CLASSES = diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/TestServiceConnectionRequestClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/TestServiceConnectionRequestClassConverter.java index 97b414d61fd..7e3ab503491 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/TestServiceConnectionRequestClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/TestServiceConnectionRequestClassConverter.java @@ -23,8 +23,8 @@ import org.openmetadata.schema.type.MessagingConnection; import org.openmetadata.schema.type.MlModelConnection; import org.openmetadata.schema.type.PipelineConnection; import org.openmetadata.schema.type.StorageConnection; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.exception.InvalidServiceConnectionException; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ReflectionUtil; /** Converter class to get an `TestServiceConnectionRequest` object. */ diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/TrinoConnectionClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/TrinoConnectionClassConverter.java index cb07e4df21c..4f9434f75d4 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/TrinoConnectionClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/TrinoConnectionClassConverter.java @@ -18,7 +18,7 @@ import org.openmetadata.schema.services.connections.database.TrinoConnection; import org.openmetadata.schema.services.connections.database.common.AzureConfig; import org.openmetadata.schema.services.connections.database.common.basicAuth; import org.openmetadata.schema.services.connections.database.common.jwtAuth; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** Converter class to get an `DatalakeConnection` object. */ public class TrinoConnectionClassConverter extends ClassConverter { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/VertexAIConnectionClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/VertexAIConnectionClassConverter.java index ecdd571f912..26bc8134dbc 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/VertexAIConnectionClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/VertexAIConnectionClassConverter.java @@ -15,7 +15,7 @@ package org.openmetadata.service.secrets.converter; import java.util.List; import org.openmetadata.schema.security.credentials.GCPCredentials; import org.openmetadata.schema.services.connections.mlmodel.VertexAIConnection; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** Converter class to get an `VertexAIConnection` object. */ public class VertexAIConnectionClassConverter extends ClassConverter { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/WorkflowClassConverter.java b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/WorkflowClassConverter.java index e466de49255..3c2ffae6e81 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/WorkflowClassConverter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/secrets/converter/WorkflowClassConverter.java @@ -18,7 +18,7 @@ import org.openmetadata.schema.entity.automations.TestServiceConnectionRequest; import org.openmetadata.schema.entity.automations.Workflow; import org.openmetadata.schema.metadataIngestion.ReverseIngestionPipeline; import org.openmetadata.schema.services.connections.metadata.OpenMetadataConnection; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; /** Converter class to get an `Workflow` object. */ public class WorkflowClassConverter extends ClassConverter { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/security/AuthenticationCodeFlowHandler.java b/openmetadata-service/src/main/java/org/openmetadata/service/security/AuthenticationCodeFlowHandler.java index cf87ef59b38..a325ece3713 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/security/AuthenticationCodeFlowHandler.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/security/AuthenticationCodeFlowHandler.java @@ -92,10 +92,10 @@ import org.openmetadata.schema.auth.ServiceTokenType; import org.openmetadata.schema.entity.teams.User; import org.openmetadata.schema.security.client.OidcClientConfig; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.auth.JwtResponse; import org.openmetadata.service.security.jwt.JWTTokenGenerator; -import org.openmetadata.service.util.JsonUtils; import org.pac4j.core.context.HttpConstants; import org.pac4j.core.exception.TechnicalException; import org.pac4j.core.util.CommonHelper; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/security/auth/BasicAuthenticator.java b/openmetadata-service/src/main/java/org/openmetadata/service/security/auth/BasicAuthenticator.java index 78ec1fe4a5a..6189e31a97a 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/security/auth/BasicAuthenticator.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/security/auth/BasicAuthenticator.java @@ -80,6 +80,7 @@ import org.openmetadata.schema.auth.ServiceTokenType; import org.openmetadata.schema.auth.TokenRefreshRequest; import org.openmetadata.schema.entity.teams.AuthenticationMechanism; import org.openmetadata.schema.entity.teams.User; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.OpenMetadataApplicationConfig; import org.openmetadata.service.auth.JwtResponse; @@ -90,7 +91,6 @@ import org.openmetadata.service.security.AuthenticationException; import org.openmetadata.service.security.SecurityUtil; import org.openmetadata.service.security.jwt.JWTTokenGenerator; import org.openmetadata.service.util.EntityUtil; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.PasswordUtil; import org.openmetadata.service.util.RestUtil.PutResponse; import org.openmetadata.service.util.TokenUtil; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/security/auth/BotTokenCache.java b/openmetadata-service/src/main/java/org/openmetadata/service/security/auth/BotTokenCache.java index 58d998ba733..9fbcda697d1 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/security/auth/BotTokenCache.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/security/auth/BotTokenCache.java @@ -14,13 +14,13 @@ import lombok.extern.slf4j.Slf4j; import org.openmetadata.schema.auth.JWTAuthMechanism; import org.openmetadata.schema.entity.teams.AuthenticationMechanism; import org.openmetadata.schema.entity.teams.User; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.jdbi3.UserRepository; import org.openmetadata.service.resources.teams.UserResource; import org.openmetadata.service.secrets.SecretsManager; import org.openmetadata.service.secrets.SecretsManagerFactory; import org.openmetadata.service.util.EntityUtil.Fields; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class BotTokenCache { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/security/auth/LdapAuthenticator.java b/openmetadata-service/src/main/java/org/openmetadata/service/security/auth/LdapAuthenticator.java index 64c7115b84d..f248c7cd0d3 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/security/auth/LdapAuthenticator.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/security/auth/LdapAuthenticator.java @@ -59,6 +59,7 @@ import org.openmetadata.schema.entity.teams.Role; import org.openmetadata.schema.entity.teams.User; import org.openmetadata.schema.services.connections.metadata.AuthProvider; import org.openmetadata.schema.type.EntityReference; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.OpenMetadataApplicationConfig; import org.openmetadata.service.auth.JwtResponse; @@ -70,7 +71,6 @@ import org.openmetadata.service.jdbi3.UserRepository; import org.openmetadata.service.security.AuthenticationException; import org.openmetadata.service.security.SecurityUtil; import org.openmetadata.service.security.jwt.JWTTokenGenerator; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.LdapUtil; import org.openmetadata.service.util.TokenUtil; import org.openmetadata.service.util.UserUtil; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/security/saml/SamlTokenRefreshServlet.java b/openmetadata-service/src/main/java/org/openmetadata/service/security/saml/SamlTokenRefreshServlet.java index 6e2b5234a23..5f78e79b1dd 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/security/saml/SamlTokenRefreshServlet.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/security/saml/SamlTokenRefreshServlet.java @@ -37,13 +37,13 @@ import org.openmetadata.schema.auth.RefreshToken; import org.openmetadata.schema.auth.ServiceTokenType; import org.openmetadata.schema.auth.TokenRefreshRequest; import org.openmetadata.schema.entity.teams.User; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.auth.JwtResponse; import org.openmetadata.service.exception.CustomExceptionMessage; import org.openmetadata.service.jdbi3.TokenRepository; import org.openmetadata.service.jdbi3.UserRepository; import org.openmetadata.service.security.jwt.JWTTokenGenerator; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.TokenUtil; import org.pac4j.core.exception.TechnicalException; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/util/AppMarketPlaceUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/util/AppMarketPlaceUtil.java index 2a544e750f8..01b2e7542fe 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/util/AppMarketPlaceUtil.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/util/AppMarketPlaceUtil.java @@ -16,6 +16,7 @@ import org.openmetadata.schema.entity.app.CreateAppMarketPlaceDefinitionReq; import org.openmetadata.schema.entity.teams.Role; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.EntityNotFoundException; import org.openmetadata.service.jdbi3.AppMarketPlaceRepository; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/util/EntityUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/util/EntityUtil.java index 22a69cf0507..0c4020ef52a 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/util/EntityUtil.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/util/EntityUtil.java @@ -61,6 +61,7 @@ import org.openmetadata.schema.entity.policies.accessControl.Rule; import org.openmetadata.schema.entity.type.CustomProperty; import org.openmetadata.schema.type.*; import org.openmetadata.schema.type.TagLabel.TagSource; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.exception.EntityNotFoundException; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/util/JsonPatchUtils.java b/openmetadata-service/src/main/java/org/openmetadata/service/util/JsonPatchUtils.java index 105f59995b6..88df8bdd867 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/util/JsonPatchUtils.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/util/JsonPatchUtils.java @@ -31,6 +31,7 @@ import lombok.extern.slf4j.Slf4j; import org.openmetadata.schema.EntityInterface; import org.openmetadata.schema.type.MetadataOperation; import org.openmetadata.schema.type.TagLabel; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.ResourceRegistry; import org.openmetadata.service.security.policyevaluator.ResourceContextInterface; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/util/LdapUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/util/LdapUtil.java index 17dd446f1de..a269e933f27 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/util/LdapUtil.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/util/LdapUtil.java @@ -27,6 +27,7 @@ import org.openmetadata.schema.auth.ldapTrustStoreConfig.CustomTrustManagerConfi import org.openmetadata.schema.auth.ldapTrustStoreConfig.HostNameConfig; import org.openmetadata.schema.auth.ldapTrustStoreConfig.JVMDefaultConfig; import org.openmetadata.schema.auth.ldapTrustStoreConfig.TrustAllConfig; +import org.openmetadata.schema.utils.JsonUtils; public class LdapUtil { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/util/LineageUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/util/LineageUtil.java index e087bd30c84..cc675e02f43 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/util/LineageUtil.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/util/LineageUtil.java @@ -17,9 +17,10 @@ import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.LineageDetails; import org.openmetadata.schema.type.Relationship; +import org.openmetadata.schema.utils.JsonUtils; +import org.openmetadata.search.IndexMapping; import org.openmetadata.service.Entity; import org.openmetadata.service.jdbi3.CollectionDAO; -import org.openmetadata.service.search.models.IndexMapping; public class LineageUtil { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/util/OpenMetadataConnectionBuilder.java b/openmetadata-service/src/main/java/org/openmetadata/service/util/OpenMetadataConnectionBuilder.java index b78b0377f5f..c60d6682d55 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/util/OpenMetadataConnectionBuilder.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/util/OpenMetadataConnectionBuilder.java @@ -30,6 +30,7 @@ import org.openmetadata.schema.security.ssl.ValidateSSLClientConfig; import org.openmetadata.schema.security.ssl.VerifySSL; import org.openmetadata.schema.services.connections.metadata.AuthProvider; import org.openmetadata.schema.services.connections.metadata.OpenMetadataConnection; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.OpenMetadataApplicationConfig; import org.openmetadata.service.exception.EntityNotFoundException; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/util/OpenMetadataOperations.java b/openmetadata-service/src/main/java/org/openmetadata/service/util/OpenMetadataOperations.java index 7375e50b76d..da78466d004 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/util/OpenMetadataOperations.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/util/OpenMetadataOperations.java @@ -64,7 +64,9 @@ import org.openmetadata.schema.settings.SettingsType; import org.openmetadata.schema.system.EventPublisherJob; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.sdk.PipelineServiceClientInterface; +import org.openmetadata.search.IndexMappingLoader; import org.openmetadata.service.Entity; import org.openmetadata.service.OpenMetadataApplicationConfig; import org.openmetadata.service.TypeRegistry; @@ -1232,6 +1234,7 @@ public class OpenMetadataOperations implements Callable { new SubstitutingSourceProvider( new FileConfigurationSourceProvider(), new EnvironmentVariableSubstitutor(false)), configFilePath); + IndexMappingLoader.init(config.getElasticSearchConfiguration()); Fernet.getInstance().setFernetKey(config); DataSourceFactory dataSourceFactory = config.getDataSourceFactory(); if (dataSourceFactory == null) { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/util/UserUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/util/UserUtil.java index 13edb58b5e0..d173254b2a7 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/util/UserUtil.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/util/UserUtil.java @@ -44,6 +44,7 @@ import org.openmetadata.schema.security.client.OpenMetadataJWTClientConfig; import org.openmetadata.schema.services.connections.metadata.AuthProvider; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.utils.EntityInterfaceUtil; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.sdk.exception.UserCreationException; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.EntityNotFoundException; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/util/WebsocketNotificationHandler.java b/openmetadata-service/src/main/java/org/openmetadata/service/util/WebsocketNotificationHandler.java index e26f4e2b528..f8e9d1b8b5f 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/util/WebsocketNotificationHandler.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/util/WebsocketNotificationHandler.java @@ -37,6 +37,7 @@ import org.openmetadata.schema.type.Post; import org.openmetadata.schema.type.Relationship; import org.openmetadata.schema.type.api.BulkOperationResult; import org.openmetadata.schema.type.csv.CsvImportResult; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.EntityNotFoundException; import org.openmetadata.service.jdbi3.CollectionDAO; diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/workflows/searchIndex/ReindexingUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/workflows/searchIndex/ReindexingUtil.java index 6014ba6c2c7..7cc64bf7dad 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/workflows/searchIndex/ReindexingUtil.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/workflows/searchIndex/ReindexingUtil.java @@ -33,11 +33,11 @@ import org.openmetadata.schema.system.EntityStats; import org.openmetadata.schema.system.Stats; import org.openmetadata.schema.system.StepStats; import org.openmetadata.schema.type.EntityReference; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.jdbi3.EntityRepository; import org.openmetadata.service.jdbi3.EntityTimeSeriesRepository; import org.openmetadata.service.jdbi3.ListFilter; -import org.openmetadata.service.util.JsonUtils; import os.org.opensearch.action.bulk.BulkItemResponse; import os.org.opensearch.action.bulk.BulkResponse; diff --git a/openmetadata-service/src/test/java/org/openmetadata/jobs/BackgroundJobWorkerTest.java b/openmetadata-service/src/test/java/org/openmetadata/jobs/BackgroundJobWorkerTest.java index bd15dddc34f..026decc5489 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/jobs/BackgroundJobWorkerTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/jobs/BackgroundJobWorkerTest.java @@ -25,6 +25,7 @@ import org.openmetadata.schema.entity.type.CustomProperty; import org.openmetadata.schema.jobs.BackgroundJob; import org.openmetadata.schema.jobs.EnumCleanupArgs; import org.openmetadata.schema.type.CustomPropertyConfig; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.OpenMetadataApplicationTest; import org.openmetadata.service.jdbi3.CollectionDAO; @@ -36,7 +37,6 @@ import org.openmetadata.service.jobs.JobHandler; import org.openmetadata.service.jobs.JobHandlerRegistry; import org.openmetadata.service.resources.databases.TableResourceTest; import org.openmetadata.service.resources.metadata.TypeResourceTest; -import org.openmetadata.service.util.JsonUtils; @Slf4j public class BackgroundJobWorkerTest extends OpenMetadataApplicationTest { diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/OpenMetadataApplicationTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/OpenMetadataApplicationTest.java index fd23a8cbfe1..15207e064e5 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/OpenMetadataApplicationTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/OpenMetadataApplicationTest.java @@ -52,6 +52,7 @@ import org.junit.jupiter.api.TestInstance; import org.openmetadata.common.utils.CommonUtil; import org.openmetadata.schema.service.configuration.elasticsearch.ElasticSearchConfiguration; import org.openmetadata.schema.type.IndexMappingLanguage; +import org.openmetadata.search.IndexMappingLoader; import org.openmetadata.service.jdbi3.CollectionDAO; import org.openmetadata.service.jdbi3.locator.ConnectionAwareAnnotationSqlLocator; import org.openmetadata.service.jdbi3.locator.ConnectionType; @@ -199,6 +200,9 @@ public abstract class OpenMetadataApplicationTest { overrideElasticSearchConfig(); overrideDatabaseConfig(sqlContainer); + // Init IndexMapping class + IndexMappingLoader.init(getEsConfig()); + // Migration overrides configOverrides.add( ConfigOverride.config("migrationConfiguration.flywayPath", flyWayMigrationScriptsLocation)); diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexAppTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexAppTest.java index 615556aa0f1..95e419345b5 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexAppTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexAppTest.java @@ -39,12 +39,12 @@ import org.openmetadata.schema.system.EventPublisherJob; import org.openmetadata.schema.system.IndexingError; import org.openmetadata.schema.system.Stats; import org.openmetadata.schema.system.StepStats; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.OpenMetadataApplicationTest; import org.openmetadata.service.exception.SearchIndexException; import org.openmetadata.service.jdbi3.CollectionDAO; import org.openmetadata.service.search.SearchRepository; import org.openmetadata.service.socket.WebSocketManager; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.quartz.JobDataMap; import org.quartz.JobDetail; diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexCompressionIntegrationTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexCompressionIntegrationTest.java index abd7ea1ea5e..6012792d85c 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexCompressionIntegrationTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexCompressionIntegrationTest.java @@ -25,11 +25,11 @@ import org.junit.jupiter.api.TestInstance; import org.openmetadata.schema.entity.app.App; import org.openmetadata.schema.system.EventPublisherJob; import org.openmetadata.schema.system.Stats; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.OpenMetadataApplicationTest; import org.openmetadata.service.search.SearchClusterMetrics; import org.openmetadata.service.search.SearchRepository; -import org.openmetadata.service.util.JsonUtils; @Slf4j @TestInstance(TestInstance.Lifecycle.PER_CLASS) diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexEndToEndTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexEndToEndTest.java index aa92cf69519..1221bf5d5fc 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexEndToEndTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexEndToEndTest.java @@ -29,11 +29,11 @@ import org.openmetadata.schema.system.EventPublisherJob; import org.openmetadata.schema.system.IndexingError; import org.openmetadata.schema.system.Stats; import org.openmetadata.schema.system.StepStats; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.exception.SearchIndexException; import org.openmetadata.service.jdbi3.CollectionDAO; import org.openmetadata.service.search.SearchRepository; import org.openmetadata.service.socket.WebSocketManager; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.quartz.JobDataMap; import org.quartz.JobDetail; diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexWebSocketIntegrationTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexWebSocketIntegrationTest.java index 1d8d8363162..52ec8f032cf 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexWebSocketIntegrationTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexWebSocketIntegrationTest.java @@ -42,11 +42,11 @@ import org.openmetadata.schema.system.EventPublisherJob; import org.openmetadata.schema.system.IndexingError; import org.openmetadata.schema.system.Stats; import org.openmetadata.schema.system.StepStats; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.exception.SearchIndexException; import org.openmetadata.service.jdbi3.CollectionDAO; import org.openmetadata.service.search.SearchRepository; import org.openmetadata.service.socket.WebSocketManager; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.quartz.JobDataMap; import org.quartz.JobDetail; diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/ChangeEventParserResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/ChangeEventParserResourceTest.java index 36ee3fc80ad..0ec72a3bf5c 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/ChangeEventParserResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/ChangeEventParserResourceTest.java @@ -43,13 +43,13 @@ import org.openmetadata.schema.type.FieldChange; import org.openmetadata.schema.type.TagLabel; import org.openmetadata.schema.type.TagLabel.LabelType; import org.openmetadata.schema.type.TagLabel.State; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.OpenMetadataApplicationTest; import org.openmetadata.service.formatter.decorators.FeedMessageDecorator; import org.openmetadata.service.formatter.decorators.MessageDecorator; import org.openmetadata.service.formatter.decorators.SlackMessageDecorator; import org.openmetadata.service.resources.databases.TableResourceTest; -import org.openmetadata.service.util.JsonUtils; @Slf4j @TestInstance(Lifecycle.PER_CLASS) diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/EntityResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/EntityResourceTest.java index 68079d7bc41..3487cfc7314 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/EntityResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/EntityResourceTest.java @@ -182,6 +182,8 @@ import org.openmetadata.schema.type.change.ChangeSource; import org.openmetadata.schema.type.csv.CsvDocumentation; import org.openmetadata.schema.type.csv.CsvHeader; import org.openmetadata.schema.type.csv.CsvImportResult; +import org.openmetadata.schema.utils.JsonUtils; +import org.openmetadata.search.IndexMapping; import org.openmetadata.service.Entity; import org.openmetadata.service.OpenMetadataApplicationTest; import org.openmetadata.service.exception.CatalogExceptionMessage; @@ -218,7 +220,6 @@ import org.openmetadata.service.resources.services.SearchServiceResourceTest; import org.openmetadata.service.resources.services.StorageServiceResourceTest; import org.openmetadata.service.resources.tags.TagResourceTest; import org.openmetadata.service.resources.teams.*; -import org.openmetadata.service.search.models.IndexMapping; import org.openmetadata.service.security.SecurityUtil; import org.openmetadata.service.socket.WebSocketManager; import org.openmetadata.service.util.CSVExportMessage; @@ -229,7 +230,6 @@ import org.openmetadata.service.util.DeleteEntityMessage; import org.openmetadata.service.util.DeleteEntityResponse; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.util.TestUtils; import org.testcontainers.shaded.com.google.common.collect.Lists; diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/apis/APIEndpointResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/apis/APIEndpointResourceTest.java index ecbc421c041..82682f5d6ac 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/apis/APIEndpointResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/apis/APIEndpointResourceTest.java @@ -43,10 +43,10 @@ import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.Field; import org.openmetadata.schema.type.FieldDataType; import org.openmetadata.schema.type.TagLabel; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.EntityResourceTest; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.util.TestUtils; diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/apps/AppsResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/apps/AppsResourceTest.java index 1cf011c1abc..1f8a2d30a1f 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/apps/AppsResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/apps/AppsResourceTest.java @@ -67,6 +67,7 @@ import org.openmetadata.schema.type.EventType; import org.openmetadata.schema.type.LifeCycle; import org.openmetadata.schema.type.ProviderType; import org.openmetadata.schema.type.TableProfile; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.apps.bundles.insights.utils.TimestampUtils; import org.openmetadata.service.exception.EntityNotFoundException; @@ -83,7 +84,6 @@ import org.openmetadata.service.resources.services.DatabaseServiceResourceTest; import org.openmetadata.service.resources.teams.UserResourceTest; import org.openmetadata.service.security.SecurityUtil; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.util.RetryableAssertionError; import org.openmetadata.service.util.TestUtils; diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/charts/ChartResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/charts/ChartResourceTest.java index bb776e2afb0..922b19c7ecc 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/charts/ChartResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/charts/ChartResourceTest.java @@ -47,12 +47,12 @@ import org.openmetadata.schema.entity.services.DashboardService; import org.openmetadata.schema.type.ChangeDescription; import org.openmetadata.schema.type.ChartType; import org.openmetadata.schema.type.EntityReference; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.EntityResourceTest; import org.openmetadata.service.resources.charts.ChartResource.ChartList; import org.openmetadata.service.resources.dashboards.DashboardResourceTest; import org.openmetadata.service.resources.services.DashboardServiceResourceTest; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; @Slf4j diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/data/DataContractResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/data/DataContractResourceTest.java index df646d2f18e..78ee0d80c57 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/data/DataContractResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/data/DataContractResourceTest.java @@ -59,9 +59,9 @@ import org.openmetadata.schema.type.Field; import org.openmetadata.schema.type.FieldDataType; import org.openmetadata.schema.type.QualityExpectation; import org.openmetadata.schema.type.SemanticsRule; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.OpenMetadataApplicationTest; import org.openmetadata.service.security.SecurityUtil; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.TestUtils; @Slf4j diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/databases/DatabaseResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/databases/DatabaseResourceTest.java index 732eef6c306..2efc28be8bc 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/databases/DatabaseResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/databases/DatabaseResourceTest.java @@ -58,12 +58,12 @@ import org.openmetadata.schema.entity.data.Table; import org.openmetadata.schema.type.ApiStatus; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.csv.CsvImportResult; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.EntityResourceTest; import org.openmetadata.service.resources.databases.DatabaseResource.DatabaseList; import org.openmetadata.service.resources.tags.TagResourceTest; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.util.TestUtils; diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/databases/StoredProcedureResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/databases/StoredProcedureResourceTest.java index b9438990cf2..62a44d8ee5a 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/databases/StoredProcedureResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/databases/StoredProcedureResourceTest.java @@ -29,6 +29,7 @@ import org.openmetadata.schema.api.data.*; import org.openmetadata.schema.entity.data.*; import org.openmetadata.schema.entity.services.DatabaseService; import org.openmetadata.schema.type.*; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.EntityResourceTest; import org.openmetadata.service.resources.services.DatabaseServiceResourceTest; diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/databases/TableResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/databases/TableResourceTest.java index f834998bf9c..57a6b6c4b45 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/databases/TableResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/databases/TableResourceTest.java @@ -157,6 +157,8 @@ import org.openmetadata.schema.type.TagLabel; import org.openmetadata.schema.type.TagLabel.LabelType; import org.openmetadata.schema.type.change.ChangeSource; import org.openmetadata.schema.type.csv.CsvImportResult; +import org.openmetadata.schema.utils.JsonUtils; +import org.openmetadata.search.IndexMapping; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.jdbi3.ListFilter; @@ -175,11 +177,9 @@ import org.openmetadata.service.resources.tags.ClassificationResourceTest; import org.openmetadata.service.resources.tags.TagResourceTest; import org.openmetadata.service.resources.teams.TeamResourceTest; import org.openmetadata.service.resources.teams.UserResourceTest; -import org.openmetadata.service.search.models.IndexMapping; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.EntityUtil.Fields; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.RestUtil; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.util.TestUtils; diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/datamodels/DashboardDataModelResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/datamodels/DashboardDataModelResourceTest.java index d628187a790..a9cd9ab24ff 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/datamodels/DashboardDataModelResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/datamodels/DashboardDataModelResourceTest.java @@ -50,11 +50,11 @@ import org.openmetadata.schema.type.Column; import org.openmetadata.schema.type.DataModelType; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.TagLabel; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.resources.EntityResourceTest; import org.openmetadata.service.resources.services.DashboardServiceResourceTest; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; @Slf4j diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/docstore/DocStoreResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/docstore/DocStoreResourceTest.java index 16321ef961d..5128fa0d23a 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/docstore/DocStoreResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/docstore/DocStoreResourceTest.java @@ -45,10 +45,10 @@ import org.openmetadata.schema.system.ui.Page; import org.openmetadata.schema.system.ui.PageType; import org.openmetadata.schema.type.ChangeDescription; import org.openmetadata.schema.type.MetadataOperation; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.resources.EntityResourceTest; import org.openmetadata.service.security.SecurityUtil; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; @Slf4j diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/domains/DataProductResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/domains/DataProductResourceTest.java index ee260377036..e7c5dc6e873 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/domains/DataProductResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/domains/DataProductResourceTest.java @@ -29,6 +29,7 @@ import org.openmetadata.schema.entity.domains.Domain; import org.openmetadata.schema.entity.type.Style; import org.openmetadata.schema.type.ChangeDescription; import org.openmetadata.schema.type.EntityReference; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.EntityNotFoundException; import org.openmetadata.service.jdbi3.TableRepository; @@ -36,7 +37,6 @@ import org.openmetadata.service.resources.EntityResourceTest; import org.openmetadata.service.resources.databases.TableResourceTest; import org.openmetadata.service.resources.domains.DataProductResource.DataProductList; import org.openmetadata.service.resources.topics.TopicResourceTest; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.TestUtils; public class DataProductResourceTest extends EntityResourceTest { diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/domains/DomainResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/domains/DomainResourceTest.java index a8f531652e0..fbca157b60c 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/domains/DomainResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/domains/DomainResourceTest.java @@ -35,13 +35,13 @@ import org.openmetadata.schema.entity.domains.Domain; import org.openmetadata.schema.entity.type.Style; import org.openmetadata.schema.type.ChangeDescription; import org.openmetadata.schema.type.EntityReference; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.EntityNotFoundException; import org.openmetadata.service.jdbi3.TableRepository; import org.openmetadata.service.resources.EntityResourceTest; import org.openmetadata.service.resources.domains.DomainResource.DomainList; import org.openmetadata.service.util.EntityHierarchyList; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.TestUtils; public class DomainResourceTest extends EntityResourceTest { diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/dqtests/TestCaseResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/dqtests/TestCaseResourceTest.java index b375b2c73f4..407b520c90f 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/dqtests/TestCaseResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/dqtests/TestCaseResourceTest.java @@ -122,6 +122,8 @@ import org.openmetadata.schema.type.TableData; import org.openmetadata.schema.type.TagLabel; import org.openmetadata.schema.type.TaskStatus; import org.openmetadata.schema.type.TestDefinitionEntityType; +import org.openmetadata.schema.utils.JsonUtils; +import org.openmetadata.search.IndexMapping; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.EntityResourceTest; import org.openmetadata.service.resources.databases.TableResourceTest; @@ -135,8 +137,6 @@ import org.openmetadata.service.search.SearchAggregation; import org.openmetadata.service.search.SearchIndexUtils; import org.openmetadata.service.search.SearchRepository; import org.openmetadata.service.search.indexes.TestCaseIndex; -import org.openmetadata.service.search.models.IndexMapping; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.util.TestUtils; import org.openmetadata.service.util.incidentSeverityClassifier.IncidentSeverityClassifierInterface; diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/dqtests/TestSuiteResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/dqtests/TestSuiteResourceTest.java index 4a1ed09a42a..052aa7439f4 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/dqtests/TestSuiteResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/dqtests/TestSuiteResourceTest.java @@ -56,6 +56,8 @@ import org.openmetadata.schema.type.Column; import org.openmetadata.schema.type.ColumnDataType; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.Include; +import org.openmetadata.schema.utils.JsonUtils; +import org.openmetadata.search.IndexMapping; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.EntityResourceTest; import org.openmetadata.service.resources.databases.TableResourceTest; @@ -63,8 +65,6 @@ import org.openmetadata.service.resources.feeds.MessageParser; import org.openmetadata.service.resources.services.ingestionpipelines.IngestionPipelineResourceTest; import org.openmetadata.service.resources.teams.TeamResourceTest; import org.openmetadata.service.resources.teams.UserResourceTest; -import org.openmetadata.service.search.models.IndexMapping; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.util.TestUtils; import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils; diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/events/BaseCallbackResource.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/events/BaseCallbackResource.java index ea1b1455dcb..1c4be5685b8 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/events/BaseCallbackResource.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/events/BaseCallbackResource.java @@ -27,7 +27,7 @@ import lombok.extern.slf4j.Slf4j; import org.awaitility.Awaitility; import org.openmetadata.common.utils.CommonUtil; import org.openmetadata.schema.type.EventType; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.util.RestUtil; @Slf4j diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/events/EventSubscriptionResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/events/EventSubscriptionResourceTest.java index bbb497652d6..c85269c2c4b 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/events/EventSubscriptionResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/events/EventSubscriptionResourceTest.java @@ -61,6 +61,7 @@ import org.openmetadata.schema.type.EventType; import org.openmetadata.schema.type.FieldChange; import org.openmetadata.schema.type.NotificationFilterOperation; import org.openmetadata.schema.type.Webhook; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.apps.bundles.changeEvent.msteams.TeamsMessage; import org.openmetadata.service.apps.bundles.changeEvent.slack.SlackMessage; @@ -72,7 +73,6 @@ import org.openmetadata.service.resources.events.subscription.EventSubscriptionR import org.openmetadata.service.resources.services.ingestionpipelines.IngestionPipelineResourceTest; import org.openmetadata.service.resources.topics.TopicResourceTest; import org.openmetadata.service.util.EntityUtil; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.TestUtils; @Slf4j diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/feeds/FeedResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/feeds/FeedResourceTest.java index dbd11c79059..2821618f0fe 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/feeds/FeedResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/feeds/FeedResourceTest.java @@ -107,6 +107,7 @@ import org.openmetadata.schema.type.TaskDetails; import org.openmetadata.schema.type.TaskStatus; import org.openmetadata.schema.type.TaskType; import org.openmetadata.schema.type.ThreadType; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.OpenMetadataApplicationTest; import org.openmetadata.service.exception.CatalogExceptionMessage; @@ -121,7 +122,6 @@ import org.openmetadata.service.resources.feeds.FeedResource.ThreadList; import org.openmetadata.service.resources.teams.TeamResourceTest; import org.openmetadata.service.resources.teams.UserResourceTest; import org.openmetadata.service.util.EntityUtil; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.TestUtils; @Slf4j diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/glossary/GlossaryResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/glossary/GlossaryResourceTest.java index 0912d4e5cf7..bae1b754a1e 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/glossary/GlossaryResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/glossary/GlossaryResourceTest.java @@ -94,6 +94,7 @@ import org.openmetadata.schema.type.TagLabel.TagSource; import org.openmetadata.schema.type.TaskStatus; import org.openmetadata.schema.type.csv.CsvImportResult; import org.openmetadata.schema.type.customProperties.TableConfig; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.governance.workflows.WorkflowHandler; @@ -109,7 +110,6 @@ import org.openmetadata.service.resources.metadata.TypeResourceTest; import org.openmetadata.service.resources.tags.ClassificationResourceTest; import org.openmetadata.service.resources.tags.TagResourceTest; import org.openmetadata.service.util.EntityUtil; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.TestUtils; @Slf4j diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/glossary/GlossaryTermResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/glossary/GlossaryTermResourceTest.java index 32ffe6b5670..5a6776abbec 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/glossary/GlossaryTermResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/glossary/GlossaryTermResourceTest.java @@ -103,6 +103,7 @@ import org.openmetadata.schema.type.TaskDetails; import org.openmetadata.schema.type.TaskStatus; import org.openmetadata.schema.type.api.BulkOperationResult; import org.openmetadata.schema.type.api.BulkResponse; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.governance.workflows.WorkflowHandler; import org.openmetadata.service.jdbi3.GlossaryTermRepository; @@ -116,7 +117,6 @@ import org.openmetadata.service.resources.tags.ClassificationResourceTest; import org.openmetadata.service.resources.tags.TagResourceTest; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.util.TestUtils; import org.testcontainers.shaded.com.google.common.collect.Lists; diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/kpi/KpiResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/kpi/KpiResourceTest.java index 424271e59d3..b5d6ac97878 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/kpi/KpiResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/kpi/KpiResourceTest.java @@ -30,12 +30,12 @@ import org.openmetadata.schema.dataInsight.type.KpiTarget; import org.openmetadata.schema.dataInsight.type.KpiTargetType; import org.openmetadata.schema.service.configuration.elasticsearch.ElasticSearchConfiguration; import org.openmetadata.schema.type.ChangeDescription; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.apps.bundles.insights.search.DataInsightsSearchInterface; import org.openmetadata.service.apps.bundles.insights.search.elasticsearch.ElasticSearchDataInsightsClient; import org.openmetadata.service.apps.bundles.insights.search.opensearch.OpenSearchDataInsightsClient; import org.openmetadata.service.resources.EntityResourceTest; -import org.openmetadata.service.util.JsonUtils; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) @Slf4j diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/lineage/LineageResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/lineage/LineageResourceTest.java index a0eb6f228c0..bcde3b19243 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/lineage/LineageResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/lineage/LineageResourceTest.java @@ -80,6 +80,7 @@ import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.LineageDetails; import org.openmetadata.schema.type.MetadataOperation; import org.openmetadata.schema.type.lineage.NodeInformation; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.OpenMetadataApplicationTest; import org.openmetadata.service.resources.dashboards.DashboardResourceTest; @@ -95,7 +96,6 @@ import org.openmetadata.service.resources.teams.RoleResource; import org.openmetadata.service.resources.teams.RoleResourceTest; import org.openmetadata.service.resources.teams.UserResourceTest; import org.openmetadata.service.resources.topics.TopicResourceTest; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.TestUtils; @Slf4j diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/metadata/TypeResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/metadata/TypeResourceTest.java index c14d782478b..d634c3f6a29 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/metadata/TypeResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/metadata/TypeResourceTest.java @@ -49,12 +49,12 @@ import org.openmetadata.schema.type.CustomPropertyConfig; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.customProperties.EnumConfig; import org.openmetadata.schema.type.customProperties.TableConfig; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.EntityResourceTest; import org.openmetadata.service.resources.types.TypeResource; import org.openmetadata.service.resources.types.TypeResource.TypeList; import org.openmetadata.service.util.EntityUtil; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.TestUtils; import org.openmetadata.service.util.TestUtils.UpdateType; import org.skyscreamer.jsonassert.JSONAssert; diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/metrics/MetricResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/metrics/MetricResourceTest.java index 1d388caa21d..366582fc61d 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/metrics/MetricResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/metrics/MetricResourceTest.java @@ -30,9 +30,9 @@ import org.openmetadata.schema.type.MetricExpressionLanguage; import org.openmetadata.schema.type.MetricGranularity; import org.openmetadata.schema.type.MetricType; import org.openmetadata.schema.type.MetricUnitOfMeasurement; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.EntityResourceTest; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.TestUtils; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/mlmodels/MlModelResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/mlmodels/MlModelResourceTest.java index 163be0849f0..c75f0246c1e 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/mlmodels/MlModelResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/mlmodels/MlModelResourceTest.java @@ -61,6 +61,7 @@ import org.openmetadata.schema.type.MlFeatureDataType; import org.openmetadata.schema.type.MlFeatureSource; import org.openmetadata.schema.type.MlHyperParameter; import org.openmetadata.schema.type.MlStore; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.resources.EntityResourceTest; @@ -68,7 +69,6 @@ import org.openmetadata.service.resources.dashboards.DashboardResourceTest; import org.openmetadata.service.resources.databases.TableResourceTest; import org.openmetadata.service.resources.mlmodels.MlModelResource.MlModelList; import org.openmetadata.service.resources.services.MlModelServiceResourceTest; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.TestUtils; @Slf4j diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/permissions/PermissionsResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/permissions/PermissionsResourceTest.java index 96c9e15e31b..cc1b51cef1e 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/permissions/PermissionsResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/permissions/PermissionsResourceTest.java @@ -65,6 +65,7 @@ import org.openmetadata.schema.type.MetadataOperation; import org.openmetadata.schema.type.Permission; import org.openmetadata.schema.type.Permission.Access; import org.openmetadata.schema.type.ResourcePermission; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.OpenMetadataApplicationTest; import org.openmetadata.service.ResourceRegistry; @@ -80,7 +81,6 @@ import org.openmetadata.service.security.policyevaluator.CompiledRule; import org.openmetadata.service.security.policyevaluator.PolicyEvaluator; import org.openmetadata.service.security.policyevaluator.SubjectContext; import org.openmetadata.service.util.EntityUtil; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.TestUtils; @Slf4j diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/pipelines/PipelineResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/pipelines/PipelineResourceTest.java index a476ed38d63..19e99d91f36 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/pipelines/PipelineResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/pipelines/PipelineResourceTest.java @@ -67,13 +67,13 @@ import org.openmetadata.schema.type.StatusType; import org.openmetadata.schema.type.TagLabel; import org.openmetadata.schema.type.Task; import org.openmetadata.schema.utils.EntityInterfaceUtil; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.resources.EntityResourceTest; import org.openmetadata.service.resources.pipelines.PipelineResource.PipelineList; import org.openmetadata.service.resources.services.PipelineServiceResourceTest; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.util.TestUtils; diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/policies/PolicyResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/policies/PolicyResourceTest.java index 69e1eb470ef..8c83fce121b 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/policies/PolicyResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/policies/PolicyResourceTest.java @@ -72,6 +72,7 @@ import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.Function; import org.openmetadata.schema.type.MetadataOperation; import org.openmetadata.schema.type.ResourceDescriptor; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.FunctionList; import org.openmetadata.service.exception.CatalogExceptionMessage; @@ -85,7 +86,6 @@ import org.openmetadata.service.resources.teams.TeamResourceTest; import org.openmetadata.service.resources.teams.UserResourceTest; import org.openmetadata.service.security.policyevaluator.RuleEvaluator; import org.openmetadata.service.util.EntityUtil; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.TestUtils; @Slf4j diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/query/QueryResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/query/QueryResourceTest.java index abaacf79940..7db39843a8e 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/query/QueryResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/query/QueryResourceTest.java @@ -34,11 +34,11 @@ import org.openmetadata.schema.api.data.CreateTable; import org.openmetadata.schema.entity.data.Query; import org.openmetadata.schema.entity.data.Table; import org.openmetadata.schema.type.*; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.EntityResourceTest; import org.openmetadata.service.resources.databases.TableResourceTest; import org.openmetadata.service.util.EntityUtil; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.util.TestUtils; diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/search/SearchResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/search/SearchResourceTest.java index 96172e6ab92..fc1c72d2cae 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/search/SearchResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/search/SearchResourceTest.java @@ -26,6 +26,7 @@ import java.io.IOException; import java.net.URISyntaxException; import java.util.ArrayList; import java.util.List; +import java.util.Map; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -41,6 +42,8 @@ import org.openmetadata.schema.type.Field; import org.openmetadata.schema.type.FieldDataType; import org.openmetadata.schema.type.MessageSchema; import org.openmetadata.schema.type.SchemaType; +import org.openmetadata.search.IndexMapping; +import org.openmetadata.search.IndexMappingLoader; import org.openmetadata.service.OpenMetadataApplicationTest; import org.openmetadata.service.resources.databases.TableResourceTest; import org.openmetadata.service.resources.topics.TopicResourceTest; @@ -175,6 +178,22 @@ public class SearchResourceTest extends OpenMetadataApplicationTest { } } + @Test + public void testListMapping(TestInfo test) { + IndexMappingLoader indexMappingLoader = IndexMappingLoader.getInstance(); + Map indexMapping = indexMappingLoader.getIndexMapping(); + + assertNotNull(indexMapping, "Index mapping should not be null"); + IndexMapping tableIndexMapping = indexMapping.get("table"); + assertNotNull(tableIndexMapping, "Table index mapping should not be null"); + + Map> entityIndexMapping = + indexMappingLoader.getEntityIndexMapping(); + assertNotNull(entityIndexMapping, "Entity index mapping should not be null"); + Map tableMapping = entityIndexMapping.get("table"); + assertNotNull(tableMapping, "Table mapping should not be null"); + } + private Response searchWithQuery(String query, String index) { WebTarget target = getResource("search/query") diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/searchindex/SearchIndexResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/searchindex/SearchIndexResourceTest.java index 3627cd5c2f6..c003e645df6 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/searchindex/SearchIndexResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/searchindex/SearchIndexResourceTest.java @@ -66,6 +66,7 @@ import org.openmetadata.schema.type.SearchIndexDataType; import org.openmetadata.schema.type.SearchIndexField; import org.openmetadata.schema.type.TagLabel; import org.openmetadata.schema.type.searchindex.SearchIndexSampleData; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.resources.EntityResourceTest; @@ -76,7 +77,6 @@ import org.openmetadata.service.search.SearchIndexUtils; import org.openmetadata.service.search.SearchRepository; import org.openmetadata.service.search.elasticsearch.aggregations.ElasticAggregations; import org.openmetadata.service.search.elasticsearch.aggregations.ElasticAggregationsBuilder; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.util.TestUtils; diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/APIServiceResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/APIServiceResourceTest.java index 9573f0be1b1..9958f31a9c9 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/APIServiceResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/APIServiceResourceTest.java @@ -29,9 +29,9 @@ import org.openmetadata.schema.entity.services.connections.TestConnectionResultS import org.openmetadata.schema.services.connections.api.RestConnection; import org.openmetadata.schema.type.ApiConnection; import org.openmetadata.schema.type.ChangeDescription; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.services.apiservices.APIServiceResource; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.TestUtils; public class APIServiceResourceTest extends ServiceResourceTest { diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/DashboardServiceResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/DashboardServiceResourceTest.java index 230079dbc13..8f7d69c9f42 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/DashboardServiceResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/DashboardServiceResourceTest.java @@ -52,13 +52,13 @@ import org.openmetadata.schema.services.connections.dashboard.LookerConnection; import org.openmetadata.schema.services.connections.dashboard.MetabaseConnection; import org.openmetadata.schema.type.ChangeDescription; import org.openmetadata.schema.type.DashboardConnection; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.charts.ChartResourceTest; import org.openmetadata.service.resources.dashboards.DashboardResourceTest; import org.openmetadata.service.resources.services.dashboard.DashboardServiceResource; import org.openmetadata.service.resources.services.dashboard.DashboardServiceResource.DashboardServiceList; import org.openmetadata.service.secrets.masker.PasswordEntityMasker; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.TestUtils; @Slf4j diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/DatabaseServiceResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/DatabaseServiceResourceTest.java index eddb32e61cc..7c58d819efe 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/DatabaseServiceResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/DatabaseServiceResourceTest.java @@ -82,6 +82,7 @@ import org.openmetadata.schema.type.ChangeDescription; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.Schedule; import org.openmetadata.schema.type.csv.CsvImportResult; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.databases.DatabaseResourceTest; import org.openmetadata.service.resources.databases.DatabaseSchemaResourceTest; @@ -92,7 +93,6 @@ import org.openmetadata.service.resources.services.ingestionpipelines.IngestionP import org.openmetadata.service.resources.tags.TagResourceTest; import org.openmetadata.service.secrets.masker.PasswordEntityMasker; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.TestUtils; @Slf4j diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/MessagingServiceResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/MessagingServiceResourceTest.java index bb56e8534e5..e53a50c05f8 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/MessagingServiceResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/MessagingServiceResourceTest.java @@ -44,10 +44,10 @@ import org.openmetadata.schema.entity.services.connections.TestConnectionResultS import org.openmetadata.schema.services.connections.messaging.KafkaConnection; import org.openmetadata.schema.type.ChangeDescription; import org.openmetadata.schema.type.MessagingConnection; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.services.messaging.MessagingServiceResource; import org.openmetadata.service.resources.services.messaging.MessagingServiceResource.MessagingServiceList; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.TestUtils; @Slf4j diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/MetadataServiceResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/MetadataServiceResourceTest.java index 3580dae83ff..87557cc4a01 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/MetadataServiceResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/MetadataServiceResourceTest.java @@ -31,10 +31,10 @@ import org.openmetadata.schema.entity.services.connections.TestConnectionResultS import org.openmetadata.schema.services.connections.metadata.AmundsenConnection; import org.openmetadata.schema.services.connections.metadata.AtlasConnection; import org.openmetadata.schema.type.ChangeDescription; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.EntityResourceTest; import org.openmetadata.service.resources.services.metadata.MetadataServiceResource; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.TestUtils; @Slf4j diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/MlModelServiceResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/MlModelServiceResourceTest.java index 92d168a970e..dd66b41cd38 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/MlModelServiceResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/MlModelServiceResourceTest.java @@ -41,10 +41,10 @@ import org.openmetadata.schema.entity.services.connections.TestConnectionResultS import org.openmetadata.schema.services.connections.mlmodel.MlflowConnection; import org.openmetadata.schema.type.ChangeDescription; import org.openmetadata.schema.type.MlModelConnection; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.services.mlmodel.MlModelServiceResource; import org.openmetadata.service.resources.services.mlmodel.MlModelServiceResource.MlModelServiceList; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.TestUtils; @Slf4j diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/PipelineServiceResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/PipelineServiceResourceTest.java index 3636b6daa24..266b85dd3b7 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/PipelineServiceResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/PipelineServiceResourceTest.java @@ -56,11 +56,11 @@ import org.openmetadata.schema.services.connections.database.RedshiftConnection; import org.openmetadata.schema.services.connections.pipeline.AirflowConnection; import org.openmetadata.schema.type.ChangeDescription; import org.openmetadata.schema.type.PipelineConnection; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.services.ingestionpipelines.IngestionPipelineResourceTest; import org.openmetadata.service.resources.services.pipeline.PipelineServiceResource; import org.openmetadata.service.resources.services.pipeline.PipelineServiceResource.PipelineServiceList; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.TestUtils; @Slf4j diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/SearchServiceResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/SearchServiceResourceTest.java index 6fe33fe60cb..5e1968cab56 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/SearchServiceResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/SearchServiceResourceTest.java @@ -29,9 +29,9 @@ import org.openmetadata.schema.entity.services.connections.TestConnectionResultS import org.openmetadata.schema.services.connections.search.ElasticSearchConnection; import org.openmetadata.schema.type.ChangeDescription; import org.openmetadata.schema.type.SearchConnection; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.services.searchIndexes.SearchServiceResource; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.TestUtils; public class SearchServiceResourceTest diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/StorageServiceResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/StorageServiceResourceTest.java index 779ba8b2fd5..d155ef3ada4 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/StorageServiceResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/StorageServiceResourceTest.java @@ -27,9 +27,9 @@ import org.openmetadata.schema.security.credentials.AWSCredentials; import org.openmetadata.schema.services.connections.storage.S3Connection; import org.openmetadata.schema.type.ChangeDescription; import org.openmetadata.schema.type.StorageConnection; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.services.storage.StorageServiceResource; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.TestUtils; public class StorageServiceResourceTest diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/ingestionpipelines/IngestionPipelineResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/ingestionpipelines/IngestionPipelineResourceTest.java index 1ec47366580..83d65c818e2 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/ingestionpipelines/IngestionPipelineResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/services/ingestionpipelines/IngestionPipelineResourceTest.java @@ -81,6 +81,7 @@ import org.openmetadata.schema.type.ChangeDescription; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.MetadataOperation; import org.openmetadata.schema.type.ProviderType; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.EntityResourceTest; import org.openmetadata.service.resources.services.DashboardServiceResourceTest; @@ -88,7 +89,6 @@ import org.openmetadata.service.resources.services.DatabaseServiceResourceTest; import org.openmetadata.service.secrets.masker.PasswordEntityMasker; import org.openmetadata.service.security.SecurityUtil; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.util.TestUtils; diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/storages/ContainerResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/storages/ContainerResourceTest.java index 1637e5207ff..b45007e53e4 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/storages/ContainerResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/storages/ContainerResourceTest.java @@ -61,13 +61,13 @@ import org.openmetadata.schema.type.ContainerDataModel; import org.openmetadata.schema.type.ContainerFileFormat; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.TagLabel; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.resources.EntityResourceTest; import org.openmetadata.service.resources.services.StorageServiceResourceTest; import org.openmetadata.service.resources.storages.ContainerResource.ContainerList; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.util.TestUtils; diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/system/SystemResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/system/SystemResourceTest.java index 19f116255be..76159286610 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/system/SystemResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/system/SystemResourceTest.java @@ -73,6 +73,7 @@ import org.openmetadata.schema.system.ValidationResponse; import org.openmetadata.schema.type.ColumnDataType; import org.openmetadata.schema.util.EntitiesCount; import org.openmetadata.schema.util.ServicesCount; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.OpenMetadataApplicationConfig; import org.openmetadata.service.OpenMetadataApplicationTest; import org.openmetadata.service.resources.EntityResourceTest; @@ -94,7 +95,6 @@ import org.openmetadata.service.resources.storages.ContainerResourceTest; import org.openmetadata.service.resources.teams.TeamResourceTest; import org.openmetadata.service.resources.teams.UserResourceTest; import org.openmetadata.service.resources.topics.TopicResourceTest; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.TestUtils; @Slf4j diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/tags/ClassificationResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/tags/ClassificationResourceTest.java index 45fb819cb4f..f13fb73295e 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/tags/ClassificationResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/tags/ClassificationResourceTest.java @@ -47,11 +47,11 @@ import org.openmetadata.schema.entity.classification.Tag; import org.openmetadata.schema.type.ChangeDescription; import org.openmetadata.schema.type.MetadataOperation; import org.openmetadata.schema.type.ProviderType; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.resources.EntityResourceTest; import org.openmetadata.service.resources.tags.ClassificationResource.ClassificationList; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.TestUtils; /** Tests not covered here: Classification and Tag usage counts are covered in TableResourceTest */ diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/tags/TagResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/tags/TagResourceTest.java index 1e50700babf..e5b82ae02ce 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/tags/TagResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/tags/TagResourceTest.java @@ -66,6 +66,7 @@ import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.ProviderType; import org.openmetadata.schema.type.TagLabel; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.resources.EntityResourceTest; @@ -73,7 +74,6 @@ import org.openmetadata.service.resources.databases.TableResourceTest; import org.openmetadata.service.resources.tags.TagResource.TagList; import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.FullyQualifiedName; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.util.TestUtils.UpdateType; diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/PersonaResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/PersonaResourceTest.java index 749acaab703..a68081e97b7 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/PersonaResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/PersonaResourceTest.java @@ -35,10 +35,10 @@ import org.openmetadata.schema.api.teams.CreatePersona; import org.openmetadata.schema.api.teams.CreateUser; import org.openmetadata.schema.entity.teams.*; import org.openmetadata.schema.type.*; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.resources.EntityResourceTest; import org.openmetadata.service.security.SecurityUtil; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.TestUtils; @Slf4j diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/RoleResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/RoleResourceTest.java index 79881062967..21c5078bf11 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/RoleResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/RoleResourceTest.java @@ -42,12 +42,12 @@ import org.openmetadata.schema.api.teams.CreateRole; import org.openmetadata.schema.entity.teams.Role; import org.openmetadata.schema.type.ChangeDescription; import org.openmetadata.schema.type.MetadataOperation; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.resources.EntityResourceTest; import org.openmetadata.service.resources.teams.RoleResource.RoleList; import org.openmetadata.service.util.EntityUtil; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.TestUtils; @Slf4j diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/TeamResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/TeamResourceTest.java index adb37d80146..56dd0c372a3 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/TeamResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/TeamResourceTest.java @@ -105,6 +105,7 @@ import org.openmetadata.schema.type.Profile; import org.openmetadata.schema.type.Webhook; import org.openmetadata.schema.type.csv.CsvImportResult; import org.openmetadata.schema.type.profile.SubscriptionConfig; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.jdbi3.TeamRepository.TeamCsv; @@ -114,7 +115,6 @@ import org.openmetadata.service.resources.teams.TeamResource.TeamHierarchyList; import org.openmetadata.service.resources.teams.TeamResource.TeamList; import org.openmetadata.service.security.SecurityUtil; import org.openmetadata.service.util.EntityUtil; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.util.TestUtils; diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/UserResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/UserResourceTest.java index 57b6e85f9d4..688f4bb9c8c 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/UserResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/UserResourceTest.java @@ -125,6 +125,7 @@ import org.openmetadata.schema.type.Profile; import org.openmetadata.schema.type.Webhook; import org.openmetadata.schema.type.csv.CsvImportResult; import org.openmetadata.schema.type.profile.SubscriptionConfig; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.auth.JwtResponse; import org.openmetadata.service.exception.CatalogExceptionMessage; @@ -140,7 +141,6 @@ import org.openmetadata.service.security.mask.PIIMasker; import org.openmetadata.service.util.CSVExportResponse; import org.openmetadata.service.util.CSVImportResponse; import org.openmetadata.service.util.EntityUtil; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.PasswordUtil; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.util.TestUtils; diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/topics/TopicResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/topics/TopicResourceTest.java index 43730a805dc..0b0aecfb0f8 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/topics/TopicResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/topics/TopicResourceTest.java @@ -60,12 +60,12 @@ import org.openmetadata.schema.type.SchemaType; import org.openmetadata.schema.type.TagLabel; import org.openmetadata.schema.type.topic.CleanupPolicy; import org.openmetadata.schema.type.topic.TopicSampleData; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.resources.EntityResourceTest; import org.openmetadata.service.resources.services.MessagingServiceResourceTest; import org.openmetadata.service.resources.topics.TopicResource.TopicList; -import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.ResultList; import org.openmetadata.service.util.TestUtils; diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/secrets/AWSBasedSecretsManagerTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/secrets/AWSBasedSecretsManagerTest.java index ef83132c491..443d819d14a 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/secrets/AWSBasedSecretsManagerTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/secrets/AWSBasedSecretsManagerTest.java @@ -28,9 +28,9 @@ import org.openmetadata.schema.metadataIngestion.dbtconfig.DbtS3Config; import org.openmetadata.schema.security.credentials.AWSCredentials; import org.openmetadata.schema.security.secrets.Parameters; import org.openmetadata.schema.security.secrets.SecretsManagerConfiguration; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.Entity; import org.openmetadata.service.fernet.Fernet; -import org.openmetadata.service.util.JsonUtils; @ExtendWith(MockitoExtension.class) public abstract class AWSBasedSecretsManagerTest extends ExternalSecretsManagerTest { diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/secrets/DBSecretsManagerTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/secrets/DBSecretsManagerTest.java index a0dd10db024..8dac0ed01e9 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/secrets/DBSecretsManagerTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/secrets/DBSecretsManagerTest.java @@ -32,8 +32,8 @@ import org.openmetadata.schema.security.secrets.SecretsManagerProvider; import org.openmetadata.schema.services.connections.database.MysqlConnection; import org.openmetadata.schema.services.connections.database.common.basicAuth; import org.openmetadata.schema.services.connections.mlmodel.SklearnConnection; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.fernet.Fernet; -import org.openmetadata.service.util.JsonUtils; @ExtendWith(MockitoExtension.class) public class DBSecretsManagerTest { diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/secrets/ExternalSecretsManagerTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/secrets/ExternalSecretsManagerTest.java index 29204826fef..d037c24ec37 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/secrets/ExternalSecretsManagerTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/secrets/ExternalSecretsManagerTest.java @@ -20,8 +20,8 @@ import org.openmetadata.schema.security.secrets.SecretsManagerProvider; import org.openmetadata.schema.services.connections.database.MysqlConnection; import org.openmetadata.schema.services.connections.database.common.basicAuth; import org.openmetadata.schema.services.connections.metadata.OpenMetadataConnection; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.exception.InvalidServiceConnectionException; -import org.openmetadata.service.util.JsonUtils; public abstract class ExternalSecretsManagerTest { protected ExternalSecretsManager secretsManager; diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/secrets/SecretsManagerLifecycleTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/secrets/SecretsManagerLifecycleTest.java index 0dd3d48fca5..43c3da690b8 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/secrets/SecretsManagerLifecycleTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/secrets/SecretsManagerLifecycleTest.java @@ -24,9 +24,9 @@ import org.openmetadata.schema.entity.services.ServiceType; import org.openmetadata.schema.entity.teams.AuthenticationMechanism; import org.openmetadata.schema.services.connections.database.MysqlConnection; import org.openmetadata.schema.services.connections.database.common.basicAuth; +import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.service.exception.SecretsManagerException; import org.openmetadata.service.fernet.Fernet; -import org.openmetadata.service.util.JsonUtils; @ExtendWith(MockitoExtension.class) public class SecretsManagerLifecycleTest { diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/secrets/masker/TestEntityMasker.java b/openmetadata-service/src/test/java/org/openmetadata/service/secrets/masker/TestEntityMasker.java index ac14c958f02..c8363c5a7d4 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/secrets/masker/TestEntityMasker.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/secrets/masker/TestEntityMasker.java @@ -29,7 +29,7 @@ import org.openmetadata.schema.services.connections.database.common.basicAuth; import org.openmetadata.schema.services.connections.database.datalake.GCSConfig; import org.openmetadata.schema.services.connections.metadata.OpenMetadataConnection; import org.openmetadata.schema.services.connections.pipeline.AirflowConnection; -import org.openmetadata.service.util.JsonUtils; +import org.openmetadata.schema.utils.JsonUtils; abstract class TestEntityMasker { diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/util/JsonUtilsTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/util/JsonUtilsTest.java index 27454b999d1..cf583866d02 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/util/JsonUtilsTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/util/JsonUtilsTest.java @@ -37,6 +37,7 @@ import org.openmetadata.schema.entity.teams.Team; import org.openmetadata.schema.services.connections.dashboard.TableauConnection; import org.openmetadata.schema.services.connections.database.MysqlConnection; import org.openmetadata.schema.services.connections.database.common.basicAuth; +import org.openmetadata.schema.utils.JsonUtils; /** This test provides examples of how to use applyPatch */ @Slf4j diff --git a/openmetadata-spec/pom.xml b/openmetadata-spec/pom.xml index a37d249d7f8..8d3347ce2dd 100644 --- a/openmetadata-spec/pom.xml +++ b/openmetadata-spec/pom.xml @@ -26,6 +26,10 @@ common ${project.version} + + com.jayway.jsonpath + json-path + com.fasterxml.jackson.core jackson-databind @@ -57,6 +61,26 @@ io.github.resilience4j resilience4j-retry + + jakarta.json + jakarta.json-api + 2.1.3 + compile + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr353 + + + com.github.java-json-tools + json-patch + + + com.networknt + json-schema-validator + 1.5.2 + compile + diff --git a/openmetadata-spec/src/main/java/org/openmetadata/schema/exception/JsonParsingException.java b/openmetadata-spec/src/main/java/org/openmetadata/schema/exception/JsonParsingException.java new file mode 100644 index 00000000000..e473af3016c --- /dev/null +++ b/openmetadata-spec/src/main/java/org/openmetadata/schema/exception/JsonParsingException.java @@ -0,0 +1,38 @@ +/* + * Copyright 2021 Collate + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.openmetadata.schema.exception; + +import jakarta.ws.rs.core.Response; +import org.openmetadata.sdk.exception.WebServiceException; + +public class JsonParsingException extends WebServiceException { + private static final String MESSAGE = "JSON parsing failed with message [%s]."; + + public static final String JSON_PARSING_ERROR = "JSON_PARSING_EXCEPTION"; + + public JsonParsingException(String exceptionMessage) { + super( + Response.Status.INTERNAL_SERVER_ERROR, + JSON_PARSING_ERROR, + String.format(MESSAGE, exceptionMessage)); + } + + public JsonParsingException(String exceptionMessage, Throwable cause) { + super( + Response.Status.INTERNAL_SERVER_ERROR, + JSON_PARSING_ERROR, + String.format(MESSAGE, exceptionMessage), + cause); + } +} diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/util/JsonUtils.java b/openmetadata-spec/src/main/java/org/openmetadata/schema/utils/JsonUtils.java similarity index 85% rename from openmetadata-service/src/main/java/org/openmetadata/service/util/JsonUtils.java rename to openmetadata-spec/src/main/java/org/openmetadata/schema/utils/JsonUtils.java index b6bd1a49993..c5036b70742 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/util/JsonUtils.java +++ b/openmetadata-spec/src/main/java/org/openmetadata/schema/utils/JsonUtils.java @@ -11,9 +11,7 @@ * limitations under the License. */ -package org.openmetadata.service.util; - -import static org.openmetadata.service.util.RestUtil.DATE_TIME_FORMAT; +package org.openmetadata.schema.utils; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; @@ -49,11 +47,19 @@ import jakarta.validation.ConstraintViolationException; import jakarta.validation.Validation; import jakarta.validation.Validator; import jakarta.validation.ValidatorFactory; +import java.io.File; import java.io.IOException; import java.io.StringReader; +import java.nio.file.Files; +import java.nio.file.Path; import java.nio.file.Paths; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; import java.util.Collections; +import java.util.Enumeration; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -62,8 +68,13 @@ import java.util.Map.Entry; import java.util.Objects; import java.util.Optional; import java.util.Set; +import java.util.TimeZone; import java.util.TreeMap; +import java.util.regex.Pattern; import java.util.stream.Collectors; +import java.util.stream.Stream; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.openmetadata.annotations.ExposedField; @@ -73,10 +84,11 @@ import org.openmetadata.annotations.OnlyExposedFieldAnnotationIntrospector; import org.openmetadata.schema.EntityInterface; import org.openmetadata.schema.entity.Type; import org.openmetadata.schema.entity.type.Category; -import org.openmetadata.service.exception.UnhandledServerException; +import org.openmetadata.schema.exception.JsonParsingException; @Slf4j public final class JsonUtils { + public static final DateFormat DATE_TIME_FORMAT; public static final String FIELD_TYPE_ANNOTATION = "@om-field-type"; public static final String ENTITY_TYPE_ANNOTATION = "@om-entity-type"; public static final String JSON_FILE_EXTENSION = ".json"; @@ -88,6 +100,12 @@ public final class JsonUtils { JsonSchemaFactory.getInstance(VersionFlag.V7); private static final String FAILED_TO_PROCESS_JSON = "Failed to process JSON "; + static { + // Quoted "Z" to indicate UTC, no timezone offset + DATE_TIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSS'Z'"); + DATE_TIME_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); + } + static { OBJECT_MAPPER = new ObjectMapper(); OBJECT_MAPPER @@ -129,7 +147,7 @@ public final class JsonUtils { ? OBJECT_MAPPER.writerWithDefaultPrettyPrinter().writeValueAsString(o) : OBJECT_MAPPER.writeValueAsString(o); } catch (JsonProcessingException e) { - throw new UnhandledServerException(FAILED_TO_PROCESS_JSON, e); + throw new JsonParsingException(FAILED_TO_PROCESS_JSON, e); } } @@ -143,7 +161,7 @@ public final class JsonUtils { JsonInclude.Include.NON_NULL); // Ignore null values return objectMapperIgnoreNull.writeValueAsString(o); } catch (JsonProcessingException e) { - throw new UnhandledServerException(FAILED_TO_PROCESS_JSON, e); + throw new JsonParsingException(FAILED_TO_PROCESS_JSON, e); } } @@ -186,7 +204,7 @@ public final class JsonUtils { try { return (T) readValue(json, Class.forName(clazzName)); } catch (ClassNotFoundException e) { - throw new UnhandledServerException(FAILED_TO_PROCESS_JSON, e); + throw new JsonParsingException(FAILED_TO_PROCESS_JSON, e); } } @@ -207,7 +225,7 @@ public final class JsonUtils { try { return OBJECT_MAPPER.readValue(json, clz); } catch (JsonProcessingException e) { - throw new UnhandledServerException(FAILED_TO_PROCESS_JSON, e); + throw new JsonParsingException(FAILED_TO_PROCESS_JSON, e); } } @@ -218,7 +236,7 @@ public final class JsonUtils { try { return OBJECT_MAPPER_LENIENT.readValue(json, clz); } catch (JsonProcessingException e) { - throw new UnhandledServerException(FAILED_TO_PROCESS_JSON, e); + throw new JsonParsingException(FAILED_TO_PROCESS_JSON, e); } } @@ -229,7 +247,7 @@ public final class JsonUtils { try { return OBJECT_MAPPER.readValue(json, valueTypeRef); } catch (JsonProcessingException e) { - throw new UnhandledServerException(FAILED_TO_PROCESS_JSON, e); + throw new JsonParsingException(FAILED_TO_PROCESS_JSON, e); } } @@ -251,7 +269,7 @@ public final class JsonUtils { try { return OBJECT_MAPPER.readValue(json, typeFactory.constructCollectionType(List.class, clz)); } catch (JsonProcessingException e) { - throw new UnhandledServerException(FAILED_TO_PROCESS_JSON, e); + throw new JsonParsingException(FAILED_TO_PROCESS_JSON, e); } } @@ -403,9 +421,9 @@ public final class JsonUtils { List types = new ArrayList<>(); List jsonSchemas; try { - jsonSchemas = EntityUtil.getJsonDataResources(".*json/schema/type/.*\\.json$"); + jsonSchemas = getJsonDataResources(Pattern.compile(".*json/schema/type/.*\\.json$")); } catch (IOException e) { - throw new UnhandledServerException("Failed to read JSON resources at .*json/schema/type", e); + throw new JsonParsingException("Failed to read JSON resources at .*json/schema/type", e); } for (String jsonSchema : jsonSchemas) { try { @@ -417,10 +435,9 @@ public final class JsonUtils { // Get Entity Types try { - jsonSchemas = EntityUtil.getJsonDataResources(".*json/schema/entity/.*\\.json$"); + jsonSchemas = getJsonDataResources(Pattern.compile(".*json/schema/entity/.*\\.json$")); } catch (IOException e) { - throw new UnhandledServerException( - "Failed to read JSON resources at .*json/schema/entity", e); + throw new JsonParsingException("Failed to read JSON resources at .*json/schema/entity", e); } for (String jsonSchema : jsonSchemas) { try { @@ -447,7 +464,7 @@ public final class JsonUtils { Objects.requireNonNull( JsonUtils.class.getClassLoader().getResourceAsStream(jsonSchemaFile))); } catch (IOException e) { - throw new UnhandledServerException("Failed to read jsonSchemaFile " + jsonSchemaFile, e); + throw new JsonParsingException("Failed to read jsonSchemaFile " + jsonSchemaFile, e); } if (node.get("definitions") == null) { return Collections.emptyList(); @@ -490,7 +507,7 @@ public final class JsonUtils { Objects.requireNonNull( JsonUtils.class.getClassLoader().getResourceAsStream(jsonSchemaFile))); } catch (IOException e) { - throw new UnhandledServerException("Failed to read jsonSchemaFile " + jsonSchemaFile, e); + throw new JsonParsingException("Failed to read jsonSchemaFile " + jsonSchemaFile, e); } if (!JsonUtils.hasAnnotation(node, JsonUtils.ENTITY_TYPE_ANNOTATION)) { return null; @@ -526,7 +543,7 @@ public final class JsonUtils { try { return MASKER_OBJECT_MAPPER.writeValueAsString(entity); } catch (JsonProcessingException e) { - throw new UnhandledServerException(FAILED_TO_PROCESS_JSON, e); + throw new JsonParsingException(FAILED_TO_PROCESS_JSON, e); } } @@ -537,7 +554,7 @@ public final class JsonUtils { jsonString = EXPOSED_OBJECT_MAPPER.writeValueAsString(entity); return EXPOSED_OBJECT_MAPPER.readValue(jsonString, clazz); } catch (JsonProcessingException e) { - throw new UnhandledServerException(FAILED_TO_PROCESS_JSON, e); + throw new JsonParsingException(FAILED_TO_PROCESS_JSON, e); } } @@ -554,7 +571,7 @@ public final class JsonUtils { try { return OBJECT_MAPPER.readTree(extensionJson); } catch (JsonProcessingException e) { - throw new UnhandledServerException(FAILED_TO_PROCESS_JSON, e); + throw new JsonParsingException(FAILED_TO_PROCESS_JSON, e); } } @@ -562,7 +579,7 @@ public final class JsonUtils { try { return OBJECT_MAPPER.treeToValue(jsonNode, classType); } catch (JsonProcessingException e) { - throw new UnhandledServerException(FAILED_TO_PROCESS_JSON, e); + throw new JsonParsingException(FAILED_TO_PROCESS_JSON, e); } } @@ -584,7 +601,7 @@ public final class JsonUtils { .writeValueAsString(obj1sorted) .equals(OBJECT_MAPPER.writeValueAsString(obj2sorted)); } catch (JsonProcessingException e) { - throw new UnhandledServerException(FAILED_TO_PROCESS_JSON, e); + throw new JsonParsingException(FAILED_TO_PROCESS_JSON, e); } } @@ -715,4 +732,59 @@ public final class JsonUtils { return Json.createPatch(patchArray); } } + + public static List getJsonDataResources(Pattern pattern) throws IOException { + ArrayList resources = new ArrayList<>(); + String classPath = System.getProperty("java.class.path", "."); + Set classPathElements = + Arrays.stream(classPath.split(File.pathSeparator)) + .filter( + jarName -> + Stream.of("openmetadata", "collate").anyMatch(jarName.toLowerCase()::contains)) + .collect(Collectors.toSet()); + + for (String element : classPathElements) { + File file = new File(element); + resources.addAll( + file.isDirectory() + ? getResourcesFromDirectory(file, pattern) + : getResourcesFromJarFile(file, pattern)); + } + return resources; + } + + private static Collection getResourcesFromDirectory(File file, Pattern pattern) + throws IOException { + final Path root = Path.of(file.getPath()); + try (Stream paths = Files.walk(Paths.get(file.getPath()))) { + return paths + .filter(Files::isRegularFile) + .filter(path -> pattern.matcher(path.toString()).matches()) + .map( + path -> { + String relativePath = root.relativize(path).toString(); + LOG.debug("Adding directory file {}", relativePath); + return relativePath; + }) + .collect(Collectors.toSet()); + } + } + + private static Collection getResourcesFromJarFile(File file, Pattern pattern) { + LOG.debug("Adding from file {}", file); + ArrayList retval = new ArrayList<>(); + try (ZipFile zf = new ZipFile(file)) { + Enumeration e = zf.entries(); + while (e.hasMoreElements()) { + String fileName = e.nextElement().getName(); + if (pattern.matcher(fileName).matches()) { + retval.add(fileName); + LOG.debug("Adding file from jar {}", fileName); + } + } + } catch (Exception ignored) { + // Ignored exception + } + return retval; + } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/models/IndexMapping.java b/openmetadata-spec/src/main/java/org/openmetadata/search/IndexMapping.java similarity index 90% rename from openmetadata-service/src/main/java/org/openmetadata/service/search/models/IndexMapping.java rename to openmetadata-spec/src/main/java/org/openmetadata/search/IndexMapping.java index 4e2c36a7583..930501923d5 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/models/IndexMapping.java +++ b/openmetadata-spec/src/main/java/org/openmetadata/search/IndexMapping.java @@ -1,4 +1,4 @@ -package org.openmetadata.service.search.models; +package org.openmetadata.search; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; @@ -47,4 +47,8 @@ public class IndexMapping { ? childAliases.stream().map(a -> clusterAlias + INDEX_NAME_SEPARATOR + a).toList() : childAliases; } + + public String getIndexMappingFile(String language) { + return String.format(indexMappingFile, language).replaceFirst("^/", ""); + } } diff --git a/openmetadata-spec/src/main/java/org/openmetadata/search/IndexMappingLoader.java b/openmetadata-spec/src/main/java/org/openmetadata/search/IndexMappingLoader.java new file mode 100644 index 00000000000..3aaffa4e4c3 --- /dev/null +++ b/openmetadata-spec/src/main/java/org/openmetadata/search/IndexMappingLoader.java @@ -0,0 +1,139 @@ +package org.openmetadata.search; + +import jakarta.json.JsonObject; +import java.io.IOException; +import java.io.InputStream; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import lombok.Getter; +import org.openmetadata.schema.exception.JsonParsingException; +import org.openmetadata.schema.service.configuration.elasticsearch.ElasticSearchConfiguration; +import org.openmetadata.schema.utils.JsonUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@Getter +public class IndexMappingLoader { + + private static volatile IndexMappingLoader instance; + private ElasticSearchConfiguration elasticSearchConfiguration; + private String searchIndexMappingLanguage; + + private static final String OM_INDEX_MAPPING_FILE_PATH = "elasticsearch/indexMapping.json"; + private static final String COLLATE_INDEX_MAPPING_FILE_PATH = + "elasticsearch/collate/indexMapping.json"; + private static final Logger LOG = LoggerFactory.getLogger(IndexMappingLoader.class); + + @Getter Map indexMapping = new HashMap<>(); + @Getter Map> entityIndexMapping = new HashMap<>(); + + private IndexMappingLoader(ElasticSearchConfiguration elasticSearchConfiguration) + throws IOException { + this.elasticSearchConfiguration = elasticSearchConfiguration; + if (elasticSearchConfiguration.getSearchIndexMappingLanguage() == null) { + this.searchIndexMappingLanguage = "en"; + } else { + this.searchIndexMappingLanguage = + elasticSearchConfiguration.getSearchIndexMappingLanguage().toString().toLowerCase(); + } + loadIndexMapping(); + loadEntityIndexMapping(); + } + + private IndexMappingLoader() throws IOException { + this.searchIndexMappingLanguage = "en"; + loadIndexMapping(); + loadEntityIndexMapping(); + } + + public static void init(ElasticSearchConfiguration elasticSearchConfiguration) + throws IOException { + synchronized (IndexMappingLoader.class) { + if (instance == null) { + instance = new IndexMappingLoader(elasticSearchConfiguration); + } + } + } + + public static void init() throws IOException { + synchronized (IndexMappingLoader.class) { + if (instance == null) { + instance = new IndexMappingLoader(); + } + } + } + + public static IndexMappingLoader getInstance() { + IndexMappingLoader result = instance; + if (result != null) { + return result; + } else { + throw new IllegalStateException("IndexMappingLoader is not initialized. Call init() first."); + } + } + + private void loadIndexMapping() throws IOException { + Set entities; + try (InputStream inputStream = + IndexMappingLoader.class.getClassLoader().getResourceAsStream(OM_INDEX_MAPPING_FILE_PATH)) { + + if (inputStream == null) { + throw new IOException("Could not find " + OM_INDEX_MAPPING_FILE_PATH + " in classpath"); + } + + JsonObject jsonPayload = + JsonUtils.readJson(new String(inputStream.readAllBytes())).asJsonObject(); + entities = jsonPayload.keySet(); + for (String s : entities) { + indexMapping.put(s, JsonUtils.readValue(jsonPayload.get(s).toString(), IndexMapping.class)); + } + } catch (Exception e) { + throw new JsonParsingException("Failed to load indexMapping.json", e); + } + try (InputStream inputStream2 = + IndexMappingLoader.class + .getClassLoader() + .getResourceAsStream(COLLATE_INDEX_MAPPING_FILE_PATH)) { + if (inputStream2 != null) { + JsonObject jsonPayload = + JsonUtils.readJson(new String(inputStream2.readAllBytes())).asJsonObject(); + entities = jsonPayload.keySet(); + for (String s : entities) { + indexMapping.put( + s, JsonUtils.readValue(jsonPayload.get(s).toString(), IndexMapping.class)); + } + } + } catch (Exception e) { + LOG.warn("Failed to load indexMapping.json"); + } + } + + private void loadEntityIndexMapping() throws IOException { + if (entityIndexMapping == null) { + throw new IllegalStateException( + "Entity index map is not loaded. Call loadIndexMapping() first."); + } + + for (Map.Entry entry : indexMapping.entrySet()) { + String entityName = entry.getKey(); + IndexMapping indexMapping = entry.getValue(); + try (InputStream inputStream = + IndexMappingLoader.class + .getClassLoader() + .getResourceAsStream(indexMapping.getIndexMappingFile(searchIndexMappingLanguage))) { + if (inputStream == null) { + throw new IOException( + "Could not find " + + indexMapping.getIndexMappingFile(searchIndexMappingLanguage) + + " in classpath"); + } + Map jsonMap = + JsonUtils.getMapFromJson(new String(inputStream.readAllBytes())); + entityIndexMapping.put(entityName, jsonMap); + } catch (Exception e) { + throw new JsonParsingException("Failed to load index mapping for " + entityName, e); + } + } + } +} diff --git a/openmetadata-service/src/main/resources/elasticsearch/aggregated_cost_analysis_report_data_index.json b/openmetadata-spec/src/main/resources/elasticsearch/aggregated_cost_analysis_report_data_index.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/aggregated_cost_analysis_report_data_index.json rename to openmetadata-spec/src/main/resources/elasticsearch/aggregated_cost_analysis_report_data_index.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/api_collection_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/api_collection_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/api_collection_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/api_collection_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/api_endpoint_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/api_endpoint_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/api_endpoint_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/api_endpoint_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/api_service_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/api_service_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/api_service_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/api_service_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/chart_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/chart_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/chart_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/chart_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/classification_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/classification_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/classification_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/classification_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/container_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/container_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/container_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/container_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/dashboard_data_model_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/dashboard_data_model_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/dashboard_data_model_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/dashboard_data_model_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/dashboard_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/dashboard_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/dashboard_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/dashboard_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/dashboard_service_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/dashboard_service_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/dashboard_service_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/dashboard_service_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/data_products_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/data_products_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/data_products_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/data_products_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/database_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/database_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/database_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/database_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/database_schema_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/database_schema_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/database_schema_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/database_schema_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/database_service_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/database_service_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/database_service_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/database_service_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/domain_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/domain_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/domain_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/domain_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/glossary_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/glossary_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/glossary_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/glossary_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/glossary_term_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/glossary_term_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/glossary_term_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/glossary_term_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/ingestion_pipeline_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/ingestion_pipeline_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/ingestion_pipeline_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/ingestion_pipeline_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/messaging_service_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/messaging_service_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/messaging_service_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/messaging_service_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/metadata_service_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/metadata_service_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/metadata_service_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/metadata_service_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/metric_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/metric_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/metric_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/metric_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/mlmodel_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/mlmodel_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/mlmodel_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/mlmodel_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/mlmodel_service_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/mlmodel_service_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/mlmodel_service_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/mlmodel_service_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/pipeline_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/pipeline_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/pipeline_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/pipeline_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/pipeline_service_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/pipeline_service_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/pipeline_service_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/pipeline_service_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/query_cost_record_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/query_cost_record_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/query_cost_record_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/query_cost_record_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/query_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/query_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/query_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/query_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/search_entity_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/search_entity_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/search_entity_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/search_entity_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/search_service_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/search_service_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/search_service_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/search_service_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/storage_service_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/storage_service_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/storage_service_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/storage_service_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/stored_procedure_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/stored_procedure_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/stored_procedure_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/stored_procedure_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/table_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/table_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/table_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/table_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/tag_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/tag_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/tag_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/tag_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/team_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/team_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/team_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/team_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/test_case_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/test_case_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/test_case_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/test_case_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/test_case_resolution_status_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/test_case_resolution_status_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/test_case_resolution_status_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/test_case_resolution_status_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/test_case_result_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/test_case_result_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/test_case_result_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/test_case_result_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/test_suite_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/test_suite_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/test_suite_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/test_suite_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/topic_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/topic_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/topic_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/topic_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/user_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/en/user_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/en/user_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/en/user_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/entity_report_data_index.json b/openmetadata-spec/src/main/resources/elasticsearch/entity_report_data_index.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/entity_report_data_index.json rename to openmetadata-spec/src/main/resources/elasticsearch/entity_report_data_index.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/indexMapping.json b/openmetadata-spec/src/main/resources/elasticsearch/indexMapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/indexMapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/indexMapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/api_collection_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/api_collection_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/api_collection_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/api_collection_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/api_endpoint_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/api_endpoint_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/api_endpoint_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/api_endpoint_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/api_service_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/api_service_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/api_service_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/api_service_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/chart_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/chart_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/chart_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/chart_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/classification_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/classification_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/classification_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/classification_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/container_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/container_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/container_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/container_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_data_model_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/dashboard_data_model_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_data_model_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/dashboard_data_model_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/dashboard_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/dashboard_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_service_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/dashboard_service_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_service_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/dashboard_service_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/data_products_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/data_products_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/data_products_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/data_products_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/database_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/database_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/database_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/database_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/database_schema_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/database_schema_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/database_schema_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/database_schema_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/database_service_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/database_service_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/database_service_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/database_service_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/domain_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/domain_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/domain_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/domain_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/glossary_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/glossary_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/glossary_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/glossary_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/glossary_term_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/glossary_term_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/glossary_term_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/glossary_term_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/ingestion_pipeline_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/ingestion_pipeline_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/ingestion_pipeline_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/ingestion_pipeline_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/messaging_service_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/messaging_service_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/messaging_service_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/messaging_service_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/metadata_service_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/metadata_service_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/metadata_service_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/metadata_service_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/metric_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/metric_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/metric_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/metric_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/mlmodel_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/mlmodel_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/mlmodel_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/mlmodel_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/mlmodel_service_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/mlmodel_service_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/mlmodel_service_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/mlmodel_service_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/pipeline_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/pipeline_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/pipeline_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/pipeline_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/pipeline_service_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/pipeline_service_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/pipeline_service_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/pipeline_service_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/query_cost_record_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/query_cost_record_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/query_cost_record_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/query_cost_record_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/query_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/query_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/query_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/query_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/search_entity_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/search_entity_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/search_entity_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/search_entity_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/search_service_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/search_service_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/search_service_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/search_service_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/storage_service_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/storage_service_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/storage_service_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/storage_service_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/stored_procedure_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/stored_procedure_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/stored_procedure_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/stored_procedure_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/table_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/table_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/table_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/table_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/tag_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/tag_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/tag_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/tag_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/team_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/team_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/team_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/team_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/test_case_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/test_case_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/test_case_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/test_case_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/test_case_resolution_status_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/test_case_resolution_status_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/test_case_resolution_status_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/test_case_resolution_status_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/test_case_result_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/test_case_result_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/test_case_result_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/test_case_result_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/test_suite_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/test_suite_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/test_suite_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/test_suite_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/topic_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/topic_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/topic_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/topic_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/user_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/jp/user_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/jp/user_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/jp/user_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/raw_cost_analysis_report_data_index.json b/openmetadata-spec/src/main/resources/elasticsearch/raw_cost_analysis_report_data_index.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/raw_cost_analysis_report_data_index.json rename to openmetadata-spec/src/main/resources/elasticsearch/raw_cost_analysis_report_data_index.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/web_analytic_entity_view_report_data_index.json b/openmetadata-spec/src/main/resources/elasticsearch/web_analytic_entity_view_report_data_index.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/web_analytic_entity_view_report_data_index.json rename to openmetadata-spec/src/main/resources/elasticsearch/web_analytic_entity_view_report_data_index.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/web_analytic_user_activity_report_data_index.json b/openmetadata-spec/src/main/resources/elasticsearch/web_analytic_user_activity_report_data_index.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/web_analytic_user_activity_report_data_index.json rename to openmetadata-spec/src/main/resources/elasticsearch/web_analytic_user_activity_report_data_index.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/api_collection_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/api_collection_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/api_collection_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/api_collection_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/api_endpoint_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/api_endpoint_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/api_endpoint_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/api_endpoint_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/api_service_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/api_service_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/api_service_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/api_service_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/chart_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/chart_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/chart_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/chart_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/classification_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/classification_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/classification_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/classification_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/container_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/container_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/container_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/container_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_data_model_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/dashboard_data_model_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_data_model_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/dashboard_data_model_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/dashboard_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/dashboard_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_service_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/dashboard_service_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_service_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/dashboard_service_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/data_products_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/data_products_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/data_products_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/data_products_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/database_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/database_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/database_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/database_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/database_schema_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/database_schema_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/database_schema_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/database_schema_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/database_service_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/database_service_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/database_service_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/database_service_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/domain_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/domain_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/domain_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/domain_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/glossary_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/glossary_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/glossary_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/glossary_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/glossary_term_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/glossary_term_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/glossary_term_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/glossary_term_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/ingestion_pipeline_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/ingestion_pipeline_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/ingestion_pipeline_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/ingestion_pipeline_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/messaging_service_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/messaging_service_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/messaging_service_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/messaging_service_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/metadata_service_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/metadata_service_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/metadata_service_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/metadata_service_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/metric_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/metric_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/metric_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/metric_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/mlmodel_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/mlmodel_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/mlmodel_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/mlmodel_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/mlmodel_service_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/mlmodel_service_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/mlmodel_service_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/mlmodel_service_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/pipeline_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/pipeline_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/pipeline_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/pipeline_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/pipeline_service_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/pipeline_service_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/pipeline_service_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/pipeline_service_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/query_cost_record_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/query_cost_record_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/query_cost_record_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/query_cost_record_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/query_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/query_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/query_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/query_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/search_entity_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/search_entity_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/search_entity_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/search_entity_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/search_service_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/search_service_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/search_service_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/search_service_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/storage_service_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/storage_service_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/storage_service_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/storage_service_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/stored_procedure_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/stored_procedure_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/stored_procedure_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/stored_procedure_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/table_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/table_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/table_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/table_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/tag_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/tag_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/tag_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/tag_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/team_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/team_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/team_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/team_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/test_case_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/test_case_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/test_case_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/test_case_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/test_case_resolution_status_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/test_case_resolution_status_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/test_case_resolution_status_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/test_case_resolution_status_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/test_case_result_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/test_case_result_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/test_case_result_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/test_case_result_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/test_suite_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/test_suite_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/test_suite_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/test_suite_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/topic_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/topic_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/topic_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/topic_index_mapping.json diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/user_index_mapping.json b/openmetadata-spec/src/main/resources/elasticsearch/zh/user_index_mapping.json similarity index 100% rename from openmetadata-service/src/main/resources/elasticsearch/zh/user_index_mapping.json rename to openmetadata-spec/src/main/resources/elasticsearch/zh/user_index_mapping.json diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/ingestionPipelines/createIngestionPipeline.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/ingestionPipelines/createIngestionPipeline.ts index dd3cfc5e489..fb663258dfa 100644 --- a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/ingestionPipelines/createIngestionPipeline.ts +++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/ingestionPipelines/createIngestionPipeline.ts @@ -509,11 +509,7 @@ export interface Pipeline { * level metrics. */ computeTableMetrics?: boolean; - /** - * Processing Engine Configuration. If not provided, the Native Engine will be used by - * default. - */ - processingEngine?: ProcessingEngine; + processingEngine?: ProcessingEngine; /** * Percentage of data or no. of rows used to compute the profiler metrics and run data * quality tests @@ -1891,9 +1887,9 @@ export interface ProcessingEngine { */ config?: { [key: string]: any }; /** - * Spark Master URL (e.g. yarn, ,spark://host:port, local[*], etc.) + * Spark Connect Remote URL. */ - master?: string; + remote?: string; } /** @@ -2619,6 +2615,11 @@ export interface ConfigClass { * Pagination limit used for Alation APIs pagination */ paginationLimit?: number; + /** + * Proxy URL for the tableau server. If not provided, the hostPort will be used. This is + * used to generate the dashboard & Chart URL. + */ + proxyURL?: string; /** * Tableau Site Name. */ diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/ingestionPipelines/ingestionPipeline.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/ingestionPipelines/ingestionPipeline.ts index ed676bd89ea..df34506ea8b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/ingestionPipelines/ingestionPipeline.ts +++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/ingestionPipelines/ingestionPipeline.ts @@ -1068,11 +1068,7 @@ export interface Pipeline { * level metrics. */ computeTableMetrics?: boolean; - /** - * Processing Engine Configuration. If not provided, the Native Engine will be used by - * default. - */ - processingEngine?: ProcessingEngine; + processingEngine?: ProcessingEngine; /** * Percentage of data or no. of rows used to compute the profiler metrics and run data * quality tests @@ -2399,9 +2395,9 @@ export interface ProcessingEngine { */ config?: { [key: string]: any }; /** - * Spark Master URL (e.g. yarn, ,spark://host:port, local[*], etc.) + * Spark Connect Remote URL. */ - master?: string; + remote?: string; } /** @@ -3127,6 +3123,11 @@ export interface ConfigClass { * Pagination limit used for Alation APIs pagination */ paginationLimit?: number; + /** + * Proxy URL for the tableau server. If not provided, the hostPort will be used. This is + * used to generate the dashboard & Chart URL. + */ + proxyURL?: string; /** * Tableau Site Name. */ diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/metadataIngestion/databaseServiceProfilerPipeline.ts b/openmetadata-ui/src/main/resources/ui/src/generated/metadataIngestion/databaseServiceProfilerPipeline.ts index af7017ab0e5..6f79e0dd566 100644 --- a/openmetadata-ui/src/main/resources/ui/src/generated/metadataIngestion/databaseServiceProfilerPipeline.ts +++ b/openmetadata-ui/src/main/resources/ui/src/generated/metadataIngestion/databaseServiceProfilerPipeline.ts @@ -128,9 +128,9 @@ export interface ProcessingEngine { */ config?: { [key: string]: any }; /** - * Spark Master URL (e.g. yarn, ,spark://host:port, local[*], etc.) + * Spark Connect Remote URL. */ - master?: string; + remote?: string; } /**