Fix #3819 & #3821 - Minor JSON Schema fixes (#3872)

Fix #3819 & #3821 - Minor JSON Schema fixes (#3872)

catalog-rest-service/src/main/resources/json/schema/entity/services/connections/database/bigQueryConnection.json

@@ -46,7 +46,7 @@
     "enablePolicyTagImport": {
       "description": "Enable importing policy tags of BigQuery into OpenMetadata",
       "type": "boolean",
-      "default": "true"
+      "default": true
     },
     "tagCategoryName": {
       "description": "OpenMetadata Tag category name if enablePolicyTagImport is set to true.",

catalog-rest-service/src/main/resources/json/schema/entity/services/ingestionPipelines/ingestionPipeline.json

@@ -19,12 +19,12 @@
         "forceDeploy": {
           "description": "Deploy the pipeline by overwriting existing pipeline with the same name.",
           "type": "boolean",
-          "default": "false"
+          "default": false
         },
         "pausePipeline": {
           "description": "pause the pipeline from running once the deploy is finished successfully.",
           "type": "boolean",
-          "default": "false"
+          "default": false
         },
         "concurrency": {
           "description": "Concurrency of the Pipeline.",
@@ -61,7 +61,7 @@
         "pipelineCatchup": {
           "description": "Run past executions if the start date is in the past.",
           "type": "boolean",
-          "default": "false"
+          "default": false
         },
         "scheduleInterval": {
           "description": "Scheduler Interval for the pipeline in cron format.",

catalog-rest-service/src/main/resources/json/schema/metadataIngestion/databaseServiceMetadataPipeline.json

@@ -7,17 +7,17 @@
     "markDeletedTables": {
       "description": "Optional configuration to soft delete tables in OpenMetadata if the source tables are deleted.",
       "type": "boolean",
-      "default": "true"
+      "default": true
     },
     "includeViews": {
       "description": "Optional configuration to turn off fetching metadata for views.",
       "type": "boolean",
-      "default": "true"
+      "default": true
     },
     "generateSampleData": {
       "description": "Option to turn on/off generating sample data during metadata extraction.",
       "type": "boolean",
-      "default": "true"
+      "default": true
     },
     "sampleDataQuery": {
       "description": "Sample data extraction query.",
@@ -27,7 +27,7 @@
     "enableDataProfiler": {
       "description": "Run data profiler as part of this metadata ingestion to get table profile data.",
       "type": "boolean",
-      "default": "false"
+      "default": false
     },
     "schemaFilterPattern": {
       "description": "Regex to only fetch tables or databases that matches the pattern.",

catalog-rest-service/src/main/resources/json/schema/metadataIngestion/workflow.json

@@ -113,6 +113,7 @@
     },
     "sourceConfig": {
       "description": "Additional connection configuration.",
+      "javaType": "org.openmetadata.catalog.metadataIngestion.SourceConfig",
       "type": "object",
       "properties": {
         "config": {
@@ -275,7 +276,7 @@
       "additionalProperties": false
     }
   },
-  "anyOf": [
+  "oneOf": [
     {
       "required": ["name", "openMetadataWorkflowConfig", "source", "sink"]
     },

catalog-rest-service/src/main/resources/json/schema/type/databaseConnectionConfig.json

@@ -29,17 +29,17 @@
     "includeViews": {
       "description": "optional configuration to turn off fetching metadata for views.",
       "type": "boolean",
-      "default": "true"
+      "default": true
     },
     "includeTables": {
       "description": "Optional configuration to turn off fetching metadata for tables.",
       "type": "boolean",
-      "default": "true"
+      "default": true
     },
     "generateSampleData": {
       "description": "Turn on/off collecting sample data.",
       "type": "boolean",
-      "default": "true"
+      "default": true
     },
     "sampleDataQuery": {
       "description": "query to generate sample data.",
@@ -49,7 +49,7 @@
     "enableDataProfiler": {
       "description": "Run data profiler as part of ingestion to get table profile data.",
       "type": "boolean",
-      "default": "false"
+      "default": false
     },
     "includeFilterPattern": {
       "description": "Regex to only fetch tables or databases that matches the pattern.",

catalog-rest-service/src/main/resources/json/schema/type/filterPattern.json

@@ -1,13 +1,13 @@
 {
   "$id": "https://open-metadata.org/schema/type/filterPattern.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "MetadataWorkflow",
+  "title": "FilterPattern",
   "description": "OpenMetadata Ingestion Framework definition.",
   "type": "object",
   "definitions": {
     "filterPattern": {
       "type": "object",
-      "javaType": "org.openmetadata.catalog.metadataingestion.FilterPattern",
+      "javaType": "org.openmetadata.catalog.metadataIngestion.FilterPattern",
       "description": "Regex to only fetch dashboards or charts that matches the pattern.",
       "properties": {
         "includes": {

catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/services/DatabaseServiceResourceTest.java

@@ -36,8 +36,8 @@ import org.openmetadata.catalog.entity.services.DatabaseService;
 import org.openmetadata.catalog.entity.services.ingestionPipelines.IngestionPipeline;
 import org.openmetadata.catalog.jdbi3.DatabaseServiceRepository.DatabaseServiceEntityInterface;
 import org.openmetadata.catalog.metadataIngestion.DatabaseServiceMetadataPipeline;
-import org.openmetadata.catalog.metadataingestion.FilterPattern;
-import org.openmetadata.catalog.metadataingestion.SourceConfig;
+import org.openmetadata.catalog.metadataIngestion.FilterPattern;
+import org.openmetadata.catalog.metadataIngestion.SourceConfig;
 import org.openmetadata.catalog.resources.EntityResourceTest;
 import org.openmetadata.catalog.resources.services.database.DatabaseServiceResource.DatabaseServiceList;
 import org.openmetadata.catalog.resources.services.ingestionpipelines.IngestionPipelineResourceTest;

catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/services/ingestionpipelines/IngestionPipelineResourceTest.java

@@ -45,7 +45,6 @@ import org.openmetadata.catalog.airflow.AirflowConfiguration;
 import org.openmetadata.catalog.api.services.CreateDatabaseService;
 import org.openmetadata.catalog.api.services.DatabaseConnection;
 import org.openmetadata.catalog.api.services.ingestionPipelines.CreateIngestionPipeline;
-import org.openmetadata.catalog.api.services.ingestionPipelines.SourceConfig;
 import org.openmetadata.catalog.entity.services.DatabaseService;
 import org.openmetadata.catalog.entity.services.ingestionPipelines.AirflowConfig;
 import org.openmetadata.catalog.entity.services.ingestionPipelines.IngestionPipeline;
@@ -55,8 +54,9 @@ import org.openmetadata.catalog.jdbi3.IngestionPipelineRepository;
 import org.openmetadata.catalog.metadataIngestion.DashboardServiceMetadataPipeline;
 import org.openmetadata.catalog.metadataIngestion.DatabaseServiceMetadataPipeline;
 import org.openmetadata.catalog.metadataIngestion.DatabaseServiceQueryUsagePipeline;
+import org.openmetadata.catalog.metadataIngestion.FilterPattern;
 import org.openmetadata.catalog.metadataIngestion.MessagingServiceMetadataPipeline;
-import org.openmetadata.catalog.metadataingestion.FilterPattern;
+import org.openmetadata.catalog.metadataIngestion.SourceConfig;
 import org.openmetadata.catalog.resources.EntityResourceTest;
 import org.openmetadata.catalog.resources.services.DatabaseServiceResourceTest;
 import org.openmetadata.catalog.services.connections.database.BigQueryConnection;
@@ -370,7 +370,7 @@ public class IngestionPipelineResourceTest extends EntityResourceTest<IngestionP
                         .withStartDate(startDate.toString())),
             OK,
             ADMIN_AUTH_HEADERS);
-    String expectedFQN = EntityUtil.getFQN(SUPERSET_REFERENCE.getName(), ingestion.getName());
+    String expectedFQN = FullyQualifiedName.build(SUPERSET_REFERENCE.getName(), ingestion.getName());
     assertEquals(startDate.toString(), ingestion.getAirflowConfig().getStartDate());
     assertEquals(pipelineConcurrency, ingestion.getAirflowConfig().getConcurrency());
     assertEquals(expectedFQN, ingestion.getFullyQualifiedName());
@@ -424,7 +424,7 @@ public class IngestionPipelineResourceTest extends EntityResourceTest<IngestionP
                         .withStartDate(startDate.toString())),
             OK,
             ADMIN_AUTH_HEADERS);
-    String expectedFQN = EntityUtil.getFQN(KAFKA_REFERENCE.getName(), ingestion.getName());
+    String expectedFQN = FullyQualifiedName.build(KAFKA_REFERENCE.getName(), ingestion.getName());
     assertEquals(startDate.toString(), ingestion.getAirflowConfig().getStartDate());
     assertEquals(pipelineConcurrency, ingestion.getAirflowConfig().getConcurrency());
     assertEquals(expectedFQN, ingestion.getFullyQualifiedName());