This is an automated email from the ASF dual-hosted git repository.
yasith pushed a change to branch service-layer-improvements
in repository https://gitbox.apache.org/repos/asf/airavata.git
from 4a139d99b8 chore: modernize syntax. fix property mapping bugs
add 709f46ef01 use application.properties everywhere for consistency
add 48ea58a517 Refactor integration tests to improve consistency and
readability. Update timestamp generation for gateway creation. Enhance test
conditions with @EnabledIf for clean database checks. Ensure proper user
existence in sharing registry. Modernize syntax and fix property mapping for
test classes. Add manual timeouts to test cases to avoid indefinitely hanging.
No new revisions were added by this update.
Summary of changes:
.devcontainer/docker-compose.yml | 77 ++-
.devcontainer/init-db/01-create-databases.sql | 25 +
.../service/config/AgentServiceConfiguration.java | 6 +-
.../service/config/GrpcServerConfig.java | 13 +-
.../connection/service/handlers/FuseFSHandler.java | 6 +-
modules/airavata-api/pom.xml | 4 +-
.../airavata/agents/ssh/PoolingSSHJClient.java | 12 +-
.../common/model/JobStatusChangeEvent.java | 2 +
.../airavata/common/model/MessagingEvent.java | 23 +
.../airavata/common/utils/AiravataUtils.java | 11 +-
.../airavata/common/utils/DatabaseCreator.java | 4 +-
.../utils/DefaultKeyStorePasswordCallback.java | 22 +-
.../org/apache/airavata/common/utils/IOUtil.java | 11 +-
.../org/apache/airavata/common/utils/IServer.java | 1 -
.../org/apache/airavata/common/utils/JSONUtil.java | 2 +-
.../apache/airavata/common/utils/ServiceUtils.java | 52 +-
.../apache/airavata/common/utils/StringUtil.java | 4 +-
.../airavata/config/AiravataConfigUtils.java | 96 ++--
.../AiravataPropertySourceConfiguration.java | 34 --
.../config/AiravataPropertySourceFactory.java | 143 -----
.../airavata/config/AiravataServerProperties.java | 530 +++++++------------
.../org/apache/airavata/config/CacheConfig.java | 11 +-
.../org/apache/airavata/config/FlywayConfig.java | 6 +-
.../org/apache/airavata/config/JacksonConfig.java | 2 +-
.../java/org/apache/airavata/config/JpaConfig.java | 44 +-
.../org/apache/airavata/config/KafkaConfig.java | 21 +-
.../config/PropertiesValidationConfig.java | 117 +++--
.../airavata/config/PropertiesVerification.java | 11 +-
.../org/apache/airavata/config/QuartzConfig.java | 50 +-
.../org/apache/airavata/config/RabbitMQConfig.java | 20 +-
.../apache/airavata/config/RestClientConfig.java | 26 +-
.../airavata/config/SecurityManagerConfig.java | 2 +-
.../conditional/ConditionalOnApiService.java | 16 +-
.../conditional/ConditionalOnController.java | 9 +-
.../config/conditional/ConditionalOnMonitor.java | 9 +-
.../conditional/ConditionalOnParticipant.java | 9 +-
.../credential/model/EmailNotificationMessage.java | 6 +-
.../services/CredentialEntityService.java | 13 +-
.../airavata/credential/utils/EmailNotifier.java | 10 +-
.../credential/utils/NotifierBootstrap.java | 3 +-
.../airavata/helix/controller/HelixController.java | 2 +-
.../helix/controller/ParserWorkflowManager.java | 4 +-
.../helix/controller/PostWorkflowManager.java | 8 +-
.../helix/controller/PreWorkflowManager.java | 8 +-
.../airavata/helix/controller/WorkflowManager.java | 11 +-
.../helix/participant/GlobalParticipant.java | 2 +-
.../airavata/helix/task/aws/AWSCompletingTask.java | 2 +-
.../helix/task/aws/AWSJobSubmissionTask.java | 2 +-
.../helix/task/aws/CreateEC2InstanceTask.java | 2 +-
.../airavata/helix/task/aws/NoOperationTask.java | 2 +-
.../airavata/helix/task/aws/utils/AWSTaskUtil.java | 2 +-
.../airavata/helix/task/base/AbstractTask.java | 2 +-
.../airavata/helix/task/base/AiravataTask.java | 16 +-
.../airavata/helix/task/base/TaskContext.java | 1 -
.../helix/task/cancel/CancelCompletingTask.java | 2 +-
.../task/cancel/RemoteJobCancellationTask.java | 2 +-
.../task/cancel/WorkflowCancellationTask.java | 8 +-
.../helix/task/completing/CompletingTask.java | 2 +-
.../airavata/helix/task/env/EnvSetupTask.java | 2 +-
.../helix/task/factory/AWSTaskFactory.java | 2 +-
.../helix/task/factory/SlurmTaskFactory.java | 2 +-
.../apache/airavata/helix/task/mock/MockTask.java | 2 +-
.../helix/task/parsing/DataParsingTask.java | 2 +-
.../helix/task/parsing/ParsingTriggeringTask.java | 9 +-
.../airavata/helix/task/staging/ArchiveTask.java | 4 +-
.../helix/task/staging/DataStagingTask.java | 6 +-
.../helix/task/staging/InputDataStagingTask.java | 2 +-
.../helix/task/staging/JobVerificationTask.java | 2 +-
.../helix/task/staging/OutputDataStagingTask.java | 2 +-
.../task/submission/DefaultJobSubmissionTask.java | 12 +-
.../task/submission/ForkJobSubmissionTask.java | 2 +-
.../helix/task/submission/GroovyMapBuilder.java | 17 +-
.../helix/task/submission/JobSubmissionTask.java | 2 +-
.../task/submission/LocalJobSubmissionTask.java | 2 +-
.../org/apache/airavata/messaging/Dispatcher.java | 5 +-
.../messaging/rabbitmq/DBEventRetryConsumer.java | 5 +-
.../messaging/rabbitmq/ExperimentConsumer.java | 5 +-
.../messaging/rabbitmq/MessageConsumer.java | 5 +-
.../messaging/rabbitmq/MessagingFactory.java | 58 +-
.../messaging/rabbitmq/ProcessConsumer.java | 5 +-
.../messaging/rabbitmq/RabbitMQPublisher.java | 49 +-
.../messaging/rabbitmq/RabbitMQSubscriber.java | 54 +-
.../messaging/rabbitmq/StatusConsumer.java | 5 +-
.../metadata/analyzer/DataInterpreterService.java | 7 +-
.../scheduling/api/ProcessSchedulerImpl.java | 5 +-
.../selection/MultipleComputeResourcePolicy.java | 3 +-
.../rescheduler/ExponentialBackOffReScheduler.java | 7 +-
.../rescheduler/ProcessReschedulingService.java | 7 +-
.../monitor/compute/ClusterStatusMonitorJob.java | 23 +-
.../compute/ClusterStatusMonitorJobScheduler.java | 2 +-
.../ComputationalResourceMonitoringService.java | 4 +-
.../monitor/compute/ComputeMonitoringJob.java | 3 +-
.../monitor/compute/ComputeSubmissionTracker.java | 3 +-
.../monitor/email/AiravataCustomMailParser.java | 2 +-
.../airavata/monitor/email/EmailBasedMonitor.java | 13 +-
.../monitor/email/HTCondorEmailParser.java | 2 +-
.../airavata/monitor/email/LSFEmailParser.java | 2 +-
.../airavata/monitor/email/PBSEmailParser.java | 2 +-
.../airavata/monitor/email/SLURMEmailParser.java | 2 +-
.../airavata/monitor/email/UGEEmailParser.java | 2 +-
.../airavata/monitor/realtime/MessageProducer.java | 21 +-
.../airavata/monitor/realtime/RealtimeMonitor.java | 11 +-
.../orchestrator/impl/AbstractOrchestrator.java | 2 +-
.../orchestrator/impl/SimpleOrchestratorImpl.java | 2 +-
.../orchestrator/job/GFACPassiveJobSubmitter.java | 4 +-
.../airavata/orchestrator/job/JobSubmitter.java | 2 +-
.../orchestrator/utils/OrchestratorUtils.java | 4 +-
.../validation/impl/ValidationServiceImpl.java | 5 +-
.../validator/BatchQueueValidator.java | 2 +-
.../ComputeValidatorEnabledCondition.java | 4 +-
.../validator/ExperimentStatusValidator.java | 2 +-
.../validator/GroupResourceProfileValidator.java | 2 +-
.../profile/entities/ProfileGatewayEntity.java | 3 +-
.../utils/TenantManagementKeycloakImpl.java | 6 +-
.../profile/utils/keycloak/KeycloakRestClient.java | 13 +-
.../messaging/RegistryServiceDBEventHandler.java | 5 +-
.../registry/model/CompositeIdentifier.java | 27 +-
.../expcatalog/ProcessStatusRepository.java | 3 +-
.../expcatalog/TaskStatusRepository.java | 3 +-
.../services/ApplicationDeploymentService.java | 3 +-
.../services/ApplicationInterfaceService.java | 1 -
.../registry/services/ExperimentInputService.java | 6 +-
.../registry/services/ExperimentOutputService.java | 6 +-
.../registry/services/ExperimentStatusService.java | 112 ++--
.../services/GroupResourceProfileService.java | 4 +-
.../registry/services/JobStatusService.java | 131 ++---
.../registry/services/NotificationService.java | 10 +-
.../registry/services/ProcessStatusService.java | 104 ++--
.../airavata/registry/services/ProjectService.java | 4 +-
.../registry/services/StorageResourceService.java | 5 +-
.../registry/services/TaskStatusService.java | 86 +--
.../services/UserResourceProfileService.java | 3 +-
.../airavata/security/AuthenticatorRegistry.java | 2 +-
.../airavata/security/KeyCloakSecurityManager.java | 2 +-
.../airavata/security/authzcache/AuthzCache.java | 15 +-
.../authzcache/AuthzCacheManagerFactory.java | 2 +-
.../authzcache/DefaultAuthzCacheManager.java | 6 +-
.../apache/airavata/service/AiravataService.java | 75 ++-
.../airavata/service/SharingRegistryService.java | 273 ++++++----
.../service/orchestrator/OrchestratorService.java | 2 +-
.../service/profile/TenantProfileService.java | 2 +-
.../service/profile/UserProfileService.java | 2 +-
.../airavata/service/registry/RegistryService.java | 12 +-
.../service/security/AuthorizationService.java | 9 +-
.../service/security/CredentialStoreService.java | 45 +-
.../service/security/GroupManagerService.java | 2 +-
.../airavata/service/security/IamAdminService.java | 8 +-
.../airavata/service/sharing/SharingManager.java | 8 +-
.../airavata/sharing/entities/UserGroupPK.java | 7 +-
.../apache/airavata/sharing/entities/UserPK.java | 7 +-
.../messaging/SharingServiceDBEventHandler.java | 5 +-
.../airavata/sharing/services/EntityService.java | 47 +-
.../apache/airavata/telemetry/CounterMetric.java | 4 +-
.../apache/airavata/telemetry/MetricsFactory.java | 2 +-
.../apache/airavata/telemetry/TelemetryServer.java | 8 +-
.../SSHAccountProvisionerFactoryTest.java | 4 +-
.../airavata/accountprovisioning/SSHUtilTest.java | 2 +-
.../TestIULdapSSHAccountProvisioner.java | 9 +-
.../airavata/common/utils/DatabaseTestCases.java | 1 -
.../airavata/common/utils/NameValidatorTest.java | 2 +-
.../airavata/common/utils/SecurityUtilTest.java | 2 +-
.../config/BackgroundServicesStartupTest.java | 2 +-
.../config/ConditionalPropertyValidationTest.java | 175 +++----
.../airavata/config/DockerServiceStartupTest.java | 8 +-
.../apache/airavata/config/EntityLoadingTest.java | 2 +-
.../config/ExternalServiceStartupTest.java | 2 +-
.../airavata/config/FlywayLocalStartupTest.java | 2 +-
.../airavata/config/FlywayMigrationTest.java | 2 +-
.../config/IntegrationTestConfiguration.java | 133 +++--
.../apache/airavata/config/KeycloakTestConfig.java | 118 +++--
.../apache/airavata/config/MinimalStartupTest.java | 2 +-
.../config/PersistenceConfigurationTest.java | 2 +-
.../airavata/config/PropertiesBindingTest.java | 163 +++---
.../airavata/config/RestModeStartupTest.java | 2 +-
.../config/ServiceConfigurationBuilder.java | 68 +--
.../config/ServiceConfigurationBuilderTest.java | 70 +--
.../airavata/config/ServiceStartupRangeTest.java | 76 +--
.../airavata/config/ServiceStartupTestBase.java | 4 +-
.../airavata/config/ServiceStatusVerifierTest.java | 81 +--
.../airavata/config/SpringContextLoadTest.java | 2 +-
.../airavata/config/TestPropertiesHelper.java | 8 +-
.../airavata/config/TestcontainersConfig.java | 582 ++++++++-------------
.../airavata/config/TestcontainersSetupTest.java | 2 +-
.../airavata/config/ThriftModeStartupTest.java | 2 +-
.../config/UnifiedApplicationStartupTest.java | 2 +-
.../messaging/kafka/KafkaIntegrationTest.java | 353 ++++++-------
.../rabbitmq/RabbitMQIntegrationTest.java | 72 ++-
.../airavata/messaging/rabbitmq/TestClient.java | 8 +-
.../orchestrator/core/BaseOrchestratorTest.java | 2 +-
.../orchestrator/core/NewOrchestratorTest.java | 2 +-
.../airavata/profile/entities/SetupNewGateway.java | 17 +-
.../appcatalog/ComputeResourceRepositoryTest.java | 21 +-
.../appcatalog/GatewayProfileRepositoryTest.java | 2 +-
.../JobSubmissionInterfaceRepositoryTest.java | 4 +-
.../registry/repositories/common/TestBase.java | 126 ++---
.../expcatalog/ExperimentRepositoryTest.java | 48 +-
.../ExperimentSummaryRepositoryTest.java | 2 +-
.../expcatalog/GatewayRepositoryTest.java | 48 +-
.../repositories/expcatalog/JobRepositoryTest.java | 35 +-
.../expcatalog/JobStatusRepositoryTest.java | 38 +-
.../expcatalog/NotificationRepositoryTest.java | 38 +-
.../expcatalog/ProcessErrorRepositoryTest.java | 8 +-
.../expcatalog/ProcessRepositoryTest.java | 32 +-
.../expcatalog/ProcessStatusRepositoryTest.java | 30 +-
.../expcatalog/ProjectRepositoryTest.java | 39 +-
.../expcatalog/QueueStatusRepositoryTest.java | 21 +-
.../expcatalog/TaskRepositoryTest.java | 21 +-
.../expcatalog/TaskStatusRepositoryTest.java | 27 +-
.../expcatalog/UserRepositoryTest.java | 35 +-
.../security/GatewayGroupsInitializerTest.java | 2 +-
.../security/KeyCloakSecurityManagerTest.java | 12 +-
.../AiravataServiceIntegrationTest.java | 2 +-
.../DataMovementStateMachineIntegrationTest.java | 42 +-
.../ExperimentLifecycleIntegrationTest.java | 27 +-
.../GroupManagerServiceIntegrationTest.java | 14 +
.../IamAdminServiceIntegrationTest.java | 32 +-
.../JobSubmissionStateMachineIntegrationTest.java | 35 +-
.../OrchestratorServiceIntegrationTest.java | 38 +-
...rocessExecutionStateMachineIntegrationTest.java | 36 +-
.../RegistryServiceIntegrationTest.java | 37 +-
.../integration/ServiceIntegrationTestBase.java | 59 ++-
.../SftpConnectivityIntegrationTest.java | 326 ++++++++++++
.../SharingRegistryServiceIntegrationTest.java | 29 +-
.../SlurmConnectivityIntegrationTest.java | 247 +++++++++
.../service/integration/StateMachineTestUtils.java | 2 +-
.../StateTransitionValidationIntegrationTest.java | 35 +-
.../TenantProfileServiceIntegrationTest.java | 27 +-
.../service/integration/TestDataFactory.java | 20 +-
...countprovisioning.SSHAccountProvisionerProvider | 1 +
.../src/test/resources/application.properties | 190 +++++++
.../src/test/resources/conf/airavata.properties | 341 ------------
.../test/resources}/keycloak/realm-default.json | 13 +-
.../src/main/assembly/native-binary-assembly.xml | 11 +-
.../src/main/assembly/tarball-assembly.xml | 11 +-
.../org/apache/airavata/AiravataCommandLine.java | 4 +-
.../java/org/apache/airavata/AiravataServer.java | 4 -
.../bootstrap/DatabaseMigratorCommand.java | 2 -
.../apache/airavata/cli/commands/ServeCommand.java | 6 +-
.../cli/communication/ServiceSocketClient.java | 3 +-
.../airavata/cli/handlers/AccountHandler.java | 2 +-
.../apache/airavata/cli/handlers/GroupHandler.java | 2 +-
.../airavata/cli/handlers/ProjectHandler.java | 2 +-
.../airavata/cli/handlers/ServiceHandler.java | 46 +-
.../airavata/cli/util/DatabaseInitializer.java | 1 -
.../airavata/cli/util/PropertiesManager.java | 10 +-
.../src/main/resources/application.properties | 193 +++++++
.../src/main/resources/conf/airavata.properties | 344 ------------
.../file/server/model/AiravataDirectory.java | 5 +-
.../airavata/file/server/model/AiravataFile.java | 3 +-
.../research/service/config/GrpcServerConfig.java | 11 +-
.../config/ResearchServiceConfiguration.java | 2 +-
.../service/exception/GlobalExceptionHandler.java | 5 +-
.../research/service/handlers/ProjectHandler.java | 4 +-
.../service/handlers/ResearchHubHandler.java | 4 +-
.../client/AiravataServiceClientFactory.java | 5 +-
.../airavata/thriftapi/server/ThriftServer.java | 9 +-
.../client/TestAiravataServiceClientFactory.java | 19 +-
pom.xml | 12 +-
258 files changed, 4175 insertions(+), 3703 deletions(-)
create mode 100644 .devcontainer/init-db/01-create-databases.sql
delete mode 100644
modules/airavata-api/src/main/java/org/apache/airavata/config/AiravataPropertySourceConfiguration.java
delete mode 100644
modules/airavata-api/src/main/java/org/apache/airavata/config/AiravataPropertySourceFactory.java
create mode 100644
modules/airavata-api/src/test/java/org/apache/airavata/service/integration/SftpConnectivityIntegrationTest.java
create mode 100644
modules/airavata-api/src/test/java/org/apache/airavata/service/integration/SlurmConnectivityIntegrationTest.java
create mode 100644
modules/airavata-api/src/test/resources/META-INF/services/org.apache.airavata.accountprovisioning.SSHAccountProvisionerProvider
create mode 100644
modules/airavata-api/src/test/resources/application.properties
delete mode 100644
modules/airavata-api/src/test/resources/conf/airavata.properties
copy {.devcontainer =>
modules/airavata-api/src/test/resources}/keycloak/realm-default.json (99%)
create mode 100644
modules/distribution/src/main/resources/application.properties
delete mode 100644
modules/distribution/src/main/resources/conf/airavata.properties
