This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-1590 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit e7ab0d7dbf7771ea2ee9ec532d8929da2fa5a9c7 Merge: 239eb05 b9dc738 Author: Dmytro Gnatyshyn <[email protected]> AuthorDate: Wed Mar 25 13:40:36 2020 +0200 Merge branch 'DLAB-1590' of github.com:apache/incubator-dlab into DLAB-1590 .../ProjectAdmin.java} | 21 ++-- .../User.java} | 21 ++-- .../java/com/epam/dlab/backendapi/dao/EnvDAO.java | 19 --- .../com/epam/dlab/backendapi/dao/ProjectDAO.java | 2 - .../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 11 +- .../dlab/backendapi/domain/ProjectManagingDTO.java | 16 --- .../interceptor/ProjectAdminInterceptor.java | 74 ++++++++++++ .../backendapi/modules/AwsSelfServiceModule.java | 83 ------------- .../backendapi/modules/AzureSelfServiceModule.java | 81 ------------- .../backendapi/modules/CloudProviderModule.java | 5 + .../backendapi/modules/GcpSelfServiceModule.java | 84 -------------- .../dlab/backendapi/modules/ModuleFactory.java | 13 --- .../backendapi/resources/EnvironmentResource.java | 2 +- .../resources/InfrastructureInfoResource.java | 11 +- .../dlab/backendapi/resources/ProjectResource.java | 52 +++------ .../resources/dto/HealthStatusPageDTO.java | 129 +-------------------- .../com/epam/dlab/backendapi/roles/UserRole.java | 13 +-- .../com/epam/dlab/backendapi/roles/UserRoles.java | 58 ++++++--- .../backendapi/service/EnvironmentService.java | 6 +- .../service/InfrastructureInfoService.java | 2 +- .../dlab/backendapi/service/ProjectService.java | 13 +-- .../service/impl/EnvironmentServiceImpl.java | 13 +-- .../impl/InfrastructureInfoServiceImpl.java | 22 ++-- .../service/impl/ProjectServiceImpl.java | 65 +++-------- .../service/impl/UserGroupServiceImpl.java | 6 +- .../src/main/resources/mongo/gcp/mongo_roles.json | 17 +++ .../resources/EnvironmentResourceTest.java | 8 +- .../resources/InfrastructureInfoResourceTest.java | 34 ++++-- .../backendapi/resources/ProjectResourceTest.java | 24 ++-- .../service/impl/EnvironmentServiceImplTest.java | 24 ---- .../service/impl/UserGroupServiceImplTest.java | 13 ++- 31 files changed, 284 insertions(+), 658 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
