This is an automated email from the ASF dual-hosted git repository.
yasith pushed a change to branch feat/grpc-armeria-migration
in repository https://gitbox.apache.org/repos/asf/airavata.git
from b53d28658a refactor: move shared types to common/, eliminate
execution/ from airavata-api root
add 95b1708d65 refactor: flatten profile-service nesting, move service
protos to modules, clean root of stale files
add 30e69eba6c refactor: flatten research-service and agent-service
package nesting for consistency
No new revisions were added by this update.
Summary of changes:
.../service/services => }/AiravataFileService.java | 9 +-
.../service/services => }/AiravataService.java | 8 +-
.../service => }/config/AgentProperties.java | 2 +-
.../service => }/config/AgentServiceConfig.java | 8 +-
.../config/ClusterApplicationConfig.java | 2 +-
.../AgentConnectionHandler.java | 4 +-
.../AgentInteractionGrpcHandler.java | 2 +-
.../AgentManagementHandler.java | 8 +-
.../ExperimentManagementGrpcHandler.java | 2 +-
.../handlers => handler}/FuseFSHandler.java | 2 +-
.../handlers => handler}/PlanGrpcHandler.java | 4 +-
.../service/handlers => handler}/PlanHandler.java | 6 +-
.../db/entity => model}/AgentDeploymentInfo.java | 2 +-
.../db/entity => model}/AgentExecution.java | 2 +-
.../db/entity => model}/AgentExecutionStatus.java | 2 +-
.../service/models => model}/DirectoryInfo.java | 2 +-
.../ExperimentStorageResponse.java | 2 +-
.../service/models => model}/FileInfo.java | 2 +-
.../service/db/entity => model}/Plan.java | 2 +-
.../AgentDeploymentInfoRepo.java | 4 +-
.../db/repo => repository}/AgentExecutionRepo.java | 4 +-
.../AgentExecutionStatusRepo.java | 4 +-
.../service/db/repo => repository}/PlanRepo.java | 4 +-
airavata-api/compute-service/pom.xml | 30 +++++++
.../sharing/util/AiravataDataMigrator.java | 2 +-
.../proto}/gateway_resource_profile_service.proto | 0
.../proto}/group_resource_profile_service.proto | 0
.../src/main/proto}/resource_service.proto | 0
.../proto}/user_resource_profile_service.proto | 0
airavata-api/credential-service/pom.xml | 34 ++++++++
.../src/main/proto}/credential_service.proto | 0
airavata-api/orchestration-service/pom.xml | 30 +++++++
.../execution/orchestrator/AiravataTask.java | 2 +-
.../execution/orchestrator/TaskContext.java | 2 +-
.../src/main/proto}/gateway_service.proto | 0
airavata-api/profile-service/pom.xml | 30 +++++++
.../airavata/common/security/UserContext.java | 2 +-
.../TenantManagementInterface.java | 2 +-
.../impl => iam}/TenantManagementKeycloakImpl.java | 3 +-
.../{profile => }/mapper/ProfileMapper.java | 6 +-
.../service/{interceptor => }/SecurityCheck.java | 2 +-
.../{interceptor => }/SecurityInterceptor.java | 5 +-
.../service/{interceptor => }/SecurityModule.java | 2 +-
.../AbstractRepository.java | 4 +-
.../tenant/entities => tenant}/GatewayEntity.java | 2 +-
.../TenantProfileRepository.java | 8 +-
.../CustomizedDashboardEntity.java | 2 +-
.../entities => user}/NSFDemographicsEntity.java | 2 +-
.../UserProfileCatalogDBInitConfig.java | 2 +-
.../user/entities => user}/UserProfileEntity.java | 2 +-
.../UserProfileRegistryException.java | 2 +-
.../UserProfileRepository.java | 9 +-
.../{profile/commons/utils => util}/Committer.java | 2 +-
.../commons/utils => util}/JPAConstants.java | 2 +-
.../commons/utils => util}/QueryConstants.java | 2 +-
.../{profile/commons/utils => util}/Utils.java | 2 +-
.../src/main/proto}/iam_admin_service.proto | 0
.../src/main/proto}/user_profile_service.proto | 0
.../core/tests => iam}/SetupNewGateway.java | 3 +-
airavata-api/research-service/pom.xml | 3 +
.../research/{service => }/AiravataService.java | 4 +-
.../{service => }/ApplicationCatalogService.java | 2 +-
.../research/{service => }/ExperimentService.java | 2 +-
.../{service => }/NotificationService.java | 2 +-
.../research/{service => }/ParserService.java | 2 +-
.../research/{service => }/ProjectService.java | 2 +-
.../{service => }/config/DevDataInitializer.java | 20 ++---
.../{service => }/config/ResearchProperties.java | 2 +-
.../config/ResearchServiceConfig.java | 8 +-
.../research/{service => }/enums/PrivacyEnum.java | 2 +-
.../{service => }/enums/ResourceTypeEnum.java | 2 +-
.../{service => }/enums/SessionStatusEnum.java | 2 +-
.../research/{service => }/enums/StateEnum.java | 2 +-
.../research/{service => }/enums/StatusEnum.java | 2 +-
.../handlers => handler}/ProjectHandler.java | 18 ++--
.../ResearchHubGrpcHandler.java | 2 +-
.../handlers => handler}/ResearchHubHandler.java | 14 ++--
.../ResearchProjectGrpcHandler.java | 4 +-
.../ResearchResourceGrpcHandler.java | 21 +++--
.../ResearchSessionGrpcHandler.java | 6 +-
.../handlers => handler}/ResourceHandler.java | 33 ++++----
.../handlers => handler}/SessionHandler.java | 10 +--
.../model/entity => model}/DatasetResource.java | 4 +-
.../model/entity => model}/ModelResource.java | 4 +-
.../model/entity => model}/NotebookResource.java | 4 +-
.../{service/model/entity => model}/Project.java | 4 +-
.../model/entity => model}/RepositoryResource.java | 4 +-
.../{service/model/entity => model}/Resource.java | 10 +--
.../model/entity => model}/ResourceStar.java | 2 +-
.../{service/model/entity => model}/Session.java | 4 +-
.../{service/model/entity => model}/Tag.java | 2 +-
.../repo => repository}/ProjectRepository.java | 10 +--
.../repo => repository}/ResourceRepository.java | 6 +-
.../ResourceStarRepository.java | 8 +-
.../repo => repository}/SessionRepository.java | 6 +-
.../model/repo => repository}/TagRepository.java | 4 +-
.../main/proto}/application_catalog_service.proto | 0
.../src/main/proto}/experiment_service.proto | 0
.../src/main/proto}/notification_service.proto | 0
.../src/main/proto}/parser_service.proto | 0
.../src/main/proto}/project_service.proto | 0
.../ApplicationCatalogServiceTest.java | 2 +-
.../{service => }/ExperimentServiceTest.java | 2 +-
.../{service => }/NotificationServiceTest.java | 2 +-
.../research/{service => }/ParserServiceTest.java | 2 +-
.../research/{service => }/ProjectServiceTest.java | 2 +-
airavata-api/sharing-service/pom.xml | 34 ++++++++
.../src/main/proto}/group_manager_service.proto | 0
.../src/main/proto}/sharing_service.proto | 0
.../airavata/common/utils/DatabaseTestCases.java | 95 ----------------------
airavata-api/storage-service/pom.xml | 34 ++++++++
.../src/main/proto}/data_product_service.proto | 0
.../src/main/proto}/file_service.proto | 0
airavata-server/pom.xml | 41 ++++++++++
.../server/config/ServiceWiringConfig.java | 2 +-
.../server/grpc/AiravataArmeriaConfig.java | 4 +-
.../services/ApplicationCatalogGrpcService.java | 2 +-
.../grpc/services/ExperimentGrpcService.java | 2 +-
.../server/grpc/services/IamAdminGrpcService.java | 4 +-
.../grpc/services/NotificationGrpcService.java | 2 +-
.../server/grpc/services/ParserGrpcService.java | 2 +-
.../server/grpc/services/ProjectGrpcService.java | 2 +-
.../grpc/services/UserProfileGrpcService.java | 2 +-
.../execution/util/common/SharedMariaDB.java | 0
.../SharedMariaDBLauncherSessionListener.java | 0
.../airavata/execution/util/common/TestBase.java | 0
.../integration/AbstractIntegrationTest.java | 0
.../integration/BackgroundServiceHealthTest.java | 0
.../airavata/integration/DatabaseHealthTest.java | 0
.../airavata/integration/KafkaHealthTest.java | 0
.../airavata/integration/KeycloakHealthTest.java | 0
.../airavata/integration/PrometheusHealthTest.java | 0
.../airavata/integration/RabbitMQHealthTest.java | 0
.../integration/ServiceHealthEndpointTest.java | 0
134 files changed, 443 insertions(+), 313 deletions(-)
rename
airavata-api/agent-service/src/main/java/org/apache/airavata/agent/{connection/service/services
=> }/AiravataFileService.java (95%)
rename
airavata-api/agent-service/src/main/java/org/apache/airavata/agent/{connection/service/services
=> }/AiravataService.java (96%)
rename
airavata-api/agent-service/src/main/java/org/apache/airavata/agent/{connection/service
=> }/config/AgentProperties.java (97%)
rename
airavata-api/agent-service/src/main/java/org/apache/airavata/agent/{connection/service
=> }/config/AgentServiceConfig.java (83%)
rename
airavata-api/agent-service/src/main/java/org/apache/airavata/agent/{connection/service
=> }/config/ClusterApplicationConfig.java (95%)
rename
airavata-api/agent-service/src/main/java/org/apache/airavata/agent/{connection/service/handlers
=> handler}/AgentConnectionHandler.java (99%)
rename
airavata-api/agent-service/src/main/java/org/apache/airavata/agent/{connection/service/handlers
=> handler}/AgentInteractionGrpcHandler.java (99%)
rename
airavata-api/agent-service/src/main/java/org/apache/airavata/agent/{connection/service/handlers
=> handler}/AgentManagementHandler.java (98%)
rename
airavata-api/agent-service/src/main/java/org/apache/airavata/agent/{connection/service/handlers
=> handler}/ExperimentManagementGrpcHandler.java (98%)
rename
airavata-api/agent-service/src/main/java/org/apache/airavata/agent/{connection/service/handlers
=> handler}/FuseFSHandler.java (98%)
rename
airavata-api/agent-service/src/main/java/org/apache/airavata/agent/{connection/service/handlers
=> handler}/PlanGrpcHandler.java (97%)
rename
airavata-api/agent-service/src/main/java/org/apache/airavata/agent/{connection/service/handlers
=> handler}/PlanHandler.java (89%)
rename
airavata-api/agent-service/src/main/java/org/apache/airavata/agent/{connection/service/db/entity
=> model}/AgentDeploymentInfo.java (97%)
rename
airavata-api/agent-service/src/main/java/org/apache/airavata/agent/{connection/service/db/entity
=> model}/AgentExecution.java (96%)
rename
airavata-api/agent-service/src/main/java/org/apache/airavata/agent/{connection/service/db/entity
=> model}/AgentExecutionStatus.java (97%)
rename
airavata-api/agent-service/src/main/java/org/apache/airavata/agent/{connection/service/models
=> model}/DirectoryInfo.java (94%)
rename
airavata-api/agent-service/src/main/java/org/apache/airavata/agent/{connection/service/models
=> model}/ExperimentStorageResponse.java (96%)
rename
airavata-api/agent-service/src/main/java/org/apache/airavata/agent/{connection/service/models
=> model}/FileInfo.java (97%)
rename
airavata-api/agent-service/src/main/java/org/apache/airavata/agent/{connection/service/db/entity
=> model}/Plan.java (96%)
rename
airavata-api/agent-service/src/main/java/org/apache/airavata/agent/{connection/service/db/repo
=> repository}/AgentDeploymentInfoRepo.java (87%)
rename
airavata-api/agent-service/src/main/java/org/apache/airavata/agent/{connection/service/db/repo
=> repository}/AgentExecutionRepo.java (87%)
rename
airavata-api/agent-service/src/main/java/org/apache/airavata/agent/{connection/service/db/repo
=> repository}/AgentExecutionStatusRepo.java (87%)
rename
airavata-api/agent-service/src/main/java/org/apache/airavata/agent/{connection/service/db/repo
=> repository}/PlanRepo.java (89%)
rename airavata-api/{src/main/proto/services =>
compute-service/src/main/proto}/gateway_resource_profile_service.proto (100%)
rename airavata-api/{src/main/proto/services =>
compute-service/src/main/proto}/group_resource_profile_service.proto (100%)
rename airavata-api/{src/main/proto/services =>
compute-service/src/main/proto}/resource_service.proto (100%)
rename airavata-api/{src/main/proto/services =>
compute-service/src/main/proto}/user_resource_profile_service.proto (100%)
rename airavata-api/{src/main/proto/services =>
credential-service/src/main/proto}/credential_service.proto (100%)
rename airavata-api/{src/main/proto/services =>
orchestration-service/src/main/proto}/gateway_service.proto (100%)
rename
airavata-api/profile-service/src/main/java/org/apache/airavata/security/{profile/iam/admin/services/core/interfaces
=> iam}/TenantManagementInterface.java (98%)
rename
airavata-api/profile-service/src/main/java/org/apache/airavata/security/{profile/iam/admin/services/core/impl
=> iam}/TenantManagementKeycloakImpl.java (99%)
rename
airavata-api/profile-service/src/main/java/org/apache/airavata/security/{profile
=> }/mapper/ProfileMapper.java (88%)
rename
airavata-api/profile-service/src/main/java/org/apache/airavata/security/service/{interceptor
=> }/SecurityCheck.java (95%)
rename
airavata-api/profile-service/src/main/java/org/apache/airavata/security/service/{interceptor
=> }/SecurityInterceptor.java (93%)
rename
airavata-api/profile-service/src/main/java/org/apache/airavata/security/service/{interceptor
=> }/SecurityModule.java (96%)
rename
airavata-api/profile-service/src/main/java/org/apache/airavata/security/{profile/commons/repositories
=> tenant}/AbstractRepository.java (97%)
rename
airavata-api/profile-service/src/main/java/org/apache/airavata/security/{profile/commons/tenant/entities
=> tenant}/GatewayEntity.java (99%)
rename
airavata-api/profile-service/src/main/java/org/apache/airavata/security/{profile/tenant/core/repositories
=> tenant}/TenantProfileRepository.java (92%)
rename
airavata-api/profile-service/src/main/java/org/apache/airavata/security/{profile/commons/user/entities
=> user}/CustomizedDashboardEntity.java (99%)
rename
airavata-api/profile-service/src/main/java/org/apache/airavata/security/{profile/commons/user/entities
=> user}/NSFDemographicsEntity.java (98%)
rename
airavata-api/profile-service/src/main/java/org/apache/airavata/security/{profile/user/core/utils
=> user}/UserProfileCatalogDBInitConfig.java (95%)
rename
airavata-api/profile-service/src/main/java/org/apache/airavata/security/{profile/commons/user/entities
=> user}/UserProfileEntity.java (99%)
rename
airavata-api/profile-service/src/main/java/org/apache/airavata/security/{profile/user/core/exceptions
=> user}/UserProfileRegistryException.java (93%)
rename
airavata-api/profile-service/src/main/java/org/apache/airavata/security/{profile/user/core/repositories
=> user}/UserProfileRepository.java (92%)
rename
airavata-api/profile-service/src/main/java/org/apache/airavata/security/{profile/commons/utils
=> util}/Committer.java (93%)
rename
airavata-api/profile-service/src/main/java/org/apache/airavata/security/{profile/commons/utils
=> util}/JPAConstants.java (95%)
rename
airavata-api/profile-service/src/main/java/org/apache/airavata/security/{profile/commons/utils
=> util}/QueryConstants.java (97%)
rename
airavata-api/profile-service/src/main/java/org/apache/airavata/security/{profile/commons/utils
=> util}/Utils.java (98%)
rename airavata-api/{src/main/proto/services =>
profile-service/src/main/proto}/iam_admin_service.proto (100%)
rename airavata-api/{src/main/proto/services =>
profile-service/src/main/proto}/user_profile_service.proto (100%)
rename
airavata-api/profile-service/src/test/java/org/apache/airavata/security/{profile/iam/admin/services/core/tests
=> iam}/SetupNewGateway.java (98%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service
=> }/AiravataService.java (93%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service
=> }/ApplicationCatalogService.java (99%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service
=> }/ExperimentService.java (99%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service
=> }/NotificationService.java (98%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service
=> }/ParserService.java (99%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service
=> }/ProjectService.java (99%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service
=> }/config/DevDataInitializer.java (92%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service
=> }/config/ResearchProperties.java (97%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service
=> }/config/ResearchServiceConfig.java (86%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service
=> }/enums/PrivacyEnum.java (94%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service
=> }/enums/ResourceTypeEnum.java (95%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service
=> }/enums/SessionStatusEnum.java (95%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service
=> }/enums/StateEnum.java (94%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service
=> }/enums/StatusEnum.java (94%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service/handlers
=> handler}/ProjectHandler.java (89%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service/handlers
=> handler}/ResearchHubGrpcHandler.java (98%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service/handlers
=> handler}/ResearchHubHandler.java (93%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service/handlers
=> handler}/ResearchProjectGrpcHandler.java (97%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service/handlers
=> handler}/ResearchResourceGrpcHandler.java (95%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service/handlers
=> handler}/ResearchSessionGrpcHandler.java (96%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service/handlers
=> handler}/ResourceHandler.java (91%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service/handlers
=> handler}/SessionHandler.java (93%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service/model/entity
=> model}/DatasetResource.java (91%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service/model/entity
=> model}/ModelResource.java (92%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service/model/entity
=> model}/NotebookResource.java (91%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service/model/entity
=> model}/Project.java (97%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service/model/entity
=> model}/RepositoryResource.java (91%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service/model/entity
=> model}/Resource.java (94%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service/model/entity
=> model}/ResourceStar.java (97%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service/model/entity
=> model}/Session.java (96%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service/model/entity
=> model}/Tag.java (96%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service/model/repo
=> repository}/ProjectRepository.java (85%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service/model/repo
=> repository}/ResourceRepository.java (96%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service/model/repo
=> repository}/ResourceStarRepository.java (83%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service/model/repo
=> repository}/SessionRepository.java (90%)
rename
airavata-api/research-service/src/main/java/org/apache/airavata/research/{service/model/repo
=> repository}/TagRepository.java (92%)
rename airavata-api/{src/main/proto/services =>
research-service/src/main/proto}/application_catalog_service.proto (100%)
rename airavata-api/{src/main/proto/services =>
research-service/src/main/proto}/experiment_service.proto (100%)
rename airavata-api/{src/main/proto/services =>
research-service/src/main/proto}/notification_service.proto (100%)
rename airavata-api/{src/main/proto/services =>
research-service/src/main/proto}/parser_service.proto (100%)
rename airavata-api/{src/main/proto/services =>
research-service/src/main/proto}/project_service.proto (100%)
rename
airavata-api/research-service/src/test/java/org/apache/airavata/research/{service
=> }/ApplicationCatalogServiceTest.java (99%)
rename
airavata-api/research-service/src/test/java/org/apache/airavata/research/{service
=> }/ExperimentServiceTest.java (99%)
rename
airavata-api/research-service/src/test/java/org/apache/airavata/research/{service
=> }/NotificationServiceTest.java (98%)
rename
airavata-api/research-service/src/test/java/org/apache/airavata/research/{service
=> }/ParserServiceTest.java (99%)
rename
airavata-api/research-service/src/test/java/org/apache/airavata/research/{service
=> }/ProjectServiceTest.java (99%)
rename airavata-api/{src/main/proto/services =>
sharing-service/src/main/proto}/group_manager_service.proto (100%)
rename airavata-api/{src/main/proto/services =>
sharing-service/src/main/proto}/sharing_service.proto (100%)
delete mode 100644
airavata-api/src/test/java/org/apache/airavata/common/utils/DatabaseTestCases.java
rename airavata-api/{src/main/proto/services =>
storage-service/src/main/proto}/data_product_service.proto (100%)
rename airavata-api/{src/main/proto/services =>
storage-service/src/main/proto}/file_service.proto (100%)
rename {airavata-api =>
airavata-server}/src/test/java/org/apache/airavata/execution/util/common/SharedMariaDB.java
(100%)
rename {airavata-api =>
airavata-server}/src/test/java/org/apache/airavata/execution/util/common/SharedMariaDBLauncherSessionListener.java
(100%)
rename {airavata-api =>
airavata-server}/src/test/java/org/apache/airavata/execution/util/common/TestBase.java
(100%)
rename {airavata-api =>
airavata-server}/src/test/java/org/apache/airavata/integration/AbstractIntegrationTest.java
(100%)
rename {airavata-api =>
airavata-server}/src/test/java/org/apache/airavata/integration/BackgroundServiceHealthTest.java
(100%)
rename {airavata-api =>
airavata-server}/src/test/java/org/apache/airavata/integration/DatabaseHealthTest.java
(100%)
rename {airavata-api =>
airavata-server}/src/test/java/org/apache/airavata/integration/KafkaHealthTest.java
(100%)
rename {airavata-api =>
airavata-server}/src/test/java/org/apache/airavata/integration/KeycloakHealthTest.java
(100%)
rename {airavata-api =>
airavata-server}/src/test/java/org/apache/airavata/integration/PrometheusHealthTest.java
(100%)
rename {airavata-api =>
airavata-server}/src/test/java/org/apache/airavata/integration/RabbitMQHealthTest.java
(100%)
rename {airavata-api =>
airavata-server}/src/test/java/org/apache/airavata/integration/ServiceHealthEndpointTest.java
(100%)
