This is an automated email from the ASF dual-hosted git repository. yasith pushed a commit to branch feat/grpc-armeria-migration in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 173af25d2f07b4533161ebfc33e2df9a3be80d84 Author: yasithdev <[email protected]> AuthorDate: Tue Mar 31 21:21:23 2026 -0400 fix: complete proto migration for all remaining test files --- .../JobSubmissionInterfaceRepositoryTest.java | 4 +- .../repository/StorageResourceRepositoryTest.java | 4 +- .../UserResourceProfileRepositoryTest.java | 4 +- .../service/ApplicationCatalogServiceTest.java | 4 +- .../service/GatewayResourceProfileServiceTest.java | 10 +- .../service/GroupResourceProfileServiceTest.java | 12 +- .../compute/service/ParserServiceTest.java | 10 +- .../compute/service/ResourceServiceTest.java | 14 +- .../service/UserResourceProfileServiceTest.java | 10 +- .../GroupComputeResourcePreferenceUtilTest.java | 101 +++++++------- .../repository/db/CredentialsDAOTest.java | 2 +- .../credential/service/SSHAccountServiceTest.java | 6 +- .../repository/ExperimentErrorRepositoryTest.java | 2 +- .../repository/ExperimentInputRepositoryTest.java | 2 +- .../repository/ExperimentOutputRepositoryTest.java | 2 +- .../repository/ExperimentRepositoryTest.java | 24 ++-- .../repository/ExperimentStatusRepositoryTest.java | 6 +- .../ExperimentSummaryRepositoryTest.java | 24 ++-- .../execution/repository/JobRepositoryTest.java | 8 +- .../repository/JobStatusRepositoryTest.java | 6 +- .../repository/ProcessErrorRepositoryTest.java | 6 +- .../repository/ProcessInputRepositoryTest.java | 4 +- .../repository/ProcessOutputRepositoryTest.java | 4 +- .../repository/ProcessRepositoryTest.java | 22 ++-- .../repository/ProcessStatusRepositoryTest.java | 10 +- .../repository/ProjectRepositoryTest.java | 4 +- .../repository/TaskErrorRepositoryTest.java | 6 +- .../execution/repository/TaskRepositoryTest.java | 12 +- .../repository/TaskStatusRepositoryTest.java | 6 +- .../repository/WorkflowRepositoryTest.java | 146 ++++++++++----------- .../execution/service/ExperimentServiceTest.java | 22 ++-- .../execution/service/ProjectServiceTest.java | 8 +- .../replicacatalog/DataProductRepositoryTest.java | 6 +- .../DataReplicaLocationRepositoryTest.java | 4 +- .../ExperimentRepositoryIntegrationTest.java | 8 +- .../admin/services/core/tests/SetupNewGateway.java | 12 +- .../util/AuthenticatorConfigurationReaderTest.java | 6 +- .../storage/service/DataProductServiceTest.java | 4 +- 38 files changed, 275 insertions(+), 270 deletions(-) diff --git a/airavata-api/src/test/java/org/apache/airavata/compute/repository/JobSubmissionInterfaceRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/compute/repository/JobSubmissionInterfaceRepositoryTest.java index a282005788..10892721c4 100644 --- a/airavata-api/src/test/java/org/apache/airavata/compute/repository/JobSubmissionInterfaceRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/compute/repository/JobSubmissionInterfaceRepositoryTest.java @@ -50,8 +50,8 @@ public class JobSubmissionInterfaceRepositoryTest extends TestBase { public void createTestComputeResource() throws AppCatalogException { ComputeResourceDescription description = ComputeResourceDescription.newBuilder().setHostName("localhost").build(); - description = description.toBuilder().addBatchQueues(new BatchQueue("queue1")).build(); - description = description.toBuilder().addBatchQueues(new BatchQueue("queue2")).build(); + description = description.toBuilder().addBatchQueues(BatchQueue.newBuilder().setQueueName("queue1").build()).build(); + description = description.toBuilder().addBatchQueues(BatchQueue.newBuilder().setQueueName("queue2").build()).build(); computeResourceId = computeResourceRepository.addComputeResource(description); } diff --git a/airavata-api/src/test/java/org/apache/airavata/compute/repository/StorageResourceRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/compute/repository/StorageResourceRepositoryTest.java index f5ab396106..5790dee2b5 100644 --- a/airavata-api/src/test/java/org/apache/airavata/compute/repository/StorageResourceRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/compute/repository/StorageResourceRepositoryTest.java @@ -74,7 +74,7 @@ public class StorageResourceRepositoryTest extends TestBase { dataMovementInterfaces.add(scpInterface); dataMovementInterfaces.add(gridFTPMv); - description = description.toBuilder().setDataMovementInterfaces(dataMovementInterfaces).build(); + description = description.toBuilder().addAllDataMovementInterfaces(dataMovementInterfaces).build(); String resourceId = storageResourceRepository.addStorageResource(description); StorageResourceDescription storageResourceDescription = null; @@ -125,7 +125,7 @@ public class StorageResourceRepositoryTest extends TestBase { List<String> endPoints = new ArrayList<String>(); endPoints.add("222.33.43.444"); endPoints.add("23.344.44.454"); - dataMovement = dataMovement.toBuilder().setGridFTPEndPoints(endPoints).build(); + dataMovement = dataMovement.toBuilder().addAllGridFtpEndPoints(endPoints).build(); return new ComputeResourceRepository().addGridFTPDataMovement(dataMovement); } catch (AppCatalogException e) { logger.error(e.getMessage(), e); diff --git a/airavata-api/src/test/java/org/apache/airavata/compute/repository/UserResourceProfileRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/compute/repository/UserResourceProfileRepositoryTest.java index cf37ec635e..82c27218e2 100644 --- a/airavata-api/src/test/java/org/apache/airavata/compute/repository/UserResourceProfileRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/compute/repository/UserResourceProfileRepositoryTest.java @@ -62,8 +62,8 @@ public class UserResourceProfileRepositoryTest extends TestBase { UserResourceProfile userResourceProfile = UserResourceProfile.newBuilder().setUserId(userId).build(); userResourceProfile = userResourceProfile.toBuilder().setGatewayId(gatewayId).build(); userResourceProfile = userResourceProfile.toBuilder().setCredentialStoreToken("token").build(); - userResourceProfile = userResourceProfile.toBuilder().setUserComputeResourcePreferences(Arrays.asList(userComputeResourcePreference)).build(); - userResourceProfile = userResourceProfile.toBuilder().setUserStoragePreferences(Arrays.asList(userStoragePreference)).build(); + userResourceProfile = userResourceProfile.toBuilder().addAllUserComputeResourcePreferences(Arrays.asList(userComputeResourcePreference)).build(); + userResourceProfile = userResourceProfile.toBuilder().addAllUserStoragePreferences(Arrays.asList(userStoragePreference)).build(); userResourceProfile = userResourceProfile.toBuilder().setIdentityServerTenant("tenant1").build(); userResourceProfile = userResourceProfile.toBuilder().setIdentityServerPwdCredToken("password").build(); if (!userResourceProfileRepository.isUserResourceProfileExists(userId, gatewayId)) diff --git a/airavata-api/src/test/java/org/apache/airavata/compute/service/ApplicationCatalogServiceTest.java b/airavata-api/src/test/java/org/apache/airavata/compute/service/ApplicationCatalogServiceTest.java index dc6fbe4f60..c873066a1b 100644 --- a/airavata-api/src/test/java/org/apache/airavata/compute/service/ApplicationCatalogServiceTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/compute/service/ApplicationCatalogServiceTest.java @@ -222,7 +222,7 @@ class ApplicationCatalogServiceTest { @Test void getApplicationInputs_delegatesToRegistry() throws Exception { - List<InputDataObjectType> inputs = List.of(new InputDataObjectType()); + List<InputDataObjectType> inputs = List.of(InputDataObjectType.getDefaultInstance()); when(registryHandler.getApplicationInputs("iface-1")).thenReturn(inputs); List<InputDataObjectType> result = service.getApplicationInputs(ctx, "iface-1"); @@ -233,7 +233,7 @@ class ApplicationCatalogServiceTest { @Test void getApplicationOutputs_delegatesToRegistry() throws Exception { - List<OutputDataObjectType> outputs = List.of(new OutputDataObjectType()); + List<OutputDataObjectType> outputs = List.of(OutputDataObjectType.getDefaultInstance()); when(registryHandler.getApplicationOutputs("iface-1")).thenReturn(outputs); List<OutputDataObjectType> result = service.getApplicationOutputs(ctx, "iface-1"); diff --git a/airavata-api/src/test/java/org/apache/airavata/compute/service/GatewayResourceProfileServiceTest.java b/airavata-api/src/test/java/org/apache/airavata/compute/service/GatewayResourceProfileServiceTest.java index e712117ca0..081b2a0267 100644 --- a/airavata-api/src/test/java/org/apache/airavata/compute/service/GatewayResourceProfileServiceTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/compute/service/GatewayResourceProfileServiceTest.java @@ -76,7 +76,7 @@ class GatewayResourceProfileServiceTest { @Test void updateGatewayResourceProfile_delegatesToRegistry() throws Exception { - GatewayResourceProfile profile = new GatewayResourceProfile(); + GatewayResourceProfile profile = GatewayResourceProfile.getDefaultInstance(); when(registryHandler.updateGatewayResourceProfile("testGateway", profile)) .thenReturn(true); @@ -96,7 +96,7 @@ class GatewayResourceProfileServiceTest { @Test void addGatewayComputeResourcePreference_delegatesToRegistry() throws Exception { - ComputeResourcePreference pref = new ComputeResourcePreference(); + ComputeResourcePreference pref = ComputeResourcePreference.getDefaultInstance(); when(registryHandler.addGatewayComputeResourcePreference("testGateway", "compute-1", pref)) .thenReturn(true); @@ -107,7 +107,7 @@ class GatewayResourceProfileServiceTest { @Test void getAllGatewayComputeResourcePreferences_delegatesToRegistry() throws Exception { - List<ComputeResourcePreference> prefs = List.of(new ComputeResourcePreference()); + List<ComputeResourcePreference> prefs = List.of(ComputeResourcePreference.getDefaultInstance()); when(registryHandler.getAllGatewayComputeResourcePreferences("testGateway")) .thenReturn(prefs); @@ -118,7 +118,7 @@ class GatewayResourceProfileServiceTest { @Test void getAllGatewayResourceProfiles_delegatesToRegistry() throws Exception { - List<GatewayResourceProfile> profiles = List.of(new GatewayResourceProfile()); + List<GatewayResourceProfile> profiles = List.of(GatewayResourceProfile.getDefaultInstance()); when(registryHandler.getAllGatewayResourceProfiles()).thenReturn(profiles); List<GatewayResourceProfile> result = service.getAllGatewayResourceProfiles(ctx); @@ -128,7 +128,7 @@ class GatewayResourceProfileServiceTest { @Test void addGatewayStoragePreference_delegatesToRegistry() throws Exception { - StoragePreference pref = new StoragePreference(); + StoragePreference pref = StoragePreference.getDefaultInstance(); when(registryHandler.addGatewayStoragePreference("testGateway", "storage-1", pref)) .thenReturn(true); diff --git a/airavata-api/src/test/java/org/apache/airavata/compute/service/GroupResourceProfileServiceTest.java b/airavata-api/src/test/java/org/apache/airavata/compute/service/GroupResourceProfileServiceTest.java index 6bc6b68ed7..e4ed57893f 100644 --- a/airavata-api/src/test/java/org/apache/airavata/compute/service/GroupResourceProfileServiceTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/compute/service/GroupResourceProfileServiceTest.java @@ -83,8 +83,8 @@ class GroupResourceProfileServiceTest { @Test void getGroupResourceList_delegatesToRegistry() throws Exception { - GroupResourceProfile p1 = new GroupResourceProfile(); - GroupResourceProfile p2 = new GroupResourceProfile(); + GroupResourceProfile p1 = GroupResourceProfile.getDefaultInstance(); + GroupResourceProfile p2 = GroupResourceProfile.getDefaultInstance(); when(registryHandler.getGroupResourceList(eq("testGateway"), anyList())).thenReturn(List.of(p1, p2)); List<GroupResourceProfile> result = service.getGroupResourceList(ctx, "testGateway"); @@ -105,8 +105,10 @@ class GroupResourceProfileServiceTest { @Test void updateGroupResourceProfile_sharingDisabled_delegatesToRegistry() throws Exception { - GroupResourceProfile profile = GroupResourceProfile.newBuilder().setGroupResourceProfileId("grp-profile-1").build(); - profile = profile.toBuilder().setGatewayId("testGateway").build(); + GroupResourceProfile profile = GroupResourceProfile.newBuilder() + .setGroupResourceProfileId("grp-profile-1") + .setGatewayId("testGateway") + .build(); assertDoesNotThrow(() -> service.updateGroupResourceProfile(ctx, profile)); verify(registryHandler).updateGroupResourceProfile(profile); @@ -114,7 +116,7 @@ class GroupResourceProfileServiceTest { @Test void getGroupComputeResourcePrefList_sharingDisabled_returnsPrefs() throws Exception { - GroupComputeResourcePreference pref = new GroupComputeResourcePreference(); + GroupComputeResourcePreference pref = GroupComputeResourcePreference.getDefaultInstance(); when(registryHandler.getGroupComputeResourcePrefList("grp-profile-1")).thenReturn(List.of(pref)); List<GroupComputeResourcePreference> result = service.getGroupComputeResourcePrefList(ctx, "grp-profile-1"); diff --git a/airavata-api/src/test/java/org/apache/airavata/compute/service/ParserServiceTest.java b/airavata-api/src/test/java/org/apache/airavata/compute/service/ParserServiceTest.java index c3efbf586b..40ac5ff637 100644 --- a/airavata-api/src/test/java/org/apache/airavata/compute/service/ParserServiceTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/compute/service/ParserServiceTest.java @@ -64,7 +64,7 @@ class ParserServiceTest { @Test void saveParser_returnsParserId() throws Exception { - Parser parser = new Parser(); + Parser parser = Parser.getDefaultInstance(); when(registryHandler.saveParser(parser)).thenReturn("parser-saved-id"); String result = parserService.saveParser(ctx, parser); @@ -75,8 +75,8 @@ class ParserServiceTest { @Test void listAllParsers_returnsList() throws Exception { - Parser p1 = new Parser(); - Parser p2 = new Parser(); + Parser p1 = Parser.getDefaultInstance(); + Parser p2 = Parser.getDefaultInstance(); when(registryHandler.listAllParsers("testGateway")).thenReturn(List.of(p1, p2)); List<Parser> result = parserService.listAllParsers(ctx, "testGateway"); @@ -107,7 +107,7 @@ class ParserServiceTest { @Test void saveParsingTemplate_returnsTemplateId() throws Exception { - ParsingTemplate template = new ParsingTemplate(); + ParsingTemplate template = ParsingTemplate.getDefaultInstance(); when(registryHandler.saveParsingTemplate(template)).thenReturn("tpl-saved-id"); String result = parserService.saveParsingTemplate(ctx, template); @@ -126,7 +126,7 @@ class ParserServiceTest { @Test void getParsingTemplatesForExperiment_returnsList() throws Exception { - ParsingTemplate t1 = new ParsingTemplate(); + ParsingTemplate t1 = ParsingTemplate.getDefaultInstance(); when(registryHandler.getParsingTemplatesForExperiment("exp-1", "testGateway")) .thenReturn(List.of(t1)); diff --git a/airavata-api/src/test/java/org/apache/airavata/compute/service/ResourceServiceTest.java b/airavata-api/src/test/java/org/apache/airavata/compute/service/ResourceServiceTest.java index 22b20e8b6e..21802fa799 100644 --- a/airavata-api/src/test/java/org/apache/airavata/compute/service/ResourceServiceTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/compute/service/ResourceServiceTest.java @@ -66,7 +66,7 @@ class ResourceServiceTest { @Test void registerComputeResource_wrapsRegistryException() throws Exception { - ComputeResourceDescription desc = new ComputeResourceDescription(); + ComputeResourceDescription desc = ComputeResourceDescription.getDefaultInstance(); when(registryHandler.registerComputeResource(desc)).thenThrow(new RuntimeException("DB error")); assertThrows(ServiceException.class, () -> resourceService.registerComputeResource(desc)); @@ -128,7 +128,7 @@ class ResourceServiceTest { @Test void addSSHJobSubmissionDetails_returnsId() throws Exception { - SSHJobSubmission submission = new SSHJobSubmission(); + SSHJobSubmission submission = SSHJobSubmission.getDefaultInstance(); when(registryHandler.addSSHJobSubmissionDetails("cr-001", 1, submission)) .thenReturn("js-001"); @@ -149,8 +149,7 @@ class ResourceServiceTest { @Test void getLocalJobSubmission_returnsSubmission() throws Exception { - LOCALSubmission submission = new LOCALSubmission(); - submission.setJobSubmissionInterfaceId("js-local-001"); + LOCALSubmission submission = LOCALSubmission.newBuilder().setJobSubmissionInterfaceId("js-local-001").build(); when(registryHandler.getLocalJobSubmission("js-local-001")).thenReturn(submission); LOCALSubmission result = resourceService.getLocalJobSubmission("js-local-001"); @@ -163,7 +162,7 @@ class ResourceServiceTest { @Test void addSCPDataMovementDetails_returnsId() throws Exception { - SCPDataMovement movement = new SCPDataMovement(); + SCPDataMovement movement = SCPDataMovement.getDefaultInstance(); when(registryHandler.addSCPDataMovementDetails("cr-001", DMType.COMPUTE_RESOURCE, 0, movement)) .thenReturn("dm-001"); @@ -184,7 +183,7 @@ class ResourceServiceTest { @Test void addSCPDataMovementDetails_wrapsException() throws Exception { - SCPDataMovement movement = new SCPDataMovement(); + SCPDataMovement movement = SCPDataMovement.getDefaultInstance(); when(registryHandler.addSCPDataMovementDetails(any(), any(), anyInt(), any())) .thenThrow(new RuntimeException("registry failure")); @@ -197,8 +196,7 @@ class ResourceServiceTest { @Test void registerResourceJobManager_returnsId() throws Exception { - ResourceJobManager manager = new ResourceJobManager(); - manager.setResourceJobManagerType(ResourceJobManagerType.SLURM); + ResourceJobManager manager = ResourceJobManager.newBuilder().setResourceJobManagerType(ResourceJobManagerType.SLURM).build(); when(registryHandler.registerResourceJobManager(manager)).thenReturn("rjm-001"); String result = resourceService.registerResourceJobManager(manager); diff --git a/airavata-api/src/test/java/org/apache/airavata/compute/service/UserResourceProfileServiceTest.java b/airavata-api/src/test/java/org/apache/airavata/compute/service/UserResourceProfileServiceTest.java index 294a0d0671..0ddee98a61 100644 --- a/airavata-api/src/test/java/org/apache/airavata/compute/service/UserResourceProfileServiceTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/compute/service/UserResourceProfileServiceTest.java @@ -97,7 +97,7 @@ class UserResourceProfileServiceTest { @Test void addUserComputeResourcePreference_delegatesToRegistry() throws Exception { - UserComputeResourcePreference pref = new UserComputeResourcePreference(); + UserComputeResourcePreference pref = UserComputeResourcePreference.getDefaultInstance(); when(registryHandler.addUserComputeResourcePreference("testUser", "testGateway", "compute-1", pref)) .thenReturn(true); @@ -108,7 +108,7 @@ class UserResourceProfileServiceTest { @Test void getAllUserComputeResourcePreferences_delegatesToRegistry() throws Exception { - List<UserComputeResourcePreference> prefs = List.of(new UserComputeResourcePreference()); + List<UserComputeResourcePreference> prefs = List.of(UserComputeResourcePreference.getDefaultInstance()); when(registryHandler.getAllUserComputeResourcePreferences("testUser", "testGateway")) .thenReturn(prefs); @@ -120,7 +120,7 @@ class UserResourceProfileServiceTest { @Test void getAllUserResourceProfiles_delegatesToRegistry() throws Exception { - List<UserResourceProfile> profiles = List.of(new UserResourceProfile()); + List<UserResourceProfile> profiles = List.of(UserResourceProfile.getDefaultInstance()); when(registryHandler.getAllUserResourceProfiles()).thenReturn(profiles); List<UserResourceProfile> result = service.getAllUserResourceProfiles(ctx); @@ -130,7 +130,7 @@ class UserResourceProfileServiceTest { @Test void getLatestQueueStatuses_delegatesToRegistry() throws Exception { - List<QueueStatusModel> statuses = List.of(new QueueStatusModel()); + List<QueueStatusModel> statuses = List.of(QueueStatusModel.getDefaultInstance()); when(registryHandler.getLatestQueueStatuses()).thenReturn(statuses); List<QueueStatusModel> result = service.getLatestQueueStatuses(ctx); @@ -140,7 +140,7 @@ class UserResourceProfileServiceTest { @Test void addUserStoragePreference_delegatesToRegistry() throws Exception { - UserStoragePreference pref = new UserStoragePreference(); + UserStoragePreference pref = UserStoragePreference.getDefaultInstance(); when(registryHandler.addUserStoragePreference("testUser", "testGateway", "storage-1", pref)) .thenReturn(true); diff --git a/airavata-api/src/test/java/org/apache/airavata/compute/util/GroupComputeResourcePreferenceUtilTest.java b/airavata-api/src/test/java/org/apache/airavata/compute/util/GroupComputeResourcePreferenceUtilTest.java index 78d5cf76f7..dd6744f673 100644 --- a/airavata-api/src/test/java/org/apache/airavata/compute/util/GroupComputeResourcePreferenceUtilTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/compute/util/GroupComputeResourcePreferenceUtilTest.java @@ -37,13 +37,14 @@ public class GroupComputeResourcePreferenceUtilTest { @Test public void testGetActiveReservationForQueue() { - final GroupComputeResourcePreference pref = new GroupComputeResourcePreference(); - final ComputeResourceReservation res1 = new ComputeResourceReservation( - "id1", - "res1", - Arrays.asList("cpu", "gpu"), - System.currentTimeMillis() - 10000, - System.currentTimeMillis() + 10000); + final GroupComputeResourcePreference pref = GroupComputeResourcePreference.getDefaultInstance(); + final ComputeResourceReservation res1 = ComputeResourceReservation.newBuilder() + .setReservationId("id1") + .setReservationName("res1") + .addAllQueueNames(Arrays.asList("cpu", "gpu")) + .setStartTime(System.currentTimeMillis() - 10000) + .setEndTime(System.currentTimeMillis() + 10000) + .build(); // pref.addToReservations(res1); FIXME final ComputeResourceReservation result = @@ -55,7 +56,7 @@ public class GroupComputeResourcePreferenceUtilTest { @Test public void testGetActiveReservationForQueueWhenNoReservations() { - final GroupComputeResourcePreference pref = new GroupComputeResourcePreference(); + final GroupComputeResourcePreference pref = GroupComputeResourcePreference.getDefaultInstance(); final ComputeResourceReservation result = GroupComputeResourcePreferenceUtil.getActiveReservationForQueue(pref, "cpu"); @@ -67,13 +68,14 @@ public class GroupComputeResourcePreferenceUtilTest { @Test public void testGetActiveReservationForQueueWhenReservationIsExpired() { - final GroupComputeResourcePreference pref = new GroupComputeResourcePreference(); - final ComputeResourceReservation res1 = new ComputeResourceReservation( - "id1", - "res1", - Arrays.asList("cpu", "gpu"), - System.currentTimeMillis() - 20000, - System.currentTimeMillis() - 10000); + final GroupComputeResourcePreference pref = GroupComputeResourcePreference.getDefaultInstance(); + final ComputeResourceReservation res1 = ComputeResourceReservation.newBuilder() + .setReservationId("id1") + .setReservationName("res1") + .addAllQueueNames(Arrays.asList("cpu", "gpu")) + .setStartTime(System.currentTimeMillis() - 20000) + .setEndTime(System.currentTimeMillis() - 10000) + .build(); // pref.addToReservations(res1); FIXME final ComputeResourceReservation result = @@ -86,13 +88,14 @@ public class GroupComputeResourcePreferenceUtilTest { @Test public void testGetActiveReservationForQueueWhenReservationActiveButWrongQueue() { - final GroupComputeResourcePreference pref = new GroupComputeResourcePreference(); - final ComputeResourceReservation res1 = new ComputeResourceReservation( - "id1", - "res1", - Arrays.asList("cpu", "gpu"), - System.currentTimeMillis() - 10000, - System.currentTimeMillis() + 10000); + final GroupComputeResourcePreference pref = GroupComputeResourcePreference.getDefaultInstance(); + final ComputeResourceReservation res1 = ComputeResourceReservation.newBuilder() + .setReservationId("id1") + .setReservationName("res1") + .addAllQueueNames(Arrays.asList("cpu", "gpu")) + .setStartTime(System.currentTimeMillis() - 10000) + .setEndTime(System.currentTimeMillis() + 10000) + .build(); // pref.addToReservations(res1); FIXME final ComputeResourceReservation result = @@ -105,34 +108,38 @@ public class GroupComputeResourcePreferenceUtilTest { @Test public void testGetActiveReservationWithRandomOrder() { - final GroupComputeResourcePreference pref = new GroupComputeResourcePreference(); - final ComputeResourceReservation res1 = new ComputeResourceReservation( - "id1", - "res1", - Arrays.asList("cpu", "gpu"), - System.currentTimeMillis() - 10000, - System.currentTimeMillis() + 10000); + final GroupComputeResourcePreference pref = GroupComputeResourcePreference.getDefaultInstance(); + final ComputeResourceReservation res1 = ComputeResourceReservation.newBuilder() + .setReservationId("id1") + .setReservationName("res1") + .addAllQueueNames(Arrays.asList("cpu", "gpu")) + .setStartTime(System.currentTimeMillis() - 10000) + .setEndTime(System.currentTimeMillis() + 10000) + .build(); // expired - final ComputeResourceReservation res2 = new ComputeResourceReservation( - "id2", - "res2", - Arrays.asList("cpu", "gpu"), - System.currentTimeMillis() - 20000, - System.currentTimeMillis() - 10000); + final ComputeResourceReservation res2 = ComputeResourceReservation.newBuilder() + .setReservationId("id2") + .setReservationName("res2") + .addAllQueueNames(Arrays.asList("cpu", "gpu")) + .setStartTime(System.currentTimeMillis() - 20000) + .setEndTime(System.currentTimeMillis() - 10000) + .build(); // future - final ComputeResourceReservation res3 = new ComputeResourceReservation( - "id3", - "res3", - Arrays.asList("cpu", "gpu"), - System.currentTimeMillis() + 10000, - System.currentTimeMillis() + 20000); + final ComputeResourceReservation res3 = ComputeResourceReservation.newBuilder() + .setReservationId("id3") + .setReservationName("res3") + .addAllQueueNames(Arrays.asList("cpu", "gpu")) + .setStartTime(System.currentTimeMillis() + 10000) + .setEndTime(System.currentTimeMillis() + 20000) + .build(); // wrong queue - final ComputeResourceReservation res4 = new ComputeResourceReservation( - "id3", - "res3", - Arrays.asList("shared", "compute"), - System.currentTimeMillis() + 10000, - System.currentTimeMillis() + 20000); + final ComputeResourceReservation res4 = ComputeResourceReservation.newBuilder() + .setReservationId("id3") + .setReservationName("res3") + .addAllQueueNames(Arrays.asList("shared", "compute")) + .setStartTime(System.currentTimeMillis() + 10000) + .setEndTime(System.currentTimeMillis() + 20000) + .build(); final List<ComputeResourceReservation> reservations = Arrays.asList(res1, res2, res3, res4); Collections.shuffle(reservations); diff --git a/airavata-api/src/test/java/org/apache/airavata/credential/repository/db/CredentialsDAOTest.java b/airavata-api/src/test/java/org/apache/airavata/credential/repository/db/CredentialsDAOTest.java index 5b485fca97..941ce727de 100644 --- a/airavata-api/src/test/java/org/apache/airavata/credential/repository/db/CredentialsDAOTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/credential/repository/db/CredentialsDAOTest.java @@ -302,7 +302,7 @@ public class CredentialsDAOTest extends DatabaseTestCases { CertificateCredential certificateCredential = (CertificateCredential) credentialsDAO.getCredential("gw1", "tom", connection); // Test get gateway name - String gateway = credentialsDAO.getGatewayId("tom", connection); + String gateway = credentialsDAO.getGatewayID("tom", connection); assertNotNull(certificateCredential); assertEquals("jerry", certificateCredential.getPortalUserName()); assertEquals("gw1", gateway); diff --git a/airavata-api/src/test/java/org/apache/airavata/credential/service/SSHAccountServiceTest.java b/airavata-api/src/test/java/org/apache/airavata/credential/service/SSHAccountServiceTest.java index fb876a7bdf..be9f96fcb6 100644 --- a/airavata-api/src/test/java/org/apache/airavata/credential/service/SSHAccountServiceTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/credential/service/SSHAccountServiceTest.java @@ -78,7 +78,7 @@ class SSHAccountServiceTest { @Test void isSSHSetupComplete_fetchesCredentialAndDelegates() throws Exception { - SSHCredential cred = new SSHCredential(); + SSHCredential cred = SSHCredential.getDefaultInstance(); when(credentialHandler.getSSHCredential("tok-123", "testGateway")).thenReturn(cred); try (MockedStatic<SSHAccountManager> mock = mockStatic(SSHAccountManager.class)) { @@ -104,7 +104,7 @@ class SSHAccountServiceTest { @Test void setupSSHAccount_fetchesCredentialAndDelegates() throws Exception { - SSHCredential cred = new SSHCredential(); + SSHCredential cred = SSHCredential.getDefaultInstance(); when(credentialHandler.getSSHCredential("tok-123", "testGateway")).thenReturn(cred); UserComputeResourcePreference pref = UserComputeResourcePreference.newBuilder().setComputeResourceId("cr-001").build(); @@ -124,7 +124,7 @@ class SSHAccountServiceTest { @Test void setupSSHAccount_wrapsSSHAccountManagerException() throws Exception { - SSHCredential cred = new SSHCredential(); + SSHCredential cred = SSHCredential.getDefaultInstance(); when(credentialHandler.getSSHCredential("tok-123", "testGateway")).thenReturn(cred); try (MockedStatic<SSHAccountManager> mock = mockStatic(SSHAccountManager.class)) { diff --git a/airavata-api/src/test/java/org/apache/airavata/execution/repository/ExperimentErrorRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/execution/repository/ExperimentErrorRepositoryTest.java index 9796e42167..bc0c0c4e04 100644 --- a/airavata-api/src/test/java/org/apache/airavata/execution/repository/ExperimentErrorRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/execution/repository/ExperimentErrorRepositoryTest.java @@ -70,7 +70,7 @@ public class ExperimentErrorRepositoryTest extends TestBase { experimentModel = experimentModel.toBuilder().setExperimentType(ExperimentType.SINGLE_APPLICATION).build(); experimentModel = experimentModel.toBuilder().setUserName("user").build(); experimentModel = experimentModel.toBuilder().setExperimentName("name").build(); - experimentModel = experimentModel.toBuilder().setUserConfigurationData(new UserConfigurationDataModel()).build(); + experimentModel = experimentModel.toBuilder().setUserConfigurationData(UserConfigurationDataModel.getDefaultInstance()).build(); String experimentId = experimentRepository.addExperiment(experimentModel); assertTrue(experimentId != null); diff --git a/airavata-api/src/test/java/org/apache/airavata/execution/repository/ExperimentInputRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/execution/repository/ExperimentInputRepositoryTest.java index 73f92a3416..ab7ba33084 100644 --- a/airavata-api/src/test/java/org/apache/airavata/execution/repository/ExperimentInputRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/execution/repository/ExperimentInputRepositoryTest.java @@ -72,7 +72,7 @@ public class ExperimentInputRepositoryTest extends TestBase { experimentModel = experimentModel.toBuilder().setExperimentType(ExperimentType.SINGLE_APPLICATION).build(); experimentModel = experimentModel.toBuilder().setUserName("user").build(); experimentModel = experimentModel.toBuilder().setExperimentName("name").build(); - experimentModel = experimentModel.toBuilder().setUserConfigurationData(new UserConfigurationDataModel()).build(); + experimentModel = experimentModel.toBuilder().setUserConfigurationData(UserConfigurationDataModel.getDefaultInstance()).build(); String experimentId = experimentRepository.addExperiment(experimentModel); assertTrue(experimentId != null); diff --git a/airavata-api/src/test/java/org/apache/airavata/execution/repository/ExperimentOutputRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/execution/repository/ExperimentOutputRepositoryTest.java index ad0dd2e916..5da497bbd3 100644 --- a/airavata-api/src/test/java/org/apache/airavata/execution/repository/ExperimentOutputRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/execution/repository/ExperimentOutputRepositoryTest.java @@ -72,7 +72,7 @@ public class ExperimentOutputRepositoryTest extends TestBase { experimentModel = experimentModel.toBuilder().setExperimentType(ExperimentType.SINGLE_APPLICATION).build(); experimentModel = experimentModel.toBuilder().setUserName("user").build(); experimentModel = experimentModel.toBuilder().setExperimentName("name").build(); - experimentModel = experimentModel.toBuilder().setUserConfigurationData(new UserConfigurationDataModel()).build(); + experimentModel = experimentModel.toBuilder().setUserConfigurationData(UserConfigurationDataModel.getDefaultInstance()).build(); String experimentId = experimentRepository.addExperiment(experimentModel); assertTrue(experimentId != null); diff --git a/airavata-api/src/test/java/org/apache/airavata/execution/repository/ExperimentRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/execution/repository/ExperimentRepositoryTest.java index 71c62bc281..f5c76632e1 100644 --- a/airavata-api/src/test/java/org/apache/airavata/execution/repository/ExperimentRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/execution/repository/ExperimentRepositoryTest.java @@ -79,7 +79,7 @@ public class ExperimentRepositoryTest extends TestBase { experimentModel = experimentModel.toBuilder().setExperimentType(ExperimentType.SINGLE_APPLICATION).build(); experimentModel = experimentModel.toBuilder().setUserName("user").build(); experimentModel = experimentModel.toBuilder().setExperimentName("name").build(); - experimentModel = experimentModel.toBuilder().setUserConfigurationData(new UserConfigurationDataModel()).build(); + experimentModel = experimentModel.toBuilder().setUserConfigurationData(UserConfigurationDataModel.getDefaultInstance()).build(); experimentModel = experimentModel.toBuilder().setGatewayInstanceId("gateway-instance-id").build(); String experimentId = experimentRepository.addExperiment(experimentModel); @@ -98,20 +98,19 @@ public class ExperimentRepositoryTest extends TestBase { assertEquals(1, retrievedExperimentModel.getExperimentStatusCount()); assertEquals( ExperimentState.EXPERIMENT_STATE_CREATED, - retrievedExperimentModel.getExperimentStatus().get(0).getState()); + retrievedExperimentModel.getExperimentStatusList().get(0).getState()); assertEquals(2, retrievedExperimentModel.getEmailAddressesCount()); assertEquals( "[email protected]", - retrievedExperimentModel.getEmailAddresses().get(0)); + retrievedExperimentModel.getEmailAddressesList().get(0)); assertEquals( "[email protected]", - retrievedExperimentModel.getEmailAddresses().get(1)); + retrievedExperimentModel.getEmailAddressesList().get(1)); UserConfigurationDataModel userConfigurationDataModel = UserConfigurationDataModel.newBuilder().setAiravataAutoSchedule(true).build(); userConfigurationDataModel = userConfigurationDataModel.toBuilder().setOverrideManualScheduledParams(false).build(); ComputationalResourceSchedulingModel computationalResourceSchedulingModel = - new ComputationalResourceSchedulingModel(); - computationalResourceSchedulingModel = computationalResourceSchedulingModel.toBuilder().setResourceHostId("resource-host-id").build(); + ComputationalResourceSchedulingModel.newBuilder().setResourceHostId("resource-host-id").build(); computationalResourceSchedulingModel = computationalResourceSchedulingModel.toBuilder().setTotalCpuCount(12).build(); computationalResourceSchedulingModel = computationalResourceSchedulingModel.toBuilder().setNodeCount(13).build(); computationalResourceSchedulingModel = computationalResourceSchedulingModel.toBuilder().setNumberOfThreads(14).build(); @@ -163,7 +162,7 @@ public class ExperimentRepositoryTest extends TestBase { experimentModel = experimentModel.toBuilder().setExperimentType(ExperimentType.SINGLE_APPLICATION).build(); experimentModel = experimentModel.toBuilder().setUserName("user").build(); experimentModel = experimentModel.toBuilder().setExperimentName("name").build(); - experimentModel = experimentModel.toBuilder().setUserConfigurationData(new UserConfigurationDataModel()).build(); + experimentModel = experimentModel.toBuilder().setUserConfigurationData(UserConfigurationDataModel.getDefaultInstance()).build(); experimentModel = experimentModel.toBuilder().setGatewayInstanceId("gateway-instance-id").build(); InputDataObjectType input1 = InputDataObjectType.newBuilder().setName("name1").build(); @@ -188,7 +187,7 @@ public class ExperimentRepositoryTest extends TestBase { ExperimentModel retrievedExperimentModel = experimentRepository.getExperiment(experimentId); assertEquals(1, retrievedExperimentModel.getExperimentInputsCount()); InputDataObjectType retrievedInput1 = - retrievedExperimentModel.getExperimentInputs().get(0); + retrievedExperimentModel.getExperimentInputsList().get(0); assertEquals("name1", retrievedInput1.getName()); assertTrue(retrievedInput1.getIsRequired()); assertEquals(DataType.STRING, retrievedInput1.getType()); @@ -223,7 +222,7 @@ public class ExperimentRepositoryTest extends TestBase { retrievedExperimentModel = experimentRepository.getExperiment(experimentId); assertEquals(1, retrievedExperimentModel.getExperimentInputsCount()); - retrievedInput1 = retrievedExperimentModel.getExperimentInputs().get(0); + retrievedInput1 = retrievedExperimentModel.getExperimentInputsList().get(0); assertFalse(retrievedInput1.getIsRequired()); assertEquals(DataType.URI, retrievedInput1.getType()); assertEquals(1, retrievedInput1.getInputOrder()); @@ -254,19 +253,18 @@ public class ExperimentRepositoryTest extends TestBase { experimentModel = experimentModel.toBuilder().setExperimentType(ExperimentType.SINGLE_APPLICATION).build(); experimentModel = experimentModel.toBuilder().setUserName("user").build(); experimentModel = experimentModel.toBuilder().setExperimentName("name/forward-slash//a").build(); - experimentModel = experimentModel.toBuilder().setUserConfigurationData(new UserConfigurationDataModel()).build(); + experimentModel = experimentModel.toBuilder().setUserConfigurationData(UserConfigurationDataModel.getDefaultInstance()).build(); String experimentId = experimentRepository.addExperiment(experimentModel); assertTrue(experimentId.startsWith("name_forward-slash__a")); // Backward slashes - experimentModel = new ExperimentModel(); - experimentModel = experimentModel.toBuilder().setProjectId(projectId).build(); + experimentModel = ExperimentModel.newBuilder().setProjectId(projectId).build(); experimentModel = experimentModel.toBuilder().setGatewayId(gatewayId).build(); experimentModel = experimentModel.toBuilder().setExperimentType(ExperimentType.SINGLE_APPLICATION).build(); experimentModel = experimentModel.toBuilder().setUserName("user").build(); experimentModel = experimentModel.toBuilder().setExperimentName("name\\backward-slash\\\\a").build(); - experimentModel = experimentModel.toBuilder().setUserConfigurationData(new UserConfigurationDataModel()).build(); + experimentModel = experimentModel.toBuilder().setUserConfigurationData(UserConfigurationDataModel.getDefaultInstance()).build(); experimentId = experimentRepository.addExperiment(experimentModel); assertTrue(experimentId.startsWith("name_backward-slash__a")); diff --git a/airavata-api/src/test/java/org/apache/airavata/execution/repository/ExperimentStatusRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/execution/repository/ExperimentStatusRepositoryTest.java index df076164ae..8e89f2e56e 100644 --- a/airavata-api/src/test/java/org/apache/airavata/execution/repository/ExperimentStatusRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/execution/repository/ExperimentStatusRepositoryTest.java @@ -70,7 +70,7 @@ public class ExperimentStatusRepositoryTest extends TestBase { experimentModel = experimentModel.toBuilder().setExperimentType(ExperimentType.SINGLE_APPLICATION).build(); experimentModel = experimentModel.toBuilder().setUserName("user").build(); experimentModel = experimentModel.toBuilder().setExperimentName("name").build(); - experimentModel = experimentModel.toBuilder().setUserConfigurationData(new UserConfigurationDataModel()).build(); + experimentModel = experimentModel.toBuilder().setUserConfigurationData(UserConfigurationDataModel.getDefaultInstance()).build(); String experimentId = experimentRepository.addExperiment(experimentModel); assertTrue(experimentId != null); @@ -82,7 +82,7 @@ public class ExperimentStatusRepositoryTest extends TestBase { .getExperimentStatusList() .size()); - ExperimentStatus experimentStatus = new ExperimentStatus(ExperimentState.EXPERIMENT_STATE_VALIDATED); + ExperimentStatus experimentStatus = ExperimentStatus.newBuilder().setState(ExperimentState.EXPERIMENT_STATE_VALIDATED).build(); String experimentStatusId = experimentStatusRepository.addExperimentStatus(experimentStatus, experimentId); assertTrue(experimentStatusId != null); assertEquals( @@ -95,7 +95,7 @@ public class ExperimentStatusRepositoryTest extends TestBase { experimentStatus = experimentStatus.toBuilder().setState(ExperimentState.EXPERIMENT_STATE_EXECUTING).build(); experimentStatusRepository.updateExperimentStatus(experimentStatus, experimentId); - ExperimentStatus updatedExecutingStatus = new ExperimentStatus(ExperimentState.EXPERIMENT_STATE_EXECUTING); + ExperimentStatus updatedExecutingStatus = ExperimentStatus.newBuilder().setState(ExperimentState.EXPERIMENT_STATE_EXECUTING).build(); updatedExecutingStatus = updatedExecutingStatus.toBuilder().setReason("updated reason").build(); updatedExecutingStatus = updatedExecutingStatus.toBuilder().setTimeOfStateChange(experimentStatus.getTimeOfStateChange()).build(); String updatedExperimentStatusId = diff --git a/airavata-api/src/test/java/org/apache/airavata/execution/repository/ExperimentSummaryRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/execution/repository/ExperimentSummaryRepositoryTest.java index 191d9c2b9d..44bcb45cc0 100644 --- a/airavata-api/src/test/java/org/apache/airavata/execution/repository/ExperimentSummaryRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/execution/repository/ExperimentSummaryRepositoryTest.java @@ -79,7 +79,7 @@ public class ExperimentSummaryRepositoryTest extends TestBase { experimentModelOne = experimentModelOne.toBuilder().setExperimentType(ExperimentType.SINGLE_APPLICATION).build(); experimentModelOne = experimentModelOne.toBuilder().setUserName("userOne").build(); experimentModelOne = experimentModelOne.toBuilder().setExperimentName("nameOne").build(); - experimentModelOne = experimentModelOne.toBuilder().setUserConfigurationData(new UserConfigurationDataModel()).build(); + experimentModelOne = experimentModelOne.toBuilder().setUserConfigurationData(UserConfigurationDataModel.getDefaultInstance()).build(); experimentModelOne = experimentModelOne.toBuilder().setDescription("descriptionOne").build(); experimentModelOne = experimentModelOne.toBuilder().setExecutionId("executionIdOne").build(); @@ -88,7 +88,7 @@ public class ExperimentSummaryRepositoryTest extends TestBase { experimentModelTwo = experimentModelTwo.toBuilder().setExperimentType(ExperimentType.WORKFLOW).build(); experimentModelTwo = experimentModelTwo.toBuilder().setUserName("userTwo").build(); experimentModelTwo = experimentModelTwo.toBuilder().setExperimentName("nameTwo").build(); - experimentModelTwo = experimentModelTwo.toBuilder().setUserConfigurationData(new UserConfigurationDataModel()).build(); + experimentModelTwo = experimentModelTwo.toBuilder().setUserConfigurationData(UserConfigurationDataModel.getDefaultInstance()).build(); experimentModelTwo = experimentModelTwo.toBuilder().setDescription("descriptionTwo").build(); experimentModelTwo = experimentModelTwo.toBuilder().setExecutionId("executionIdTwo").build(); @@ -97,7 +97,7 @@ public class ExperimentSummaryRepositoryTest extends TestBase { experimentModelThree = experimentModelThree.toBuilder().setExperimentType(ExperimentType.SINGLE_APPLICATION).build(); experimentModelThree = experimentModelThree.toBuilder().setUserName("userThree").build(); experimentModelThree = experimentModelThree.toBuilder().setExperimentName("nameThree").build(); - experimentModelThree = experimentModelThree.toBuilder().setUserConfigurationData(new UserConfigurationDataModel()).build(); + experimentModelThree = experimentModelThree.toBuilder().setUserConfigurationData(UserConfigurationDataModel.getDefaultInstance()).build(); experimentModelThree = experimentModelThree.toBuilder().setDescription("descriptionThree").build(); experimentModelThree = experimentModelThree.toBuilder().setExecutionId("executionIdThree").build(); @@ -235,20 +235,20 @@ public class ExperimentSummaryRepositoryTest extends TestBase { experimentStatistics = experimentSummaryRepository.getAccessibleExperimentStatistics(allExperimentIds, filters, 10, 0); assertTrue(experimentStatistics.getAllExperimentCount() == 1); - assertEquals(experimentStatistics.getAllExperiments().get(0).getExperimentId(), experimentIdTwo); + assertEquals(experimentStatistics.getAllExperimentsList().get(0).getExperimentId(), experimentIdTwo); filters.remove(DBConstants.Experiment.USER_NAME); filters.remove(DBConstants.Experiment.EXECUTION_ID); - ExperimentStatus experimentStatusOne = new ExperimentStatus(ExperimentState.EXPERIMENT_STATE_CREATED); + ExperimentStatus experimentStatusOne = ExperimentStatus.newBuilder().setState(ExperimentState.EXPERIMENT_STATE_CREATED).build(); String statusIdOne = experimentStatusRepository.addExperimentStatus(experimentStatusOne, experimentIdOne); assertTrue(statusIdOne != null); - ExperimentStatus experimentStatusTwo = new ExperimentStatus(ExperimentState.EXPERIMENT_STATE_EXECUTING); + ExperimentStatus experimentStatusTwo = ExperimentStatus.newBuilder().setState(ExperimentState.EXPERIMENT_STATE_EXECUTING).build(); String statusIdTwo = experimentStatusRepository.addExperimentStatus(experimentStatusTwo, experimentIdTwo); assertTrue(statusIdTwo != null); - ExperimentStatus experimentStatusThree = new ExperimentStatus(ExperimentState.EXPERIMENT_STATE_CANCELED); + ExperimentStatus experimentStatusThree = ExperimentStatus.newBuilder().setState(ExperimentState.EXPERIMENT_STATE_CANCELED).build(); String statusIdThree = experimentStatusRepository.addExperimentStatus(experimentStatusThree, experimentIdThree); assertTrue(statusIdThree != null); @@ -259,7 +259,7 @@ public class ExperimentSummaryRepositoryTest extends TestBase { // Experiment 3 is most recent assertEquals( experimentIdThree, - experimentStatistics.getAllExperiments().get(0).getExperimentId()); + experimentStatistics.getAllExperimentsList().get(0).getExperimentId()); filters.remove(DBConstants.ExperimentSummary.FROM_DATE); filters.remove(DBConstants.ExperimentSummary.TO_DATE); @@ -302,19 +302,19 @@ public class ExperimentSummaryRepositoryTest extends TestBase { // Should still return total count even when only returning the first page of experiment summaries assertEquals(3, experimentStatistics.getAllExperimentCount()); // experiment 3 is most recent - assertEquals(1, experimentStatistics.getAllExperimentsSize()); + assertEquals(1, experimentStatistics.getAllExperimentsCount()); assertEquals( experimentIdThree, - experimentStatistics.getAllExperiments().get(0).getExperimentId()); + experimentStatistics.getAllExperimentsList().get(0).getExperimentId()); // Second page experimentStatistics = experimentSummaryRepository.getAccessibleExperimentStatistics(allExperimentIds, filters, 1, 1); // Should still return total count even when only returning the first page of experiment summaries assertEquals(3, experimentStatistics.getAllExperimentCount()); // experiment 2 is less recent - assertEquals(1, experimentStatistics.getAllExperimentsSize()); + assertEquals(1, experimentStatistics.getAllExperimentsCount()); assertEquals( - experimentIdTwo, experimentStatistics.getAllExperiments().get(0).getExperimentId()); + experimentIdTwo, experimentStatistics.getAllExperimentsList().get(0).getExperimentId()); experimentRepository.removeExperiment(experimentIdOne); experimentRepository.removeExperiment(experimentIdTwo); diff --git a/airavata-api/src/test/java/org/apache/airavata/execution/repository/JobRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/execution/repository/JobRepositoryTest.java index 4bcecd9a11..e415687576 100644 --- a/airavata-api/src/test/java/org/apache/airavata/execution/repository/JobRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/execution/repository/JobRepositoryTest.java @@ -82,11 +82,11 @@ public class JobRepositoryTest extends TestBase { experimentModel = experimentModel.toBuilder().setExperimentType(ExperimentType.SINGLE_APPLICATION).build(); experimentModel = experimentModel.toBuilder().setUserName("user").build(); experimentModel = experimentModel.toBuilder().setExperimentName("name").build(); - experimentModel = experimentModel.toBuilder().setUserConfigurationData(new UserConfigurationDataModel()).build(); + experimentModel = experimentModel.toBuilder().setUserConfigurationData(UserConfigurationDataModel.getDefaultInstance()).build(); String experimentId = experimentRepository.addExperiment(experimentModel); - ProcessModel processModel = new ProcessModel(null, experimentId); + ProcessModel processModel = ProcessModel.newBuilder().setExperimentId(experimentId).build(); String processId = processRepository.addProcess(processModel, experimentId); TaskModel taskModel = TaskModel.newBuilder().setTaskType(TaskTypes.JOB_SUBMISSION).build(); @@ -104,7 +104,7 @@ public class JobRepositoryTest extends TestBase { jobModel = jobModel.toBuilder().setTaskId(taskId).build(); jobModel = jobModel.toBuilder().setJobDescription("jobDescription").build(); - JobStatus jobStatus = new JobStatus(JobState.SUBMITTED); + JobStatus jobStatus = JobStatus.newBuilder().setJobState(JobState.SUBMITTED).build(); jobModel = jobModel.toBuilder().addJobStatuses(jobStatus).build(); String jobId = jobRepository.addJob(jobModel, processId); @@ -120,7 +120,7 @@ public class JobRepositoryTest extends TestBase { final JobModel retrievedJob = jobRepository.getJob(jobPK); assertEquals("jobName", retrievedJob.getJobName()); assertEquals(1, retrievedJob.getJobStatusesCount()); - assertEquals(JobState.SUBMITTED, retrievedJob.getJobStatuses().get(0).getJobState()); + assertEquals(JobState.SUBMITTED, retrievedJob.getJobStatusesList().get(0).getJobState()); List<String> jobIdList = jobRepository.getJobIds(DBConstants.Job.TASK_ID, taskId); assertTrue(jobIdList.size() == 1); diff --git a/airavata-api/src/test/java/org/apache/airavata/execution/repository/JobStatusRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/execution/repository/JobStatusRepositoryTest.java index 6c3346753d..ccd03a50e9 100644 --- a/airavata-api/src/test/java/org/apache/airavata/execution/repository/JobStatusRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/execution/repository/JobStatusRepositoryTest.java @@ -81,11 +81,11 @@ public class JobStatusRepositoryTest extends TestBase { experimentModel = experimentModel.toBuilder().setExperimentType(ExperimentType.SINGLE_APPLICATION).build(); experimentModel = experimentModel.toBuilder().setUserName("user").build(); experimentModel = experimentModel.toBuilder().setExperimentName("name").build(); - experimentModel = experimentModel.toBuilder().setUserConfigurationData(new UserConfigurationDataModel()).build(); + experimentModel = experimentModel.toBuilder().setUserConfigurationData(UserConfigurationDataModel.getDefaultInstance()).build(); String experimentId = experimentRepository.addExperiment(experimentModel); - ProcessModel processModel = new ProcessModel(null, experimentId); + ProcessModel processModel = ProcessModel.newBuilder().setExperimentId(experimentId).build(); String processId = processRepository.addProcess(processModel, experimentId); TaskModel taskModel = TaskModel.newBuilder().setTaskType(TaskTypes.JOB_SUBMISSION).build(); @@ -110,7 +110,7 @@ public class JobStatusRepositoryTest extends TestBase { String jobId = jobRepository.addJob(jobModel, processId); assertTrue(jobId != null); - JobStatus jobStatus = new JobStatus(JobState.QUEUED); + JobStatus jobStatus = JobStatus.newBuilder().setJobState(JobState.QUEUED).build(); String jobStatusId = jobStatusRepository.addJobStatus(jobStatus, jobPK); assertTrue(jobStatusId != null); assertTrue(jobRepository.getJob(jobPK).getJobStatusesList().size() == 1); diff --git a/airavata-api/src/test/java/org/apache/airavata/execution/repository/ProcessErrorRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/execution/repository/ProcessErrorRepositoryTest.java index dc26fd6f4f..fab5f70bcf 100644 --- a/airavata-api/src/test/java/org/apache/airavata/execution/repository/ProcessErrorRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/execution/repository/ProcessErrorRepositoryTest.java @@ -73,11 +73,11 @@ public class ProcessErrorRepositoryTest extends TestBase { experimentModel = experimentModel.toBuilder().setExperimentType(ExperimentType.SINGLE_APPLICATION).build(); experimentModel = experimentModel.toBuilder().setUserName("user").build(); experimentModel = experimentModel.toBuilder().setExperimentName("name").build(); - experimentModel = experimentModel.toBuilder().setUserConfigurationData(new UserConfigurationDataModel()).build(); + experimentModel = experimentModel.toBuilder().setUserConfigurationData(UserConfigurationDataModel.getDefaultInstance()).build(); String experimentId = experimentRepository.addExperiment(experimentModel); - ProcessModel processModel = new ProcessModel(null, experimentId); + ProcessModel processModel = ProcessModel.newBuilder().setExperimentId(experimentId).build(); String processId = processRepository.addProcess(processModel, experimentId); assertTrue(processId != null); @@ -85,7 +85,7 @@ public class ProcessErrorRepositoryTest extends TestBase { String processErrorId = processErrorRepository.addProcessError(errorModel, processId); assertTrue(processErrorId != null); - assertTrue(processRepository.getProcess(processId).getProcessErrors().size() == 1); + assertTrue(processRepository.getProcess(processId).getProcessErrorsList().size() == 1); errorModel = errorModel.toBuilder().setActualErrorMessage("message").build(); processErrorRepository.updateProcessError(errorModel, processId); diff --git a/airavata-api/src/test/java/org/apache/airavata/execution/repository/ProcessInputRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/execution/repository/ProcessInputRepositoryTest.java index 6f254d27f8..95fe85921a 100644 --- a/airavata-api/src/test/java/org/apache/airavata/execution/repository/ProcessInputRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/execution/repository/ProcessInputRepositoryTest.java @@ -75,11 +75,11 @@ public class ProcessInputRepositoryTest extends TestBase { experimentModel = experimentModel.toBuilder().setExperimentType(ExperimentType.SINGLE_APPLICATION).build(); experimentModel = experimentModel.toBuilder().setUserName("user").build(); experimentModel = experimentModel.toBuilder().setExperimentName("name").build(); - experimentModel = experimentModel.toBuilder().setUserConfigurationData(new UserConfigurationDataModel()).build(); + experimentModel = experimentModel.toBuilder().setUserConfigurationData(UserConfigurationDataModel.getDefaultInstance()).build(); String experimentId = experimentRepository.addExperiment(experimentModel); - ProcessModel processModel = new ProcessModel(null, experimentId); + ProcessModel processModel = ProcessModel.newBuilder().setExperimentId(experimentId).build(); String processId = processRepository.addProcess(processModel, experimentId); assertTrue(processId != null); diff --git a/airavata-api/src/test/java/org/apache/airavata/execution/repository/ProcessOutputRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/execution/repository/ProcessOutputRepositoryTest.java index eb929603e5..fca1417f79 100644 --- a/airavata-api/src/test/java/org/apache/airavata/execution/repository/ProcessOutputRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/execution/repository/ProcessOutputRepositoryTest.java @@ -75,11 +75,11 @@ public class ProcessOutputRepositoryTest extends TestBase { experimentModel = experimentModel.toBuilder().setExperimentType(ExperimentType.SINGLE_APPLICATION).build(); experimentModel = experimentModel.toBuilder().setUserName("user").build(); experimentModel = experimentModel.toBuilder().setExperimentName("name").build(); - experimentModel = experimentModel.toBuilder().setUserConfigurationData(new UserConfigurationDataModel()).build(); + experimentModel = experimentModel.toBuilder().setUserConfigurationData(UserConfigurationDataModel.getDefaultInstance()).build(); String experimentId = experimentRepository.addExperiment(experimentModel); - ProcessModel processModel = new ProcessModel(null, experimentId); + ProcessModel processModel = ProcessModel.newBuilder().setExperimentId(experimentId).build(); String processId = processRepository.addProcess(processModel, experimentId); assertTrue(processId != null); diff --git a/airavata-api/src/test/java/org/apache/airavata/execution/repository/ProcessRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/execution/repository/ProcessRepositoryTest.java index 4ab59d3d3e..7d2c026e3e 100644 --- a/airavata-api/src/test/java/org/apache/airavata/execution/repository/ProcessRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/execution/repository/ProcessRepositoryTest.java @@ -75,19 +75,18 @@ public class ProcessRepositoryTest extends TestBase { experimentModel = experimentModel.toBuilder().setExperimentType(ExperimentType.SINGLE_APPLICATION).build(); experimentModel = experimentModel.toBuilder().setUserName("user").build(); experimentModel = experimentModel.toBuilder().setExperimentName("name").build(); - experimentModel = experimentModel.toBuilder().setUserConfigurationData(new UserConfigurationDataModel()).build(); + experimentModel = experimentModel.toBuilder().setUserConfigurationData(UserConfigurationDataModel.getDefaultInstance()).build(); String experimentId = experimentRepository.addExperiment(experimentModel); - ProcessModel processModel = new ProcessModel(null, experimentId); + ProcessModel processModel = ProcessModel.newBuilder().setExperimentId(experimentId).build(); TaskModel task = TaskModel.newBuilder().setTaskId("task-id").build(); task = task.toBuilder().setTaskType(TaskTypes.ENV_SETUP).build(); task = task.toBuilder().setLastUpdateTime(System.currentTimeMillis()).build(); processModel = processModel.toBuilder().addTasks(task).build(); - TaskStatus taskStatus = new TaskStatus(TaskState.TASK_STATE_CREATED); - taskStatus.setStatusId("task-status-id"); + TaskStatus taskStatus = TaskStatus.newBuilder().setState(TaskState.TASK_STATE_CREATED).setStatusId("task-status-id").build(); task = task.toBuilder().addTaskStatuses(taskStatus).build(); String processId = processRepository.addProcess(processModel, experimentId); @@ -96,7 +95,7 @@ public class ProcessRepositoryTest extends TestBase { experimentRepository.getExperiment(experimentId).getProcessesList().size() == 1); processModel = processModel.toBuilder().setProcessDetail("detail").build(); - processModel = processModel.toBuilder().setUseUserCRPref(true).build(); + processModel = processModel.toBuilder().setUseUserCrPref(true).build(); processModel = processModel.toBuilder().addEmailAddresses("[email protected]").build(); processModel = processModel.toBuilder().addEmailAddresses("[email protected]").build(); @@ -106,8 +105,7 @@ public class ProcessRepositoryTest extends TestBase { JobModel job = JobModel.newBuilder().setProcessId(processId).build(); job = job.toBuilder().setJobId("job-id").build(); job = job.toBuilder().setJobDescription("job-description").build(); - JobStatus jobStatus = new JobStatus(JobState.SUBMITTED); - jobStatus.setStatusId("submitted-job-status-id"); + JobStatus jobStatus = JobStatus.newBuilder().setJobState(JobState.SUBMITTED).setStatusId("submitted-job-status-id").build(); job = job.toBuilder().addJobStatuses(jobStatus).build(); jobSubmissionTask = jobSubmissionTask.toBuilder().addJobs(job).build(); processModel = processModel.toBuilder().addTasks(jobSubmissionTask).build(); @@ -116,19 +114,19 @@ public class ProcessRepositoryTest extends TestBase { ProcessModel retrievedProcess = processRepository.getProcess(processId); assertEquals(experimentId, retrievedProcess.getExperimentId()); assertEquals("detail", retrievedProcess.getProcessDetail()); - assertTrue(retrievedProcess.isUseUserCRPref()); + assertTrue(retrievedProcess.getUseUserCrPref()); assertEquals(1, retrievedProcess.getProcessStatusesCount(), "Added process should automatically have 1 status"); assertEquals( ProcessState.PROCESS_STATE_CREATED, - retrievedProcess.getProcessStatuses().get(0).getState(), + retrievedProcess.getProcessStatusesList().get(0).getState(), "Added process should automatically have 1 status that is CREATED"); assertEquals(2, retrievedProcess.getTasksCount()); assertEquals(2, retrievedProcess.getEmailAddressesCount()); - assertEquals("[email protected]", retrievedProcess.getEmailAddresses().get(0)); - assertEquals("[email protected]", retrievedProcess.getEmailAddresses().get(1)); + assertEquals("[email protected]", retrievedProcess.getEmailAddressesList().get(0)); + assertEquals("[email protected]", retrievedProcess.getEmailAddressesList().get(1)); ComputationalResourceSchedulingModel computationalResourceSchedulingModel = - new ComputationalResourceSchedulingModel(); + ComputationalResourceSchedulingModel.getDefaultInstance(); assertEquals( processId, processRepository.addProcessResourceSchedule(computationalResourceSchedulingModel, processId)); diff --git a/airavata-api/src/test/java/org/apache/airavata/execution/repository/ProcessStatusRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/execution/repository/ProcessStatusRepositoryTest.java index e3d0c7819d..48adb4fc61 100644 --- a/airavata-api/src/test/java/org/apache/airavata/execution/repository/ProcessStatusRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/execution/repository/ProcessStatusRepositoryTest.java @@ -74,18 +74,18 @@ public class ProcessStatusRepositoryTest extends TestBase { experimentModel = experimentModel.toBuilder().setExperimentType(ExperimentType.SINGLE_APPLICATION).build(); experimentModel = experimentModel.toBuilder().setUserName("user").build(); experimentModel = experimentModel.toBuilder().setExperimentName("name").build(); - experimentModel = experimentModel.toBuilder().setUserConfigurationData(new UserConfigurationDataModel()).build(); + experimentModel = experimentModel.toBuilder().setUserConfigurationData(UserConfigurationDataModel.getDefaultInstance()).build(); String experimentId = experimentRepository.addExperiment(experimentModel); - ProcessModel processModel = new ProcessModel(null, experimentId); + ProcessModel processModel = ProcessModel.newBuilder().setExperimentId(experimentId).build(); String processId = processRepository.addProcess(processModel, experimentId); assertTrue(processId != null); // addProcess automatically adds the CREATED ProcessStatus assertTrue(processRepository.getProcess(processId).getProcessStatusesList().size() == 1); ProcessStatus processStatus = - processRepository.getProcess(processId).getProcessStatuses().get(0); + processRepository.getProcess(processId).getProcessStatusesList().get(0); assertEquals(ProcessState.PROCESS_STATE_CREATED, processStatus.getState()); processStatus = processStatus.toBuilder().setState(ProcessState.PROCESS_STATE_EXECUTING).build(); @@ -94,7 +94,7 @@ public class ProcessStatusRepositoryTest extends TestBase { ProcessStatus retrievedStatus = processStatusRepository.getProcessStatus(processId); assertEquals(ProcessState.PROCESS_STATE_EXECUTING, retrievedStatus.getState()); - ProcessStatus updatedStatus = new ProcessStatus(ProcessState.PROCESS_STATE_MONITORING); + ProcessStatus updatedStatus = ProcessStatus.newBuilder().setState(ProcessState.PROCESS_STATE_MONITORING).build(); // Verify that ProcessStatus without id can be added with updateProcessStatus String updatedStatusId = processStatusRepository.updateProcessStatus(updatedStatus, processId); retrievedStatus = processStatusRepository.getProcessStatus(processId); @@ -104,7 +104,7 @@ public class ProcessStatusRepositoryTest extends TestBase { // Verify that updating status with same ProcessState as most recent ProcessStatus will update the most recent // ProcessStatus - ProcessStatus updatedStatusWithReason = new ProcessStatus(ProcessState.PROCESS_STATE_MONITORING); + ProcessStatus updatedStatusWithReason = ProcessStatus.newBuilder().setState(ProcessState.PROCESS_STATE_MONITORING).build(); updatedStatusWithReason = updatedStatusWithReason.toBuilder().setReason("test-reason").build(); String updateStatusWithReasonId = processStatusRepository.updateProcessStatus(updatedStatusWithReason, processId); diff --git a/airavata-api/src/test/java/org/apache/airavata/execution/repository/ProjectRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/execution/repository/ProjectRepositoryTest.java index 62f2017a04..7aa115155f 100644 --- a/airavata-api/src/test/java/org/apache/airavata/execution/repository/ProjectRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/execution/repository/ProjectRepositoryTest.java @@ -62,10 +62,10 @@ public class ProjectRepositoryTest extends TestBase { String projectId = projectRepository.addProject(project, gatewayId); assertTrue(projectId != null); - Project updatedProject = project.deepCopy(); + Project updatedProject = project.toBuilder().build(); // Simulate clients that may or may not set projectId but will pass // projectId as an argument to updateProject - updatedProject.unsetProjectID(); + updatedProject = updatedProject.toBuilder().clearProjectId().build(); updatedProject = updatedProject.toBuilder().setName("updated projectName").build(); updatedProject = updatedProject.toBuilder().setDescription("projectDescription").build(); projectRepository.updateProject(updatedProject, projectId); diff --git a/airavata-api/src/test/java/org/apache/airavata/execution/repository/TaskErrorRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/execution/repository/TaskErrorRepositoryTest.java index d46fdd7cb1..b534ba7c54 100644 --- a/airavata-api/src/test/java/org/apache/airavata/execution/repository/TaskErrorRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/execution/repository/TaskErrorRepositoryTest.java @@ -77,11 +77,11 @@ public class TaskErrorRepositoryTest extends TestBase { experimentModel = experimentModel.toBuilder().setExperimentType(ExperimentType.SINGLE_APPLICATION).build(); experimentModel = experimentModel.toBuilder().setUserName("user").build(); experimentModel = experimentModel.toBuilder().setExperimentName("name").build(); - experimentModel = experimentModel.toBuilder().setUserConfigurationData(new UserConfigurationDataModel()).build(); + experimentModel = experimentModel.toBuilder().setUserConfigurationData(UserConfigurationDataModel.getDefaultInstance()).build(); String experimentId = experimentRepository.addExperiment(experimentModel); - ProcessModel processModel = new ProcessModel(null, experimentId); + ProcessModel processModel = ProcessModel.newBuilder().setExperimentId(experimentId).build(); String processId = processRepository.addProcess(processModel, experimentId); TaskModel taskModel = TaskModel.newBuilder().setTaskType(TaskTypes.JOB_SUBMISSION).build(); @@ -95,7 +95,7 @@ public class TaskErrorRepositoryTest extends TestBase { String taskErrorId = taskErrorRepository.addTaskError(errorModel, taskId); assertTrue(taskErrorId != null); - assertTrue(taskRepository.getTask(taskId).getTaskErrors().size() == 1); + assertTrue(taskRepository.getTask(taskId).getTaskErrorsList().size() == 1); errorModel = errorModel.toBuilder().setActualErrorMessage("message").build(); taskErrorRepository.updateTaskError(errorModel, taskId); diff --git a/airavata-api/src/test/java/org/apache/airavata/execution/repository/TaskRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/execution/repository/TaskRepositoryTest.java index 94ab5b42c3..23bc892feb 100644 --- a/airavata-api/src/test/java/org/apache/airavata/execution/repository/TaskRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/execution/repository/TaskRepositoryTest.java @@ -78,19 +78,19 @@ public class TaskRepositoryTest extends TestBase { experimentModel = experimentModel.toBuilder().setExperimentType(ExperimentType.SINGLE_APPLICATION).build(); experimentModel = experimentModel.toBuilder().setUserName("user").build(); experimentModel = experimentModel.toBuilder().setExperimentName("name").build(); - experimentModel = experimentModel.toBuilder().setUserConfigurationData(new UserConfigurationDataModel()).build(); + experimentModel = experimentModel.toBuilder().setUserConfigurationData(UserConfigurationDataModel.getDefaultInstance()).build(); String experimentId = experimentRepository.addExperiment(experimentModel); - ProcessModel processModel = new ProcessModel(null, experimentId); + ProcessModel processModel = ProcessModel.newBuilder().setExperimentId(experimentId).build(); String processId = processRepository.addProcess(processModel, experimentId); TaskModel taskModel = TaskModel.newBuilder().setTaskType(TaskTypes.JOB_SUBMISSION).build(); taskModel = taskModel.toBuilder().setLastUpdateTime(System.currentTimeMillis()).build(); taskModel = taskModel.toBuilder().setParentProcessId(processId).build(); - taskModel = taskModel.toBuilder().setSubTaskModel("subtask model".getBytes(StandardCharsets.UTF_8)).build(); + taskModel = taskModel.toBuilder().setSubTaskModel(com.google.protobuf.ByteString.copyFrom("subtask model".getBytes(StandardCharsets.UTF_8))).build(); - TaskStatus taskStatus = new TaskStatus(TaskState.TASK_STATE_CREATED); + TaskStatus taskStatus = TaskStatus.newBuilder().setState(TaskState.TASK_STATE_CREATED).build(); taskStatus = taskStatus.toBuilder().setTimeOfStateChange(AiravataUtils.getCurrentTimestamp().getTime()).build(); taskModel = taskModel.toBuilder().addTaskStatuses(taskStatus).build(); @@ -103,9 +103,9 @@ public class TaskRepositoryTest extends TestBase { taskRepository.updateTask(taskModel, taskId); TaskModel retrievedTask = taskRepository.getTask(taskId); assertEquals(TaskTypes.MONITORING, retrievedTask.getTaskType()); - assertArrayEquals("subtask model".getBytes(StandardCharsets.UTF_8), retrievedTask.getSubTaskModel()); + assertEquals(com.google.protobuf.ByteString.copyFrom("subtask model".getBytes(StandardCharsets.UTF_8)), retrievedTask.getSubTaskModel()); assertEquals(1, retrievedTask.getTaskStatusesCount()); - assertEquals(TaskState.TASK_STATE_CREATED, retrievedTask.getTaskStatuses().get(0).getState()); + assertEquals(TaskState.TASK_STATE_CREATED, retrievedTask.getTaskStatusesList().get(0).getState()); List<String> taskIdList = taskRepository.getTaskIds(DBConstants.Task.PARENT_PROCESS_ID, processId); assertTrue(taskIdList.size() == 1); diff --git a/airavata-api/src/test/java/org/apache/airavata/execution/repository/TaskStatusRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/execution/repository/TaskStatusRepositoryTest.java index eeea550dc6..77a1de0a19 100644 --- a/airavata-api/src/test/java/org/apache/airavata/execution/repository/TaskStatusRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/execution/repository/TaskStatusRepositoryTest.java @@ -77,11 +77,11 @@ public class TaskStatusRepositoryTest extends TestBase { experimentModel = experimentModel.toBuilder().setExperimentType(ExperimentType.SINGLE_APPLICATION).build(); experimentModel = experimentModel.toBuilder().setUserName("user").build(); experimentModel = experimentModel.toBuilder().setExperimentName("name").build(); - experimentModel = experimentModel.toBuilder().setUserConfigurationData(new UserConfigurationDataModel()).build(); + experimentModel = experimentModel.toBuilder().setUserConfigurationData(UserConfigurationDataModel.getDefaultInstance()).build(); String experimentId = experimentRepository.addExperiment(experimentModel); - ProcessModel processModel = new ProcessModel(null, experimentId); + ProcessModel processModel = ProcessModel.newBuilder().setExperimentId(experimentId).build(); String processId = processRepository.addProcess(processModel, experimentId); TaskModel taskModel = TaskModel.newBuilder().setTaskType(TaskTypes.JOB_SUBMISSION).build(); @@ -91,7 +91,7 @@ public class TaskStatusRepositoryTest extends TestBase { String taskId = taskRepository.addTask(taskModel, processId); assertTrue(taskId != null); - TaskStatus taskStatus = new TaskStatus(TaskState.TASK_STATE_EXECUTING); + TaskStatus taskStatus = TaskStatus.newBuilder().setState(TaskState.TASK_STATE_EXECUTING).build(); String taskStatusId = taskStatusRepository.addTaskStatus(taskStatus, taskId); assertTrue(taskStatusId != null); assertTrue(taskRepository.getTask(taskId).getTaskStatusesList().size() == 1); diff --git a/airavata-api/src/test/java/org/apache/airavata/execution/repository/WorkflowRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/execution/repository/WorkflowRepositoryTest.java index 7590aa7175..df46ac5a03 100644 --- a/airavata-api/src/test/java/org/apache/airavata/execution/repository/WorkflowRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/execution/repository/WorkflowRepositoryTest.java @@ -75,12 +75,12 @@ public class WorkflowRepositoryTest extends TestBase { // Assert workflow assertEquals(SAMPLE_DESCRIPTION, workflow.getDescription()); - assertEquals(2, workflow.getApplicationsSize()); - assertEquals(2, workflow.getHandlersSize()); - assertEquals(3, workflow.getConnectionsSize()); + assertEquals(2, workflow.getApplicationsCount()); + assertEquals(2, workflow.getHandlersCount()); + assertEquals(3, workflow.getConnectionsCount()); // Assert applications - for (WorkflowApplication app : workflow.getApplications()) { + for (WorkflowApplication app : workflow.getApplicationsList()) { assertEquals(SAMPLE_APPLICATION_INTERFACE_ID, app.getApplicationInterfaceId()); assertEquals(SAMPLE_COMPUTE_RESOURCE_ID, app.getComputeResourceId()); assertEquals(SAMPLE_QUEUE_NAME, app.getQueueName()); @@ -93,75 +93,75 @@ public class WorkflowRepositoryTest extends TestBase { private AiravataWorkflow getSimpleWorkflow() { - AiravataWorkflow workflow = new AiravataWorkflow(); - - // Adding basic workflow parameters - workflow.setDescription(SAMPLE_DESCRIPTION); - - // Adding workflow applications - WorkflowApplication application1 = new WorkflowApplication(); - application1.setId(APPLICATION_PREFIX + 1); - application1.setApplicationInterfaceId(SAMPLE_APPLICATION_INTERFACE_ID); - application1.setComputeResourceId(SAMPLE_COMPUTE_RESOURCE_ID); - application1.setQueueName(SAMPLE_QUEUE_NAME); - application1.setNodeCount(SAMPLE_NODE_COUNT); - application1.setCoreCount(SAMPLE_CORE_COUNT); - application1.setWallTimeLimit(SAMPLE_WALL_TIME_LIMIT); - application1.setPhysicalMemory(SAMPLE_PHYSICAL_MEMORY); - - WorkflowApplication application2 = new WorkflowApplication(); - application2.setId(APPLICATION_PREFIX + 2); - application2.setApplicationInterfaceId(SAMPLE_APPLICATION_INTERFACE_ID); - application2.setComputeResourceId(SAMPLE_COMPUTE_RESOURCE_ID); - application2.setQueueName(SAMPLE_QUEUE_NAME); - application2.setNodeCount(SAMPLE_NODE_COUNT); - application2.setCoreCount(SAMPLE_CORE_COUNT); - application2.setWallTimeLimit(SAMPLE_WALL_TIME_LIMIT); - application2.setPhysicalMemory(SAMPLE_PHYSICAL_MEMORY); - - workflow.addToApplications(application1); - workflow.addToApplications(application2); - - // Adding workflow handlers - WorkflowHandler handler1 = new WorkflowHandler(); - handler1.setId(HANDLER_PREFIX + 1); - handler1.setType(HandlerType.FLOW_STARTER); - - WorkflowHandler handler2 = new WorkflowHandler(); - handler2.setId(HANDLER_PREFIX + 2); - handler2.setType(HandlerType.FLOW_TERMINATOR); - - workflow.addToHandlers(handler1); - workflow.addToHandlers(handler2); - - // Adding workflow connections - WorkflowConnection connection1 = new WorkflowConnection(); - connection1.setFromType(ComponentType.HANDLER); - connection1.setFromId(HANDLER_PREFIX + 1); - connection1.setFromOutputName(SAMPLE_HANDLER_OUTPUT_NAME); - connection1.setToType(ComponentType.APPLICATION); - connection1.setToId(APPLICATION_PREFIX + 1); - connection1.setToInputName(SAMPLE_APP_INPUT_NAME); - - WorkflowConnection connection2 = new WorkflowConnection(); - connection2.setFromType(ComponentType.APPLICATION); - connection2.setFromId(APPLICATION_PREFIX + 1); - connection2.setFromOutputName(SAMPLE_APP_OUTPUT_NAME); - connection2.setToType(ComponentType.APPLICATION); - connection2.setToId(APPLICATION_PREFIX + 2); - connection2.setToInputName(SAMPLE_APP_INPUT_NAME); - - WorkflowConnection connection3 = new WorkflowConnection(); - connection3.setFromType(ComponentType.APPLICATION); - connection3.setFromId(APPLICATION_PREFIX + 2); - connection3.setFromOutputName(SAMPLE_APP_OUTPUT_NAME); - connection3.setToType(ComponentType.HANDLER); - connection3.setToId(HANDLER_PREFIX + 2); - connection3.setToInputName(SAMPLE_HANDLER_INPUT_NAME); - - workflow.addToConnections(connection1); - workflow.addToConnections(connection2); - workflow.addToConnections(connection3); + WorkflowApplication application1 = WorkflowApplication.newBuilder() + .setId(APPLICATION_PREFIX + 1) + .setApplicationInterfaceId(SAMPLE_APPLICATION_INTERFACE_ID) + .setComputeResourceId(SAMPLE_COMPUTE_RESOURCE_ID) + .setQueueName(SAMPLE_QUEUE_NAME) + .setNodeCount(SAMPLE_NODE_COUNT) + .setCoreCount(SAMPLE_CORE_COUNT) + .setWallTimeLimit(SAMPLE_WALL_TIME_LIMIT) + .setPhysicalMemory(SAMPLE_PHYSICAL_MEMORY) + .build(); + + WorkflowApplication application2 = WorkflowApplication.newBuilder() + .setId(APPLICATION_PREFIX + 2) + .setApplicationInterfaceId(SAMPLE_APPLICATION_INTERFACE_ID) + .setComputeResourceId(SAMPLE_COMPUTE_RESOURCE_ID) + .setQueueName(SAMPLE_QUEUE_NAME) + .setNodeCount(SAMPLE_NODE_COUNT) + .setCoreCount(SAMPLE_CORE_COUNT) + .setWallTimeLimit(SAMPLE_WALL_TIME_LIMIT) + .setPhysicalMemory(SAMPLE_PHYSICAL_MEMORY) + .build(); + + WorkflowHandler handler1 = WorkflowHandler.newBuilder() + .setId(HANDLER_PREFIX + 1) + .setType(HandlerType.FLOW_STARTER) + .build(); + + WorkflowHandler handler2 = WorkflowHandler.newBuilder() + .setId(HANDLER_PREFIX + 2) + .setType(HandlerType.FLOW_TERMINATOR) + .build(); + + WorkflowConnection connection1 = WorkflowConnection.newBuilder() + .setFromType(ComponentType.HANDLER) + .setFromId(HANDLER_PREFIX + 1) + .setFromOutputName(SAMPLE_HANDLER_OUTPUT_NAME) + .setToType(ComponentType.APPLICATION) + .setToId(APPLICATION_PREFIX + 1) + .setToInputName(SAMPLE_APP_INPUT_NAME) + .build(); + + WorkflowConnection connection2 = WorkflowConnection.newBuilder() + .setFromType(ComponentType.APPLICATION) + .setFromId(APPLICATION_PREFIX + 1) + .setFromOutputName(SAMPLE_APP_OUTPUT_NAME) + .setToType(ComponentType.APPLICATION) + .setToId(APPLICATION_PREFIX + 2) + .setToInputName(SAMPLE_APP_INPUT_NAME) + .build(); + + WorkflowConnection connection3 = WorkflowConnection.newBuilder() + .setFromType(ComponentType.APPLICATION) + .setFromId(APPLICATION_PREFIX + 2) + .setFromOutputName(SAMPLE_APP_OUTPUT_NAME) + .setToType(ComponentType.HANDLER) + .setToId(HANDLER_PREFIX + 2) + .setToInputName(SAMPLE_HANDLER_INPUT_NAME) + .build(); + + AiravataWorkflow workflow = AiravataWorkflow.newBuilder() + .setDescription(SAMPLE_DESCRIPTION) + .addApplications(application1) + .addApplications(application2) + .addHandlers(handler1) + .addHandlers(handler2) + .addConnections(connection1) + .addConnections(connection2) + .addConnections(connection3) + .build(); return workflow; } diff --git a/airavata-api/src/test/java/org/apache/airavata/execution/service/ExperimentServiceTest.java b/airavata-api/src/test/java/org/apache/airavata/execution/service/ExperimentServiceTest.java index 34b6a96a38..fbf8ec8ee6 100644 --- a/airavata-api/src/test/java/org/apache/airavata/execution/service/ExperimentServiceTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/execution/service/ExperimentServiceTest.java @@ -147,7 +147,7 @@ class ExperimentServiceTest { @Test void getExperimentOutputs_delegatesToRegistry() throws Exception { - List<OutputDataObjectType> outputs = List.of(new OutputDataObjectType()); + List<OutputDataObjectType> outputs = List.of(OutputDataObjectType.getDefaultInstance()); when(registryHandler.getExperimentOutputs("exp-123")).thenReturn(outputs); List<OutputDataObjectType> result = experimentService.getExperimentOutputs(ctx, "exp-123"); assertEquals(1, result.size()); @@ -167,8 +167,10 @@ class ExperimentServiceTest { void updateExperiment_ownerCanUpdate() throws Exception { ExperimentModel existing = ExperimentModel.newBuilder().setUserName("testUser").build(); existing = existing.toBuilder().setGatewayId("testGateway").build(); - ExperimentModel updated = ExperimentModel.newBuilder().setExperimentName("new-name").build(); - updated = updated.toBuilder().setProjectId("proj-1").build(); + ExperimentModel updated = ExperimentModel.newBuilder() + .setExperimentName("new-name") + .setProjectId("proj-1") + .build(); when(registryHandler.getExperiment("exp-123")).thenReturn(existing); doNothing().when(registryHandler).updateExperiment("exp-123", updated); @@ -180,7 +182,7 @@ class ExperimentServiceTest { @Test void getJobStatuses_delegatesToRegistry() throws Exception { - Map<String, JobStatus> statuses = Map.of("job-1", new JobStatus()); + Map<String, JobStatus> statuses = Map.of("job-1", JobStatus.getDefaultInstance()); when(registryHandler.getJobStatuses("exp-123")).thenReturn(statuses); Map<String, JobStatus> result = experimentService.getJobStatuses(ctx, "exp-123"); assertEquals(1, result.size()); @@ -213,12 +215,11 @@ class ExperimentServiceTest { ExperimentModel experiment = ExperimentModel.newBuilder().setUserName("testUser").build(); experiment = experiment.toBuilder().setGatewayId("testGateway").build(); - experiment = experiment.toBuilder().setProcesses(new java.util.ArrayList<>()).build(); when(registryHandler.getExperiment("exp-123")).thenReturn(experiment); // No active jobs - JobModel job = new JobModel(); - JobStatus jobStatus = new JobStatus(JobState.COMPLETE); + JobModel job = JobModel.getDefaultInstance(); + JobStatus jobStatus = JobStatus.newBuilder().setJobState(JobState.COMPLETE).build(); job = job.toBuilder().addJobStatuses(jobStatus).build(); when(registryHandler.getJobDetails("exp-123")).thenReturn(List.of(job)); @@ -234,11 +235,10 @@ class ExperimentServiceTest { ExperimentModel experiment = ExperimentModel.newBuilder().setUserName("testUser").build(); experiment = experiment.toBuilder().setGatewayId("testGateway").build(); - experiment.setProcesses(new java.util.ArrayList<>()); // no in-progress output fetch processes when(registryHandler.getExperiment("exp-123")).thenReturn(experiment); - JobModel job = new JobModel(); - JobStatus jobStatus = new JobStatus(JobState.ACTIVE); + JobModel job = JobModel.getDefaultInstance(); + JobStatus jobStatus = JobStatus.newBuilder().setJobState(JobState.ACTIVE).build(); job = job.toBuilder().addJobStatuses(jobStatus).build(); when(registryHandler.getJobDetails("exp-123")).thenReturn(List.of(job)); @@ -273,7 +273,7 @@ class ExperimentServiceTest { process = process.toBuilder().addTasks(task).build(); OutputDataObjectType out = OutputDataObjectType.newBuilder().setName("output1").build(); process = process.toBuilder().addProcessOutputs(out).build(); - ProcessStatus ps = new ProcessStatus(ProcessState.PROCESS_STATE_EXECUTING); + ProcessStatus ps = ProcessStatus.newBuilder().setState(ProcessState.PROCESS_STATE_EXECUTING).build(); process = process.toBuilder().addProcessStatuses(ps).build(); experiment = experiment.toBuilder().addProcesses(process).build(); diff --git a/airavata-api/src/test/java/org/apache/airavata/execution/service/ProjectServiceTest.java b/airavata-api/src/test/java/org/apache/airavata/execution/service/ProjectServiceTest.java index ed8bdafbb7..fcfc45d02f 100644 --- a/airavata-api/src/test/java/org/apache/airavata/execution/service/ProjectServiceTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/execution/service/ProjectServiceTest.java @@ -120,7 +120,7 @@ class ProjectServiceTest { @Test void getUserProjects_delegatesToRegistry() throws Exception { - List<Project> projects = List.of(new Project(), new Project()); + List<Project> projects = List.of(Project.getDefaultInstance(), Project.getDefaultInstance()); when(registryHandler.getUserProjects("testGateway", "testUser", 10, 0)).thenReturn(projects); List<Project> result = projectService.getUserProjects(ctx, "testGateway", "testUser", 10, 0); @@ -134,8 +134,10 @@ class ProjectServiceTest { Project existing = Project.newBuilder().setOwner("testUser").build(); existing = existing.toBuilder().setGatewayId("testGateway").build(); - Project updated = Project.newBuilder().setOwner("newOwner").build(); - updated = updated.toBuilder().setGatewayId("testGateway").build(); + Project updated = Project.newBuilder() + .setOwner("newOwner") + .setGatewayId("testGateway") + .build(); when(registryHandler.getProject("proj-123")).thenReturn(existing); diff --git a/airavata-api/src/test/java/org/apache/airavata/execution/util/replicacatalog/DataProductRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/execution/util/replicacatalog/DataProductRepositoryTest.java index de7eef9b96..e1cc7f1f1d 100644 --- a/airavata-api/src/test/java/org/apache/airavata/execution/util/replicacatalog/DataProductRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/execution/util/replicacatalog/DataProductRepositoryTest.java @@ -78,7 +78,7 @@ public class DataProductRepositoryTest extends TestBase { Map<String, String> dataProductMetadataEntityMap = new HashMap<>(); dataProductMetadataEntityMap.put( dataProductMetadataEntity.getMetadataKey(), dataProductMetadataEntity.getMetadataValue()); - testDataProductModel2 = testDataProductModel2.toBuilder().setProductMetadata(dataProductMetadataEntityMap).build(); + testDataProductModel2 = testDataProductModel2.toBuilder().putAllProductMetadata(dataProductMetadataEntityMap).build(); testDataProductModel2 = testDataProductModel2.toBuilder().setParentProductUri(productUri1).build(); assertTrue(dataProductRepository.updateDataProduct(testDataProductModel2)); @@ -123,9 +123,9 @@ public class DataProductRepositoryTest extends TestBase { DataProductModel retrievedDataProductModel1 = dataProductRepository.getDataProduct(productUri1); assertEquals(productUri1, retrievedDataProductModel1.getProductUri()); - assertEquals(1, retrievedDataProductModel1.getReplicaLocationsSize()); + assertEquals(1, retrievedDataProductModel1.getReplicaLocationsCount()); DataReplicaLocationModel retrievedReplicaLocationModel1 = - retrievedDataProductModel1.getReplicaLocations().get(0); + retrievedDataProductModel1.getReplicaLocationsList().get(0); assertEquals(productUri1, retrievedReplicaLocationModel1.getProductUri()); // validUntilTime may be populated by the system with a default value assertTrue(retrievedReplicaLocationModel1.getValidUntilTime() >= 0); diff --git a/airavata-api/src/test/java/org/apache/airavata/execution/util/replicacatalog/DataReplicaLocationRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/execution/util/replicacatalog/DataReplicaLocationRepositoryTest.java index 57ee79792d..554f37740c 100644 --- a/airavata-api/src/test/java/org/apache/airavata/execution/util/replicacatalog/DataReplicaLocationRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/execution/util/replicacatalog/DataReplicaLocationRepositoryTest.java @@ -80,7 +80,7 @@ public class DataReplicaLocationRepositoryTest extends TestBase { dataReplicaMetadataEntity1.getMetadataKey(), dataReplicaMetadataEntity1.getMetadataValue()); dataReplicaMetadataEntityMap.put( dataReplicaMetadataEntity2.getMetadataKey(), dataReplicaMetadataEntity2.getMetadataValue()); - testDataReplicaLocationModel1 = testDataReplicaLocationModel1.toBuilder().setReplicaMetadata(dataReplicaMetadataEntityMap).build(); + testDataReplicaLocationModel1 = testDataReplicaLocationModel1.toBuilder().putAllReplicaMetadata(dataReplicaMetadataEntityMap).build(); testDataReplicaLocationModel1 = testDataReplicaLocationModel1.toBuilder().setReplicaPersistentType(ReplicaPersistentType.TRANSIENT).build(); assertTrue(dataReplicaLocationRepository.updateReplicaLocation(testDataReplicaLocationModel1)); @@ -96,7 +96,7 @@ public class DataReplicaLocationRepositoryTest extends TestBase { // Replicas are already associated with the product via productUri. // Verify the association by reading the product's replicas. DataProductModel retrievedProduct = dataProductRepository.getDataProduct(productUri); - assertEquals(2, retrievedProduct.getReplicaLocationsSize()); + assertEquals(2, retrievedProduct.getReplicaLocationsCount()); List<DataReplicaLocationModel> dataReplicaLocationModelList = dataReplicaLocationRepository.getAllReplicaLocations(productUri); diff --git a/airavata-api/src/test/java/org/apache/airavata/integration/ExperimentRepositoryIntegrationTest.java b/airavata-api/src/test/java/org/apache/airavata/integration/ExperimentRepositoryIntegrationTest.java index 31847bb2f7..3f57c43c56 100644 --- a/airavata-api/src/test/java/org/apache/airavata/integration/ExperimentRepositoryIntegrationTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/integration/ExperimentRepositoryIntegrationTest.java @@ -94,7 +94,7 @@ public class ExperimentRepositoryIntegrationTest extends TestBase { experiment = experiment.toBuilder().setUserName("integration-user").build(); experiment = experiment.toBuilder().setExperimentName(name).build(); experiment = experiment.toBuilder().setGatewayInstanceId("gw-instance-1").build(); - experiment = experiment.toBuilder().setUserConfigurationData(new UserConfigurationDataModel()).build(); + experiment = experiment.toBuilder().setUserConfigurationData(UserConfigurationDataModel.getDefaultInstance()).build(); return experiment; } @@ -118,7 +118,7 @@ public class ExperimentRepositoryIntegrationTest extends TestBase { assertEquals(1, retrieved.getExperimentStatusCount(), "initial status should be set"); assertEquals( ExperimentState.EXPERIMENT_STATE_CREATED, - retrieved.getExperimentStatus().get(0).getState(), + retrieved.getExperimentStatusList().get(0).getState(), "initial state should be CREATED"); // Cleanup @@ -146,8 +146,8 @@ public class ExperimentRepositoryIntegrationTest extends TestBase { ExperimentModel updated = experimentRepository.getExperiment(experimentId); assertEquals("updated description", updated.getDescription()); assertEquals(2, updated.getEmailAddressesCount()); - assertEquals("[email protected]", updated.getEmailAddresses().get(0)); - assertEquals("[email protected]", updated.getEmailAddresses().get(1)); + assertEquals("[email protected]", updated.getEmailAddressesList().get(0)); + assertEquals("[email protected]", updated.getEmailAddressesList().get(1)); experimentRepository.removeExperiment(experimentId); } diff --git a/airavata-api/src/test/java/org/apache/airavata/security/profile/iam/admin/services/core/tests/SetupNewGateway.java b/airavata-api/src/test/java/org/apache/airavata/security/profile/iam/admin/services/core/tests/SetupNewGateway.java index addad06260..3a5ec7f523 100644 --- a/airavata-api/src/test/java/org/apache/airavata/security/profile/iam/admin/services/core/tests/SetupNewGateway.java +++ b/airavata-api/src/test/java/org/apache/airavata/security/profile/iam/admin/services/core/tests/SetupNewGateway.java @@ -73,7 +73,7 @@ public class SetupNewGateway { List<String> emails = new ArrayList<>(); emails.add("[email protected]"); user = user.toBuilder().setGatewayId("maven.test.gateway").build(); - user = user.toBuilder().setEmails(emails).build(); + user = user.toBuilder().addAllEmails(emails).build(); PasswordCredential tenantAdminCreds = PasswordCredential.newBuilder().setGatewayId(user.getGatewayId()).build(); tenantAdminCreds = tenantAdminCreds.toBuilder().setDescription("test credentials for tenant admin creation").build(); tenantAdminCreds = tenantAdminCreds.toBuilder().setLoginUserName("mavenTest").build(); @@ -88,7 +88,7 @@ public class SetupNewGateway { accessToken, user.getGatewayId(), user.getUserId(), - user.getEmails().get(0), + user.getEmailsList().get(0), user.getFirstName(), user.getLastName(), "test@123"); @@ -99,12 +99,12 @@ public class SetupNewGateway { } // public static void resetPassword(){ - // UserProfile user = new UserProfile(); + // UserProfile user = UserProfile.getDefaultInstance(); // user.setUserId("testuser"); // List<String> emails = new ArrayList<>(); // emails.add("[email protected]"); // user.setGatewayId("maven.test.gateway"); - // user.setEmails(emails); + // user.addAllEmails(emails); // TenantManagementKeycloakImpl client = new TenantManagementKeycloakImpl(); // try { // PasswordCredential tenantAdminCreds = new PasswordCredential(); @@ -120,12 +120,12 @@ public class SetupNewGateway { // } public static void findUser() { - UserProfile user = new UserProfile(); + UserProfile user = UserProfile.getDefaultInstance(); List<String> emails = new ArrayList<>(); emails.add("[email protected]"); user = user.toBuilder().setGatewayId("maven.test.gateway").build(); - user = user.toBuilder().setEmails(emails).build(); + user = user.toBuilder().addAllEmails(emails).build(); TenantManagementKeycloakImpl client = new TenantManagementKeycloakImpl(); try { PasswordCredential tenantAdminCreds = PasswordCredential.newBuilder().setGatewayId(user.getGatewayId()).build(); diff --git a/airavata-api/src/test/java/org/apache/airavata/security/util/AuthenticatorConfigurationReaderTest.java b/airavata-api/src/test/java/org/apache/airavata/security/util/AuthenticatorConfigurationReaderTest.java index cfd5806d58..6674a5319c 100644 --- a/airavata-api/src/test/java/org/apache/airavata/security/util/AuthenticatorConfigurationReaderTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/security/util/AuthenticatorConfigurationReaderTest.java @@ -56,7 +56,7 @@ public class AuthenticatorConfigurationReaderTest { if (authenticator instanceof TestDBAuthenticator1) { assertEquals("dbAuthenticator1", authenticator.getAuthenticatorName()); assertEquals(6, authenticator.getPriority()); - assertTrue(authenticator.getEnabled()); + assertTrue(authenticator.isEnabled()); assertEquals( "jdbc:sql:thin:@//myhost:1521/mysql1", ((TestDBAuthenticator1) authenticator).getDatabaseURL()); assertEquals("org.mariadb.jdbc.Driver", ((TestDBAuthenticator1) authenticator).getDatabaseDriver()); @@ -69,12 +69,12 @@ public class AuthenticatorConfigurationReaderTest { } else if (authenticator instanceof TestDBAuthenticator2) { assertEquals("dbAuthenticator2", authenticator.getAuthenticatorName()); assertEquals(7, authenticator.getPriority()); - assertTrue(authenticator.getEnabled()); + assertTrue(authenticator.isEnabled()); assertTrue(authenticator.getUserStore() instanceof LDAPUserStore); } else if (authenticator instanceof TestDBAuthenticator3) { assertEquals("dbAuthenticator3", authenticator.getAuthenticatorName()); assertEquals(8, authenticator.getPriority()); - assertTrue(authenticator.getEnabled()); + assertTrue(authenticator.isEnabled()); assertEquals( "jdbc:sql:thin:@//myhost:1521/mysql3", ((TestDBAuthenticator3) authenticator).getDatabaseURL()); assertEquals("org.mariadb.jdbc.Driver", ((TestDBAuthenticator3) authenticator).getDatabaseDriver()); diff --git a/airavata-api/src/test/java/org/apache/airavata/storage/service/DataProductServiceTest.java b/airavata-api/src/test/java/org/apache/airavata/storage/service/DataProductServiceTest.java index b4a0fbf340..18a0751ad0 100644 --- a/airavata-api/src/test/java/org/apache/airavata/storage/service/DataProductServiceTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/storage/service/DataProductServiceTest.java @@ -97,8 +97,8 @@ class DataProductServiceTest { @Test void getChildDataProducts_returnsList() throws Exception { - DataProductModel child1 = new DataProductModel(); - DataProductModel child2 = new DataProductModel(); + DataProductModel child1 = DataProductModel.getDefaultInstance(); + DataProductModel child2 = DataProductModel.getDefaultInstance(); when(registryHandler.getChildDataProducts("parent-uri")).thenReturn(List.of(child1, child2)); List<DataProductModel> result = dataProductService.getChildDataProducts(ctx, "parent-uri");
