This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch custos-integration in repository https://gitbox.apache.org/repos/asf/airavata-data-catalog.git
commit 4ae109c01015b3ce61dfe2e5408f0982eee04d3d Merge: 5fbb510 115764e Author: Marcus Christie <[email protected]> AuthorDate: Wed Mar 29 09:21:46 2023 -0400 Merge branch 'custos-integration' into main .../api/client/DataCatalogAPIClient.java | 205 ++++++++++++++++- data-catalog-api/server/pom.xml | 10 + .../api/exception/EntityNotFoundException.java | 25 +++ .../exception/MetadataSchemaSqlParseException.java | 25 +++ .../MetadataSchemaSqlValidateException.java | 25 +++ .../datacatalog/api/mapper/DataProductMapper.java | 36 ++- .../api/mapper/MetadataSchemaFieldMapper.java | 36 +++ .../api/mapper/MetadataSchemaMapper.java | 19 ++ .../datacatalog/api/model/DataProductEntity.java | 25 +++ .../api/model/MetadataSchemaEntity.java | 81 +++++++ .../api/model/MetadataSchemaFieldEntity.java | 110 ++++++++++ .../api/query/MetadataSchemaQueryExecutor.java | 10 + .../api/query/MetadataSchemaQueryResult.java | 9 + .../api/query/MetadataSchemaQueryWriter.java | 21 ++ .../impl/MetadataSchemaQueryExecutorImpl.java | 215 ++++++++++++++++++ .../PostgresqlMetadataSchemaQueryWriterImpl.java | 201 +++++++++++++++++ .../api/repository/DataProductRepository.java | 5 +- .../repository/MetadataSchemaFieldRepository.java | 13 ++ .../api/repository/MetadataSchemaRepository.java | 9 + .../api/service/DataCatalogAPIService.java | 244 +++++++++++++++++---- .../api/service/DataCatalogService.java | 47 ++++ .../api/service/impl/DataCatalogServiceImpl.java | 231 +++++++++++++++++++ .../server/src/main/resources/logback.xml | 4 + .../api}/DataCatalogApiServerApplicationTests.java | 2 +- .../stubs/src/main/proto/DataCatalogAPI.proto | 111 +++++++++- 25 files changed, 1669 insertions(+), 50 deletions(-) diff --cc data-catalog-api/stubs/src/main/proto/DataCatalogAPI.proto index 476fb1a,a7a09c3..a32a714 --- a/data-catalog-api/stubs/src/main/proto/DataCatalogAPI.proto +++ b/data-catalog-api/stubs/src/main/proto/DataCatalogAPI.proto @@@ -62,7 -62,24 +62,25 @@@ message DataProduct optional string parent_data_product_id = 2; string name = 3; optional string metadata = 4; - string tenant_id = 5; + repeated string metadata_schemas = 5; ++ string tenant_id = 6; + } + + enum FieldValueType { + STRING = 0; + INTEGER = 1; + FLOAT = 2; + BOOLEAN = 3; + DATESTRING = 4; + } + message MetadataSchema { + string schema_name = 1; + } + message MetadataSchemaField { + string schema_name = 1; + string field_name = 2; + string json_path = 3; + FieldValueType value_type = 4; } message DataProductCreateRequest {
