This is an automated email from the ASF dual-hosted git repository.
isjarana pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/develop by this push:
new 363468ac5f Bug fix in Thrift model to ENtity mapping
new e91abc3d99 Merge pull request #392 from isururanawaka/metaschedular
363468ac5f is described below
commit 363468ac5f5b07b64de4bc40bc8f95c509ff2c48
Author: Isuru Ranawaka <[email protected]>
AuthorDate: Wed Mar 8 14:56:58 2023 -0500
Bug fix in Thrift model to ENtity mapping
---
.../registry/core/entities/expcatalog/ExperimentEntity.java | 2 +-
.../entities/expcatalog/UserConfigurationDataEntity.java | 12 ++++++------
.../core/repositories/expcatalog/ExperimentRepository.java | 6 ++----
3 files changed, 9 insertions(+), 11 deletions(-)
diff --git
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
index 999729fdfa..b38fa3aa05 100644
---
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
+++
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
@@ -32,7 +32,7 @@ import java.util.List;
*/
@Entity
@Table(name = "EXPERIMENT")
-public class ExperimentEntity implements Serializable {
+public class ExperimentEntity implements Serializable {
private static final long serialVersionUID = 1L;
@Id
diff --git
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserConfigurationDataEntity.java
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserConfigurationDataEntity.java
index 1fffa1d2f2..166be71715 100644
---
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserConfigurationDataEntity.java
+++
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserConfigurationDataEntity.java
@@ -106,7 +106,7 @@ public class UserConfigurationDataEntity implements
Serializable {
@OneToMany(targetEntity = ComputationalResourceSchedulingEntity.class,
cascade = CascadeType.ALL,
mappedBy = "userConfigurationData", fetch = FetchType.EAGER)
- private List<ComputationalResourceSchedulingEntity>
computationalResourceSchedulingEntities;
+ private List<ComputationalResourceSchedulingEntity>
autoScheduledCompResourceSchedulingList;
public UserConfigurationDataEntity() {
}
@@ -295,12 +295,12 @@ public class UserConfigurationDataEntity implements
Serializable {
this.experiment = experiment;
}
- public List<ComputationalResourceSchedulingEntity>
getComputationalResourceSchedulingEntities() {
- return computationalResourceSchedulingEntities;
+ public List<ComputationalResourceSchedulingEntity>
getAutoScheduledCompResourceSchedulingList() {
+ return autoScheduledCompResourceSchedulingList;
}
- public void
setComputationalResourceSchedulingEntities(List<ComputationalResourceSchedulingEntity>
-
computationalResourceSchedulingEntities) {
- this.computationalResourceSchedulingEntities =
computationalResourceSchedulingEntities;
+ public void
setAutoScheduledCompResourceSchedulingList(List<ComputationalResourceSchedulingEntity>
+
autoScheduledCompResourceSchedulingList) {
+ this.autoScheduledCompResourceSchedulingList =
autoScheduledCompResourceSchedulingList;
}
}
\ No newline at end of file
diff --git
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java
index 3d90ead3c1..3160b5b08a 100644
---
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java
+++
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java
@@ -21,7 +21,6 @@
package org.apache.airavata.registry.core.repositories.expcatalog;
import org.apache.airavata.common.utils.AiravataUtils;
-import org.apache.airavata.model.commons.airavata_commonsConstants;
import org.apache.airavata.model.experiment.ExperimentModel;
import org.apache.airavata.model.experiment.UserConfigurationDataModel;
import org.apache.airavata.model.status.ExperimentState;
@@ -37,7 +36,6 @@ import org.dozer.Mapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -85,9 +83,9 @@ public class ExperimentRepository extends
ExpCatAbstractRepository<ExperimentMod
experimentEntity.getUserConfigurationData().setExperimentId(experimentId);
}
- if
(experimentEntity.getUserConfigurationData().getComputationalResourceSchedulingEntities()
!= null) {
+ if
(experimentEntity.getUserConfigurationData().getAutoScheduledCompResourceSchedulingList()
!= null) {
logger.debug("Populating the Primary Key of
UserConfigurationData.ComputationalResourceSchedulingEntities object for the
Experiment");
- for(ComputationalResourceSchedulingEntity entity :
experimentEntity.getUserConfigurationData().getComputationalResourceSchedulingEntities()){
+ for(ComputationalResourceSchedulingEntity entity :
experimentEntity.getUserConfigurationData().getAutoScheduledCompResourceSchedulingList()){
entity.setExperimentId(experimentId);
}
