This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/airavata-data-catalog.git
from 115764e Merge pull request #22 from apache/calcite
add 454ca5a Adding custos sharing lib
add 5fbb510 implement sharing logic
add 4ae109c Merge branch 'custos-integration' into main
add b493b4f Merge pull request #17 from isururanawaka/main
add 9f3c7b6 Adds SharingException to SharingManager methods for sharing
errors
add b94e157 Adding Custos sharing manager initialization: creating entity
type and permission type
add 8bbbbfd Create the data product sharing entity if it doesn't exist
add 40597be Including who is doing the sharing in the API
add e5cd6e4 Initial implementation of data product sharing view
add 0e958f2 Return name of data product sharing view in Custos impl
add 76d4c01 Implement resolve user method
add a0c86b2 Initial simple sharing implementation with user sharing
implemented
add a798dbb simple group sharing implementation
add 2f91e24 simple public sharing implementation
add ea2a4c6 Pick sharing manager implementation based on config
add 00a04c5 Adding unique constraints
add 032c659 Simple implementation of hierarchical sharing of data products
add 5c6fd81 Removing todo, nothing to initialize per tenant
add 8113e9b Owner of data product has all permissions
add e070663 Integrated SharingManager into the Data Catalog API
add f424f48 Merge branch 'custos-integration' into main
add 30a361b Merge pull request #29 from isururanawaka/main
add 381a452 Checking if user already exists
add eacc78d Add spring jpa auditing
add d13e11b Class name based configuration of sharing manager
add bf71050 Refactored projects splitting out core and simple sharing
impl and custos sharing impl
add e7570f2 Make usePlainText a property
add 25a3eae Don't need to call onCompleted after onError
add a65085d Don't start a web server port, unneeded
add e4adca5 Custos sdk dependency fixes
add 9260d2d Make tenantId and userId configurable
add 6399bed Utility class to generate test Custos user for local testing
and development
new ca6db18 Merge pull request #32 from apache/custos-integration
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.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
.../{client => server/simple-sharing}/pom.xml | 22 +-
.../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, 2531 insertions(+), 216 deletions(-)
create mode 100644 data-catalog-api/server/core/pom.xml
rename data-catalog-api/server/{ =>
core}/src/main/java/org/apache/airavata/datacatalog/api/model/DataProductEntity.java
(92%)
rename data-catalog-api/server/{ =>
core}/src/main/java/org/apache/airavata/datacatalog/api/model/MetadataSchemaEntity.java
(100%)
rename data-catalog-api/server/{ =>
core}/src/main/java/org/apache/airavata/datacatalog/api/model/MetadataSchemaFieldEntity.java
(100%)
copy
data-catalog-api/server/{src/main/java/org/apache/airavata/datacatalog/api/model/UserEntity.java
=>
core/src/main/java/org/apache/airavata/datacatalog/api/model/TenantEntity.java}
(62%)
rename data-catalog-api/server/{ =>
core}/src/main/java/org/apache/airavata/datacatalog/api/model/UserEntity.java
(79%)
rename data-catalog-api/server/{ =>
core}/src/main/java/org/apache/airavata/datacatalog/api/repository/DataProductRepository.java
(100%)
rename data-catalog-api/server/{ =>
core}/src/main/java/org/apache/airavata/datacatalog/api/repository/MetadataSchemaFieldRepository.java
(100%)
rename data-catalog-api/server/{ =>
core}/src/main/java/org/apache/airavata/datacatalog/api/repository/MetadataSchemaRepository.java
(100%)
create mode 100644
data-catalog-api/server/core/src/main/java/org/apache/airavata/datacatalog/api/repository/TenantRepository.java
create mode 100644
data-catalog-api/server/core/src/main/java/org/apache/airavata/datacatalog/api/repository/UserRepository.java
rename data-catalog-api/server/{ =>
core}/src/main/java/org/apache/airavata/datacatalog/api/sharing/SharingManager.java
(67%)
create mode 100644
data-catalog-api/server/core/src/main/java/org/apache/airavata/datacatalog/api/sharing/exception/SharingException.java
create mode 100644 data-catalog-api/server/custos-sharing/pom.xml
create mode 100644
data-catalog-api/server/custos-sharing/src/main/java/org/apache/airavata/datacatalog/api/sharing/CustosTestDataBootstrap.java
create mode 100644
data-catalog-api/server/custos-sharing/src/main/java/org/apache/airavata/datacatalog/api/sharing/SharingManagerImpl.java
create mode 100644
data-catalog-api/server/custos-sharing/src/main/resources/custos_data_product_sharing_view.sql
copy data-catalog-api/server/{ => service}/pom.xml (62%)
create mode 100644
data-catalog-api/server/service/src/main/java/org/apache/airavata/datacatalog/api/DataCatalogApiServiceApplication.java
rename data-catalog-api/server/{ =>
service}/src/main/java/org/apache/airavata/datacatalog/api/exception/EntityNotFoundException.java
(100%)
rename data-catalog-api/server/{ =>
service}/src/main/java/org/apache/airavata/datacatalog/api/exception/MetadataSchemaSqlParseException.java
(100%)
rename data-catalog-api/server/{ =>
service}/src/main/java/org/apache/airavata/datacatalog/api/exception/MetadataSchemaSqlValidateException.java
(100%)
rename data-catalog-api/server/{ =>
service}/src/main/java/org/apache/airavata/datacatalog/api/mapper/DataProductMapper.java
(90%)
rename data-catalog-api/server/{ =>
service}/src/main/java/org/apache/airavata/datacatalog/api/mapper/MetadataSchemaFieldMapper.java
(100%)
rename data-catalog-api/server/{ =>
service}/src/main/java/org/apache/airavata/datacatalog/api/mapper/MetadataSchemaMapper.java
(100%)
create mode 100644
data-catalog-api/server/service/src/main/java/org/apache/airavata/datacatalog/api/mapper/UserInfoMapper.java
rename data-catalog-api/server/{ =>
service}/src/main/java/org/apache/airavata/datacatalog/api/query/MetadataSchemaQueryExecutor.java
(73%)
rename data-catalog-api/server/{ =>
service}/src/main/java/org/apache/airavata/datacatalog/api/query/MetadataSchemaQueryResult.java
(100%)
rename data-catalog-api/server/{ =>
service}/src/main/java/org/apache/airavata/datacatalog/api/query/MetadataSchemaQueryWriter.java
(70%)
rename data-catalog-api/server/{ =>
service}/src/main/java/org/apache/airavata/datacatalog/api/query/impl/MetadataSchemaQueryExecutorImpl.java
(97%)
rename data-catalog-api/server/{ =>
service}/src/main/java/org/apache/airavata/datacatalog/api/query/impl/PostgresqlMetadataSchemaQueryWriterImpl.java
(86%)
rename data-catalog-api/server/{ =>
service}/src/main/java/org/apache/airavata/datacatalog/api/service/DataCatalogAPIService.java
(76%)
rename data-catalog-api/server/{ =>
service}/src/main/java/org/apache/airavata/datacatalog/api/service/DataCatalogService.java
(85%)
rename data-catalog-api/server/{ =>
service}/src/main/java/org/apache/airavata/datacatalog/api/service/impl/DataCatalogServiceImpl.java
(89%)
create mode 100644
data-catalog-api/server/service/src/main/resources/application.properties
rename data-catalog-api/server/{ => service}/src/main/resources/logback.xml
(100%)
rename data-catalog-api/server/{ =>
service}/src/test/java/org/apache/airavata/datacatalog/api/DataCatalogApiServerApplicationTests.java
(100%)
copy data-catalog-api/{client => server/simple-sharing}/pom.xml (53%)
create mode 100644
data-catalog-api/server/simple-sharing/src/main/java/org/apache/airavata/datacatalog/api/model/sharing/simple/SimpleGroupEntity.java
create mode 100644
data-catalog-api/server/simple-sharing/src/main/java/org/apache/airavata/datacatalog/api/model/sharing/simple/SimpleGroupSharingEntity.java
create mode 100644
data-catalog-api/server/simple-sharing/src/main/java/org/apache/airavata/datacatalog/api/model/sharing/simple/SimplePublicSharingEntity.java
create mode 100644
data-catalog-api/server/simple-sharing/src/main/java/org/apache/airavata/datacatalog/api/model/sharing/simple/SimpleTenantEntity.java
create mode 100644
data-catalog-api/server/simple-sharing/src/main/java/org/apache/airavata/datacatalog/api/model/sharing/simple/SimpleUserEntity.java
create mode 100644
data-catalog-api/server/simple-sharing/src/main/java/org/apache/airavata/datacatalog/api/model/sharing/simple/SimpleUserSharingEntity.java
create mode 100644
data-catalog-api/server/simple-sharing/src/main/java/org/apache/airavata/datacatalog/api/repository/sharing/simple/SimpleGroupRepository.java
create mode 100644
data-catalog-api/server/simple-sharing/src/main/java/org/apache/airavata/datacatalog/api/repository/sharing/simple/SimpleGroupSharingRepository.java
create mode 100644
data-catalog-api/server/simple-sharing/src/main/java/org/apache/airavata/datacatalog/api/repository/sharing/simple/SimplePublicSharingRepository.java
create mode 100644
data-catalog-api/server/simple-sharing/src/main/java/org/apache/airavata/datacatalog/api/repository/sharing/simple/SimpleTenantRepository.java
create mode 100644
data-catalog-api/server/simple-sharing/src/main/java/org/apache/airavata/datacatalog/api/repository/sharing/simple/SimpleUserRepository.java
create mode 100644
data-catalog-api/server/simple-sharing/src/main/java/org/apache/airavata/datacatalog/api/repository/sharing/simple/SimpleUserSharingRepository.java
create mode 100644
data-catalog-api/server/simple-sharing/src/main/java/org/apache/airavata/datacatalog/api/sharing/SimpleSharingManagerImpl.java
create mode 100644
data-catalog-api/server/simple-sharing/src/main/resources/schema.sql
create mode 100644
data-catalog-api/server/simple-sharing/src/test/java/org/apache/airavata/datacatalog/api/sharing/SimpleSharingManagerImplTest.java
create mode 100644
data-catalog-api/server/simple-sharing/src/test/resources/application.properties
delete mode 100644
data-catalog-api/server/src/main/java/org/apache/airavata/datacatalog/api/DataCatalogApiServiceApplication.java
delete mode 100644
data-catalog-api/server/src/main/resources/application.properties
