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 740a933430 fix property name mismatch bugs. correct the test properties
add a31192204a run spotless:apply and cleanup test and prop
inconsistencies. replace few reflections with di
add ad9ede21d7 fix more test cases and config bugs
No new revisions were added by this update.
Summary of changes:
.../api-orch/templates/airavata.properties.j2 | 2 +-
.../registry/templates/airavata.properties.j2 | 2 +-
.../client/samples/CreateLaunchExperimentUS3.java | 2 +-
.../service/handlers/AgentManagementHandler.java | 37 +-
.../service/services/AiravataFileService.java | 11 +-
modules/airavata-api/pom.xml | 30 +-
.../apache/airavata/common/utils/DBInitConfig.java | 48 --
.../airavata/common/utils/DBInitializer.java | 104 ----
.../org/apache/airavata/common/utils/DBUtil.java | 46 +-
.../apache/airavata/common/utils/DerbyUtil.java | 11 +-
.../airavata/config/AiravataConfigUtils.java | 193 +++++++
.../AiravataPropertySourceConfiguration.java | 7 +-
.../config/AiravataPropertySourceFactory.java | 144 +++++
.../airavata/config/AiravataServerProperties.java | 630 ++++++++-------------
.../org/apache/airavata/config/FlywayConfig.java | 2 +-
.../java/org/apache/airavata/config/JpaConfig.java | 15 +-
.../airavata/config/PropertiesVerification.java | 6 +-
.../services/CredentialEntityService.java | 2 +-
.../services/CredentialStoreDBInitConfig.java | 97 ----
.../airavata/helix/controller/HelixController.java | 6 +-
.../helix/controller/PreWorkflowManager.java | 5 +-
.../helix/controller/WorkflowCleanupAgent.java | 6 +-
.../airavata/helix/controller/WorkflowManager.java | 18 +-
.../helix/participant/HelixParticipant.java | 8 +-
.../airavata/helix/task/base/AbstractTask.java | 8 +-
.../task/cancel/WorkflowCancellationTask.java | 4 +-
.../helix/task/submission/GroovyMapData.java | 4 +-
.../org/apache/airavata/messaging/Dispatcher.java | 116 +++-
.../messaging/rabbitmq/RabbitMQPublisher.java | 29 +
.../monitor/compute/ClusterStatusMonitorJob.java | 2 +-
.../airavata/monitor/email/EmailBasedMonitor.java | 3 +-
.../orchestrator/impl/AbstractOrchestrator.java | 5 +-
.../orchestrator/job/GFACPassiveJobSubmitter.java | 4 +-
.../orchestrator/utils/OrchestratorUtils.java | 2 +-
.../validation/impl/ValidationServiceImpl.java | 9 +-
.../ComputeValidatorEnabledCondition.java | 2 +-
.../utils/UserProfileCatalogDBInitConfig.java | 69 ---
.../profile/utils/keycloak/KeycloakRestClient.java | 6 +-
.../registry/utils/AppCatalogDBInitConfig.java | 104 ----
.../registry/utils/ExpCatalogDBInitConfig.java | 115 ----
.../registry/utils/ReplicaCatalogDBInitConfig.java | 77 ---
.../utils/WorkflowCatalogDBInitConfig.java | 76 ---
.../apache/airavata/service/AiravataService.java | 57 +-
.../service/orchestrator/OrchestratorService.java | 2 +-
.../service/security/CredentialStoreService.java | 4 -
.../airavata/service/security/IamAdminService.java | 4 +-
.../sharing/utils/SharingRegistryDBInitConfig.java | 75 ---
.../SSHAccountProvisionerFactoryTest.java | 7 +-
.../airavata/accountprovisioning/SSHUtilTest.java | 17 +-
.../TestIULdapSSHAccountProvisioner.java | 6 +-
.../airavata/common/utils/NameValidatorTest.java | 6 +-
.../airavata/common/utils/SecurityUtilTest.java | 6 +-
.../config/AiravataServerPropertiesTest.java | 4 +-
.../config/BackgroundServicesStartupTest.java | 43 +-
.../airavata/config/DockerServiceStartupTest.java | 25 +-
.../apache/airavata/config/EntityLoadingTest.java | 17 +-
.../config/ExternalServiceStartupTest.java | 26 +-
.../airavata/config/FlywayLocalStartupTest.java | 28 +-
.../airavata/config/FlywayMigrationTest.java | 21 +-
.../apache/airavata/config/MinimalStartupTest.java | 10 +-
.../config/PersistenceConfigurationTest.java | 9 +-
.../airavata/config/RestModeStartupTest.java | 31 +-
.../airavata/config/SchemaValidationTest.java | 13 +-
.../config/ServiceConfigurationBuilder.java | 12 +-
.../airavata/config/ServiceDependencyTest.java | 16 +-
.../config/ServiceStartupCombinationTest.java | 13 +-
.../airavata/config/ServiceStartupRangeTest.java | 67 +--
.../airavata/config/ServiceStartupTestBase.java | 4 +-
.../airavata/config/ServiceStatusVerifierTest.java | 13 +-
.../apache/airavata/config/ServiceToggleTest.java | 10 +-
.../airavata/config/SpringContextLoadTest.java | 9 +-
.../airavata/config/TestPropertiesHelper.java | 108 ++++
.../airavata/config/TestcontainersConfig.java | 191 ++++++-
.../airavata/config/TestcontainersSetupTest.java | 138 ++++-
.../airavata/config/ThriftModeStartupTest.java | 35 +-
.../config/UnifiedApplicationStartupTest.java | 26 +-
.../airavata/credential/SSHCredentialTest.java | 9 +-
.../apache/airavata/credential/SSHSummaryTest.java | 11 +-
.../messaging/MessageVerificationUtils.java | 223 ++++++++
.../airavata/messaging/TestMessagingUtils.java | 79 +++
.../messaging/kafka/KafkaIntegrationTest.java | 532 +++++++++++++++++
.../rabbitmq/RabbitMQIntegrationTest.java | 456 +++++++++++++++
.../airavata/messaging/rabbitmq/TestClient.java | 30 +-
.../orchestrator/core/BaseOrchestratorTest.java | 7 +-
.../orchestrator/core/NewOrchestratorTest.java | 153 +++--
.../airavata/profile/entities/SetupNewGateway.java | 13 +-
.../repositories/WorkspaceRepositoryTest.java | 156 +----
.../ApplicationDeploymentRepositoryTest.java | 8 +-
.../ApplicationInterfaceRepositoryTest.java | 6 +-
.../appcatalog/ComputeResourceRepositoryTest.java | 78 +--
.../appcatalog/GatewayGroupsRepositoryTest.java | 2 +-
.../appcatalog/GatewayProfileRepositoryTest.java | 7 +-
.../GroupResourceProfileRepositoryTest.java | 115 +---
.../JobSubmissionInterfaceRepositoryTest.java | 6 +-
.../appcatalog/StorageResourceRepositoryTest.java | 6 +-
.../UserResourceProfileRepositoryTest.java | 6 +-
.../registry/repositories/common/TestBase.java | 14 +-
.../expcatalog/ExperimentErrorRepositoryTest.java | 20 +-
.../expcatalog/ExperimentInputRepositoryTest.java | 14 +-
.../expcatalog/ExperimentOutputRepositoryTest.java | 14 +-
.../expcatalog/ExperimentRepositoryTest.java | 18 +-
.../expcatalog/ExperimentStatusRepositoryTest.java | 16 +-
.../ExperimentSummaryRepositoryTest.java | 58 +-
.../expcatalog/GatewayRepositoryTest.java | 16 +-
.../repositories/expcatalog/JobRepositoryTest.java | 22 +-
.../expcatalog/JobStatusRepositoryTest.java | 52 +-
.../expcatalog/NotificationRepositoryTest.java | 46 +-
.../expcatalog/ProcessErrorRepositoryTest.java | 34 +-
.../expcatalog/ProcessInputRepositoryTest.java | 14 +-
.../expcatalog/ProcessOutputRepositoryTest.java | 14 +-
.../expcatalog/ProcessRepositoryTest.java | 16 +-
.../expcatalog/ProcessStatusRepositoryTest.java | 14 +-
.../expcatalog/ProjectRepositoryTest.java | 14 +-
.../expcatalog/QueueStatusRepositoryTest.java | 16 +-
.../expcatalog/TaskErrorRepositoryTest.java | 20 +-
.../expcatalog/TaskRepositoryTest.java | 10 +-
.../expcatalog/TaskStatusRepositoryTest.java | 16 +-
.../expcatalog/UserRepositoryTest.java | 8 +-
.../replicacatalog/DataProductRepositoryTest.java | 8 +-
.../DataReplicaLocationRepositoryTest.java | 8 +-
.../workflowcatalog/WorkflowRepositoryTest.java | 30 +-
.../security/GatewayGroupsInitializerTest.java | 4 +-
.../security/KeyCloakSecurityManagerTest.java | 44 +-
.../AiravataServiceIntegrationTest.java | 283 +++++----
.../AwsComputeResourceIntegrationTest.java | 61 +-
.../CredentialStoreServiceIntegrationTest.java | 36 --
.../DataMovementStateMachineIntegrationTest.java | 117 +++-
.../ExperimentLifecycleIntegrationTest.java | 333 +++++++++++
.../GroupManagerServiceIntegrationTest.java | 30 -
.../IamAdminServiceIntegrationTest.java | 43 --
.../JobSubmissionStateMachineIntegrationTest.java | 130 ++++-
.../OrchestratorServiceIntegrationTest.java | 254 ++++++---
...rocessExecutionStateMachineIntegrationTest.java | 180 +++++-
.../RegistryServiceIntegrationTest.java | 301 ++++++++--
.../integration/ServiceIntegrationTestBase.java | 19 +-
.../SharingRegistryServiceIntegrationTest.java | 235 ++++----
.../SlurmComputeResourceIntegrationTest.java | 61 +-
.../StateTransitionValidationIntegrationTest.java | 121 +++-
.../TenantProfileServiceIntegrationTest.java | 123 ++--
.../service/integration/TestDataFactory.java | 44 ++
.../airavata/service/integration/TestFixtures.java | 126 +++++
.../UserProfileServiceIntegrationTest.java | 108 ++--
.../org/apache/airavata/sharing/CipresTest.java | 324 ++++++-----
.../GroupComputeResourcePreferenceUtilTest.java | 6 +-
.../src/test}/resources/conf/airavata.properties | 9 +-
.../org/apache/airavata/AiravataCommandLine.java | 2 +-
.../java/org/apache/airavata/AiravataServer.java | 16 +-
.../bootstrap/DatabaseMigratorCommand.java | 3 +-
.../src/main/resources/conf/airavata.properties | 5 +-
.../config/ResearchServiceConfiguration.java | 33 +-
.../research/service/handlers/ResourceHandler.java | 2 +-
.../client/AiravataServiceClientFactory.java | 9 +-
.../airavata/thriftapi/server/ThriftServer.java | 9 +-
pom.xml | 20 +-
154 files changed, 5419 insertions(+), 3207 deletions(-)
delete mode 100644
modules/airavata-api/src/main/java/org/apache/airavata/common/utils/DBInitConfig.java
delete mode 100644
modules/airavata-api/src/main/java/org/apache/airavata/common/utils/DBInitializer.java
create mode 100644
modules/airavata-api/src/main/java/org/apache/airavata/config/AiravataConfigUtils.java
create mode 100644
modules/airavata-api/src/main/java/org/apache/airavata/config/AiravataPropertySourceFactory.java
delete mode 100644
modules/airavata-api/src/main/java/org/apache/airavata/credential/services/CredentialStoreDBInitConfig.java
delete mode 100644
modules/airavata-api/src/main/java/org/apache/airavata/profile/utils/UserProfileCatalogDBInitConfig.java
delete mode 100644
modules/airavata-api/src/main/java/org/apache/airavata/registry/utils/AppCatalogDBInitConfig.java
delete mode 100644
modules/airavata-api/src/main/java/org/apache/airavata/registry/utils/ExpCatalogDBInitConfig.java
delete mode 100644
modules/airavata-api/src/main/java/org/apache/airavata/registry/utils/ReplicaCatalogDBInitConfig.java
delete mode 100644
modules/airavata-api/src/main/java/org/apache/airavata/registry/utils/WorkflowCatalogDBInitConfig.java
delete mode 100644
modules/airavata-api/src/main/java/org/apache/airavata/sharing/utils/SharingRegistryDBInitConfig.java
create mode 100644
modules/airavata-api/src/test/java/org/apache/airavata/config/TestPropertiesHelper.java
create mode 100644
modules/airavata-api/src/test/java/org/apache/airavata/messaging/MessageVerificationUtils.java
create mode 100644
modules/airavata-api/src/test/java/org/apache/airavata/messaging/TestMessagingUtils.java
create mode 100644
modules/airavata-api/src/test/java/org/apache/airavata/messaging/kafka/KafkaIntegrationTest.java
create mode 100644
modules/airavata-api/src/test/java/org/apache/airavata/messaging/rabbitmq/RabbitMQIntegrationTest.java
create mode 100644
modules/airavata-api/src/test/java/org/apache/airavata/service/integration/ExperimentLifecycleIntegrationTest.java
create mode 100644
modules/airavata-api/src/test/java/org/apache/airavata/service/integration/TestFixtures.java
copy modules/{distribution/src/main =>
airavata-api/src/test}/resources/conf/airavata.properties (98%)
