This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/airavata-data-catalog.git
commit ca6db183b871c5eb2e437051b02221b5ed44d589 Merge: 115764e 6399bed Author: Marcus Christie <[email protected]> AuthorDate: Wed May 3 10:21:48 2023 -0400 Merge pull request #32 from apache/custos-integration Integrate simple sharing and initial custos sharing managers .gitignore | 4 + README.md | 2 +- .../api/client/DataCatalogAPIClient.java | 28 +- data-catalog-api/server/core/pom.xml | 39 ++ .../datacatalog/api/model/DataProductEntity.java | 13 +- .../api/model/MetadataSchemaEntity.java | 0 .../api/model/MetadataSchemaFieldEntity.java | 0 .../datacatalog/api/model/TenantEntity.java} | 35 +- .../airavata/datacatalog/api/model/UserEntity.java | 17 +- .../api/repository/DataProductRepository.java | 0 .../repository/MetadataSchemaFieldRepository.java | 0 .../api/repository/MetadataSchemaRepository.java | 0 .../api/repository/TenantRepository.java | 13 + .../datacatalog/api/repository/UserRepository.java | 14 + .../datacatalog/api/sharing/SharingManager.java | 39 +- .../api/sharing/exception/SharingException.java | 24 ++ data-catalog-api/server/custos-sharing/pom.xml | 52 +++ .../api/sharing/CustosTestDataBootstrap.java | 36 ++ .../api/sharing/SharingManagerImpl.java | 323 ++++++++++++++ .../resources/custos_data_product_sharing_view.sql | 24 ++ data-catalog-api/server/pom.xml | 123 ++---- data-catalog-api/server/{ => service}/pom.xml | 44 +- .../api/DataCatalogApiServiceApplication.java | 50 +++ .../api/exception/EntityNotFoundException.java | 0 .../exception/MetadataSchemaSqlParseException.java | 0 .../MetadataSchemaSqlValidateException.java | 0 .../datacatalog/api/mapper/DataProductMapper.java | 10 +- .../api/mapper/MetadataSchemaFieldMapper.java | 0 .../api/mapper/MetadataSchemaMapper.java | 0 .../datacatalog/api/mapper/UserInfoMapper.java | 22 + .../api/query/MetadataSchemaQueryExecutor.java | 3 +- .../api/query/MetadataSchemaQueryResult.java | 0 .../api/query/MetadataSchemaQueryWriter.java | 5 +- .../impl/MetadataSchemaQueryExecutorImpl.java | 6 +- .../PostgresqlMetadataSchemaQueryWriterImpl.java | 31 +- .../api/service/DataCatalogAPIService.java | 95 +++- .../api/service/DataCatalogService.java | 6 +- .../api/service/impl/DataCatalogServiceImpl.java | 29 +- .../src/main/resources/application.properties | 24 ++ .../{ => service}/src/main/resources/logback.xml | 0 .../api/DataCatalogApiServerApplicationTests.java | 0 data-catalog-api/server/simple-sharing/pom.xml | 35 ++ .../model/sharing/simple/SimpleGroupEntity.java | 112 +++++ .../sharing/simple/SimpleGroupSharingEntity.java | 112 +++++ .../sharing/simple/SimplePublicSharingEntity.java | 100 +++++ .../model/sharing/simple/SimpleTenantEntity.java | 96 +++++ .../api/model/sharing/simple/SimpleUserEntity.java | 109 +++++ .../sharing/simple/SimpleUserSharingEntity.java | 112 +++++ .../sharing/simple/SimpleGroupRepository.java | 12 + .../simple/SimpleGroupSharingRepository.java | 13 + .../simple/SimplePublicSharingRepository.java | 15 + .../sharing/simple/SimpleTenantRepository.java | 11 + .../sharing/simple/SimpleUserRepository.java | 18 + .../simple/SimpleUserSharingRepository.java | 13 + .../api/sharing/SimpleSharingManagerImpl.java | 292 +++++++++++++ .../simple-sharing/src/main/resources/schema.sql | 80 ++++ .../api/sharing/SimpleSharingManagerImplTest.java | 476 +++++++++++++++++++++ .../src/test/resources/application.properties | 10 + .../api/DataCatalogApiServiceApplication.java | 13 - .../src/main/resources/application.properties | 5 - .../stubs/src/main/proto/DataCatalogAPI.proto | 13 +- pom.xml | 2 +- 62 files changed, 2552 insertions(+), 208 deletions(-)
