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 f269c27d68 update timestamp generation for consistent ordering across
all components. fix test cases.
add 7cf6223908 update server configs to run correctly. modernize java
syntax
add 4a139d99b8 chore: modernize syntax. fix property mapping bugs
No new revisions were added by this update.
Summary of changes:
.devcontainer/docker-compose.yml | 1 +
.../keycloak/enable-admin-cli-direct-grants.sh | 68 ++
.devcontainer/keycloak/enable-admin-cli.sh | 25 +
.devcontainer/keycloak/realm-master.json | 34 +
modules/agent-framework/agent-service/pom.xml | 2 -
.../service/config/AgentServiceConfiguration.java | 78 +-
.../service/config/GrpcServerConfig.java | 77 ++
modules/airavata-api/pom.xml | 54 +-
.../airavata/agents/ssh/PoolingSSHJClient.java | 21 +-
.../airavata/agents/ssh/SshAgentAdaptor.java | 9 +-
.../airavata/common/model/DBEventMessage.java | 3 +-
.../org/apache/airavata/common/utils/DBUtil.java | 18 +-
.../airavata/common/utils/DatabaseCreator.java | 128 +--
.../utils/DefaultKeyStorePasswordCallback.java | 8 +-
.../org/apache/airavata/common/utils/IOUtil.java | 164 ++--
.../org/apache/airavata/common/utils/JSONUtil.java | 19 +-
.../apache/airavata/common/utils/ServiceUtils.java | 138 +++
.../apache/airavata/common/utils/StringUtil.java | 35 +-
.../apache/airavata/common/utils/SwingUtil.java | 8 +-
.../airavata/config/AiravataServerProperties.java | 1027 +++++++++-----------
.../org/apache/airavata/config/CacheConfig.java | 102 ++
.../org/apache/airavata/config/FlywayConfig.java | 35 +-
.../org/apache/airavata/config/JacksonConfig.java | 94 ++
.../java/org/apache/airavata/config/JpaConfig.java | 137 ++-
.../org/apache/airavata/config/KafkaConfig.java | 136 +++
.../config/PropertiesValidationConfig.java | 203 ++++
.../airavata/config/PropertiesVerification.java | 29 +-
.../org/apache/airavata/config/QuartzConfig.java | 172 ++++
.../org/apache/airavata/config/RabbitMQConfig.java | 148 +++
.../apache/airavata/config/RestClientConfig.java | 135 +++
.../airavata/config/SecurityManagerConfig.java | 4 +-
.../conditional/ConditionalOnApiService.java | 66 ++
.../conditional/ConditionalOnController.java} | 28 +-
.../conditional/ConditionalOnMonitor.java} | 28 +-
.../conditional/ConditionalOnParticipant.java} | 28 +-
.../credential/model/CredentialStoreNotifier.java | 7 +
.../credential/model/EmailNotificationMessage.java | 32 +-
.../credential/model/NotificationMessage.java | 18 +-
.../services/CredentialEntityService.java | 18 +-
.../airavata/credential/utils/EmailNotifier.java | 108 +-
.../credential/utils/NotifierBootstrap.java | 22 +-
.../airavata/credential/utils/PrivateKeyStore.java | 2 +-
.../apache/airavata/credential/utils/Utility.java | 30 +-
.../airavata/helix/controller/HelixController.java | 8 +-
.../helix/controller/ParserWorkflowManager.java | 16 +-
.../helix/controller/PostWorkflowManager.java | 14 +-
.../helix/controller/PreWorkflowManager.java | 17 +-
.../helix/controller/WorkflowCleanupAgent.java | 6 +-
.../airavata/helix/controller/WorkflowManager.java | 8 +-
.../helix/participant/GlobalParticipant.java | 6 +-
.../helix/participant/HelixParticipant.java | 8 +-
.../org/apache/airavata/helix/task/TaskUtil.java | 6 +-
.../airavata/helix/task/aws/AWSCompletingTask.java | 6 +-
.../helix/task/aws/AWSJobSubmissionTask.java | 16 +-
.../helix/task/aws/CreateEC2InstanceTask.java | 6 +-
.../airavata/helix/task/aws/NoOperationTask.java | 6 +-
.../airavata/helix/task/aws/utils/AWSTaskUtil.java | 6 +-
.../airavata/helix/task/base/AbstractTask.java | 6 +-
.../airavata/helix/task/base/AiravataTask.java | 17 +-
.../helix/task/cancel/CancelCompletingTask.java | 6 +-
.../task/cancel/RemoteJobCancellationTask.java | 6 +-
.../task/cancel/WorkflowCancellationTask.java | 6 +-
.../helix/task/completing/CompletingTask.java | 6 +-
.../airavata/helix/task/env/EnvSetupTask.java | 6 +-
.../helix/task/factory/AWSTaskFactory.java | 6 +-
.../helix/task/factory/SlurmTaskFactory.java | 6 +-
.../airavata/helix/task/factory/TaskFactory.java | 6 +-
.../apache/airavata/helix/task/mock/MockTask.java | 6 +-
.../helix/task/parsing/DataParsingTask.java | 12 +-
.../helix/task/parsing/ParsingTriggeringTask.java | 12 +-
.../airavata/helix/task/staging/ArchiveTask.java | 8 +-
.../helix/task/staging/DataStagingTask.java | 6 +-
.../helix/task/staging/InputDataStagingTask.java | 6 +-
.../helix/task/staging/JobVerificationTask.java | 6 +-
.../helix/task/staging/OutputDataStagingTask.java | 6 +-
.../submission/CloudJobManagerConfiguration.java | 3 +-
.../task/submission/DefaultJobSubmissionTask.java | 62 +-
.../task/submission/ForkJobConfiguration.java | 3 +-
.../task/submission/ForkJobSubmissionTask.java | 10 +-
.../helix/task/submission/GroovyMapBuilder.java | 76 +-
.../helix/task/submission/GroovyMapData.java | 5 +-
.../task/submission/HTCondorJobConfiguration.java | 3 +-
.../helix/task/submission/JobSubmissionTask.java | 6 +-
.../helix/task/submission/LSFJobConfiguration.java | 3 +-
.../task/submission/LocalJobSubmissionTask.java | 6 +-
.../helix/task/submission/PBSJobConfiguration.java | 3 +-
.../task/submission/SlurmJobConfiguration.java | 3 +-
.../helix/task/submission/UGEJobConfiguration.java | 3 +-
.../submission/parser/HTCondorOutputParser.java | 11 +-
.../task/submission/parser/LSFOutputParser.java | 12 +-
.../task/submission/parser/PBSOutputParser.java | 11 +-
.../task/submission/parser/SlurmOutputParser.java | 11 +-
.../task/submission/parser/UGEOutputParser.java | 15 +-
.../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 | 18 +-
.../messaging/rabbitmq/ProcessConsumer.java | 5 +-
.../messaging/rabbitmq/RabbitMQPublisher.java | 184 ++--
.../messaging/rabbitmq/RabbitMQSubscriber.java | 253 ++---
.../messaging/rabbitmq/StatusConsumer.java | 5 +-
.../metadata/analyzer/DataInterpreterService.java | 41 +-
.../metadata/analyzer/impl/DataAnalyzerImpl.java | 4 +-
.../scheduling/api/ProcessSchedulerImpl.java | 37 +-
.../DefaultComputeResourceSelectionPolicy.java | 6 +-
.../selection/MultipleComputeResourcePolicy.java | 10 +-
.../rescheduler/ExponentialBackOffReScheduler.java | 48 +-
.../rescheduler/ProcessReschedulingService.java | 41 +-
.../engine/rescheduler/ProcessScannerImpl.java | 38 +-
.../monitor/compute/ClusterStatusMonitorJob.java | 22 +-
.../compute/ClusterStatusMonitorJobScheduler.java | 23 +-
.../ComputationalResourceMonitoringService.java | 39 +-
.../monitor/email/AiravataCustomMailParser.java | 2 +-
.../airavata/monitor/email/EmailBasedMonitor.java | 25 +-
.../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 | 62 +-
.../airavata/monitor/realtime/RealtimeMonitor.java | 128 +--
.../orchestrator/impl/AbstractOrchestrator.java | 4 +-
.../orchestrator/impl/SimpleOrchestratorImpl.java | 25 +-
.../orchestrator/job/GFACPassiveJobSubmitter.java | 4 +-
.../orchestrator/utils/OrchestratorUtils.java | 8 +-
.../validation/impl/ValidationServiceImpl.java | 4 +-
.../validator/BatchQueueValidator.java | 4 +-
.../ComputeValidatorEnabledCondition.java | 7 +-
.../validator/ExperimentStatusValidator.java | 4 +-
.../validator/GroupResourceProfileValidator.java | 4 +-
.../utils/TenantManagementKeycloakImpl.java | 78 +-
.../org/apache/airavata/profile/utils/Utils.java | 10 +-
.../profile/utils/keycloak/KeycloakRestClient.java | 30 +-
.../utils/keycloak/dto/ClientRepresentation.java | 2 +
.../utils/keycloak/dto/RoleRepresentation.java | 3 +
.../utils/keycloak/dto/UserRepresentation.java | 2 +
.../messaging/RegistryServiceDBEventHandler.java | 7 +-
.../registry/model/CompositeIdentifier.java | 48 +-
.../repositories/expcatalog/ProjectRepository.java | 2 +-
.../services/DataReplicaLocationService.java | 3 +-
.../services/ExperimentSummaryService.java | 3 +-
.../services/GroupResourceProfileService.java | 7 +-
.../airavata/registry/services/ProjectService.java | 3 +-
.../airavata/registry/services/UserService.java | 3 +-
.../registry/services/WorkflowService.java | 23 +-
.../airavata/registry/utils/AppCatalogUtils.java | 6 +-
.../airavata/security/AbstractAuthenticator.java | 9 +-
.../airavata/security/AuthenticatorRegistry.java | 2 +-
.../airavata/security/KeyCloakSecurityManager.java | 30 +-
.../airavata/security/authzcache/AuthzCache.java | 87 +-
.../authzcache/AuthzCacheManagerFactory.java | 2 +
.../authzcache/DefaultAuthzCacheManager.java | 8 +-
.../security/interceptor/SecurityInterceptor.java | 2 +-
.../security/userstore/AbstractJDBCUserStore.java | 18 +-
.../airavata/security/userstore/JDBCUserStore.java | 2 -
.../airavata/security/userstore/LDAPUserStore.java | 2 -
.../security/userstore/SessionDBUserStore.java | 2 -
.../apache/airavata/service/AiravataService.java | 81 +-
.../airavata/service/SharingRegistryService.java | 213 ++--
.../service/orchestrator/OrchestratorService.java | 8 +-
.../service/profile/TenantProfileService.java | 4 +-
.../service/profile/UserProfileService.java | 4 +-
.../airavata/service/registry/RegistryService.java | 55 +-
.../service/security/AuthorizationService.java | 8 +-
.../service/security/CredentialStoreService.java | 47 +-
.../service/security/GroupManagerService.java | 7 +-
.../airavata/service/security/IamAdminService.java | 16 +-
.../airavata/service/sharing/SharingManager.java | 8 +-
.../airavata/sharing/entities/UserGroupPK.java | 21 +-
.../apache/airavata/sharing/entities/UserPK.java | 21 +-
.../messaging/SharingServiceDBEventHandler.java | 9 +-
.../sharing/services/GroupMembershipService.java | 7 +-
.../sharing/services/UserGroupService.java | 2 +-
.../airavata/sharing/services/UserService.java | 2 +-
.../apache/airavata/telemetry/CounterMetric.java | 88 +-
.../org/apache/airavata/telemetry/GaugeMetric.java | 45 +-
.../apache/airavata/telemetry/MetricsFactory.java | 79 ++
.../apache/airavata/telemetry/TelemetryServer.java | 58 +-
.../TestIULdapSSHAccountProvisioner.java | 19 +-
.../config/BackgroundServicesStartupTest.java | 5 +
.../config/ConditionalPropertyValidationTest.java | 229 +++++
.../airavata/config/DockerServiceStartupTest.java | 101 +-
.../config/ExternalServiceStartupTest.java | 5 +
.../config/IntegrationTestConfiguration.java | 99 ++
.../apache/airavata/config/KeycloakTestConfig.java | 262 +++++
.../apache/airavata/config/MinimalStartupTest.java | 40 +-
.../airavata/config/PropertiesBindingTest.java | 528 ++++++++++
.../airavata/config/RestModeStartupTest.java | 5 +
.../airavata/config/ServiceDependencyTest.java | 248 -----
.../config/ServiceStartupCombinationTest.java | 427 --------
.../airavata/config/ServiceStartupTestBase.java | 23 +-
.../airavata/config/ServiceStatusVerifier.java | 28 +-
.../airavata/config/ServiceStatusVerifierTest.java | 157 ++-
.../apache/airavata/config/ServiceToggleTest.java | 327 -------
.../airavata/config/SpringContextLoadTest.java | 3 +
.../airavata/config/TestPropertiesHelper.java | 38 +-
.../airavata/config/TestcontainersSetupTest.java | 5 +-
.../airavata/config/ThriftModeStartupTest.java | 5 +
.../config/UnifiedApplicationStartupTest.java | 9 +-
.../airavata/credential/SSHCredentialTest.java | 98 --
.../apache/airavata/credential/SSHSummaryTest.java | 102 --
.../airavata/profile/entities/SetupNewGateway.java | 294 +++---
.../repositories/WorkspaceRepositoryTest.java | 39 -
.../ApplicationDeploymentRepositoryTest.java | 36 +-
.../ApplicationInterfaceRepositoryTest.java | 41 +-
.../appcatalog/ComputeResourceRepositoryTest.java | 71 +-
.../appcatalog/GatewayGroupsRepositoryTest.java | 42 +-
.../appcatalog/GatewayProfileRepositoryTest.java | 44 +-
.../GroupResourceProfileRepositoryTest.java | 97 +-
.../JobSubmissionInterfaceRepositoryTest.java | 55 +-
.../appcatalog/StorageResourceRepositoryTest.java | 36 +-
.../UserResourceProfileRepositoryTest.java | 34 -
.../registry/repositories/common/TestBase.java | 162 ++-
.../expcatalog/ExperimentErrorRepositoryTest.java | 36 +-
.../expcatalog/ExperimentInputRepositoryTest.java | 37 +-
.../expcatalog/ExperimentOutputRepositoryTest.java | 36 +-
.../expcatalog/ExperimentRepositoryTest.java | 169 +---
.../expcatalog/ExperimentStatusRepositoryTest.java | 36 +-
.../ExperimentSummaryRepositoryTest.java | 36 +-
.../expcatalog/GatewayRepositoryTest.java | 148 ++-
.../repositories/expcatalog/JobRepositoryTest.java | 116 +--
.../expcatalog/JobStatusRepositoryTest.java | 36 +-
.../expcatalog/NotificationRepositoryTest.java | 304 +-----
.../expcatalog/ProcessErrorRepositoryTest.java | 36 +-
.../expcatalog/ProcessInputRepositoryTest.java | 36 +-
.../expcatalog/ProcessOutputRepositoryTest.java | 36 +-
.../expcatalog/ProcessRepositoryTest.java | 169 +---
.../expcatalog/ProcessStatusRepositoryTest.java | 36 +-
.../expcatalog/ProjectRepositoryTest.java | 157 ++-
.../expcatalog/QueueStatusRepositoryTest.java | 122 +--
.../expcatalog/TaskErrorRepositoryTest.java | 36 +-
.../expcatalog/TaskRepositoryTest.java | 96 +-
.../expcatalog/TaskStatusRepositoryTest.java | 36 +-
.../expcatalog/UserRepositoryTest.java | 89 +-
.../replicacatalog/DataProductRepositoryTest.java | 36 +-
.../DataReplicaLocationRepositoryTest.java | 34 -
.../workflowcatalog/WorkflowRepositoryTest.java | 36 +-
.../security/GatewayGroupsInitializerTest.java | 5 +
.../security/KeyCloakSecurityManagerTest.java | 26 +-
.../AuthenticatorConfigurationReaderTest.java | 115 ---
.../DataMovementStateMachineIntegrationTest.java | 3 +
.../JobSubmissionStateMachineIntegrationTest.java | 3 +
.../OrchestratorServiceIntegrationTest.java | 6 +-
...rocessExecutionStateMachineIntegrationTest.java | 3 +
.../integration/ServiceIntegrationTestBase.java | 17 +-
.../SharingRegistryServiceIntegrationTest.java | 7 +
.../StateTransitionValidationIntegrationTest.java | 3 +
.../org/apache/airavata/sharing/CipresTest.java | 642 ------------
.../src/test/resources/conf/airavata.properties | 52 +-
.../src/test/resources/credential-store/client.xml | 6 +
modules/distribution/pom.xml | 21 +-
.../org/apache/airavata/AiravataCommandLine.java | 3 +-
.../java/org/apache/airavata/AiravataServer.java | 46 +-
.../apache/airavata/cli/commands/ServeCommand.java | 36 +-
.../airavata/cli/handlers/ServiceHandler.java | 88 +-
.../src/main/resources/conf/airavata.properties | 69 +-
.../research-framework/research-service/pom.xml | 2 -
.../research/service/config/GrpcServerConfig.java | 74 ++
.../config/ResearchServiceConfiguration.java | 37 +-
.../research/service/handlers/ProjectHandler.java | 3 +-
.../service/handlers/ResearchHubHandler.java | 3 +-
.../research/service/handlers/ResourceHandler.java | 3 +-
.../service/model/repo/ProjectRepository.java | 2 +-
.../client/AiravataServiceClientFactory.java | 12 +-
.../airavata/thriftapi/server/ThriftServer.java | 22 +-
.../client/TestAiravataServiceClientFactory.java | 18 +-
pom.xml | 117 ++-
scripts/aggregate-test-reports.sh | 150 +++
269 files changed, 6500 insertions(+), 6986 deletions(-)
create mode 100644 .devcontainer/keycloak/enable-admin-cli-direct-grants.sh
create mode 100755 .devcontainer/keycloak/enable-admin-cli.sh
create mode 100644 .devcontainer/keycloak/realm-master.json
create mode 100644
modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/config/GrpcServerConfig.java
create mode 100644
modules/airavata-api/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java
create mode 100644
modules/airavata-api/src/main/java/org/apache/airavata/config/CacheConfig.java
create mode 100644
modules/airavata-api/src/main/java/org/apache/airavata/config/JacksonConfig.java
create mode 100644
modules/airavata-api/src/main/java/org/apache/airavata/config/KafkaConfig.java
create mode 100644
modules/airavata-api/src/main/java/org/apache/airavata/config/PropertiesValidationConfig.java
create mode 100644
modules/airavata-api/src/main/java/org/apache/airavata/config/QuartzConfig.java
create mode 100644
modules/airavata-api/src/main/java/org/apache/airavata/config/RabbitMQConfig.java
create mode 100644
modules/airavata-api/src/main/java/org/apache/airavata/config/RestClientConfig.java
create mode 100644
modules/airavata-api/src/main/java/org/apache/airavata/config/conditional/ConditionalOnApiService.java
copy
modules/airavata-api/src/main/java/org/apache/airavata/{helix/task/TaskDef.java
=> config/conditional/ConditionalOnController.java} (57%)
copy
modules/airavata-api/src/main/java/org/apache/airavata/{helix/task/TaskDef.java
=> config/conditional/ConditionalOnMonitor.java} (57%)
copy
modules/airavata-api/src/main/java/org/apache/airavata/{helix/task/TaskDef.java
=> config/conditional/ConditionalOnParticipant.java} (57%)
create mode 100644
modules/airavata-api/src/main/java/org/apache/airavata/telemetry/MetricsFactory.java
create mode 100644
modules/airavata-api/src/test/java/org/apache/airavata/config/ConditionalPropertyValidationTest.java
create mode 100644
modules/airavata-api/src/test/java/org/apache/airavata/config/IntegrationTestConfiguration.java
create mode 100644
modules/airavata-api/src/test/java/org/apache/airavata/config/KeycloakTestConfig.java
create mode 100644
modules/airavata-api/src/test/java/org/apache/airavata/config/PropertiesBindingTest.java
delete mode 100644
modules/airavata-api/src/test/java/org/apache/airavata/config/ServiceDependencyTest.java
delete mode 100644
modules/airavata-api/src/test/java/org/apache/airavata/config/ServiceStartupCombinationTest.java
delete mode 100644
modules/airavata-api/src/test/java/org/apache/airavata/config/ServiceToggleTest.java
delete mode 100644
modules/airavata-api/src/test/java/org/apache/airavata/credential/SSHCredentialTest.java
delete mode 100644
modules/airavata-api/src/test/java/org/apache/airavata/credential/SSHSummaryTest.java
delete mode 100644
modules/airavata-api/src/test/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReaderTest.java
delete mode 100644
modules/airavata-api/src/test/java/org/apache/airavata/sharing/CipresTest.java
copy apache-license-header-xml.txt =>
modules/airavata-api/src/test/resources/credential-store/client.xml (74%)
create mode 100644
modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/config/GrpcServerConfig.java
create mode 100755 scripts/aggregate-test-reports.sh
