Liran Zelkha has uploaded a new change for review.
Change subject: core: Fix cascade delete with Job/Step
......................................................................
core: Fix cascade delete with Job/Step
Job/Step had an incorrect behavior of cascade delete, causing exception to be
thrown.
This patch aims to fix it.
Change-Id: I65719a36d2d401c71a9ee7d2b4258baa082ac6ec
Signed-off-by: lzel...@redhat.com <lzel...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddStepCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetJobsByCorrelationIdQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/JobRepository.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/JobRepositoryImpl.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/job/JobRepositoryTest.java
5 files changed, 0 insertions(+), 40 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/45/42245/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddStepCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddStepCommand.java
index 258580d..adb6c8e 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddStepCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddStepCommand.java
@@ -53,7 +53,6 @@
if (parentStep == null) { // A step that is directly under a job
context.setJob(job);
context.setExecutionMethod(ExecutionMethod.AsJob);
- JobRepositoryFactory.getJobRepository().loadJobSteps(job);
Step step = ExecutionHandler.addStep(context,
getParameters().getStepType(), getParameters().getDescription(), true);
setActionReturnValue(step.getId());
setSucceeded(true);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetJobsByCorrelationIdQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetJobsByCorrelationIdQuery.java
index adc404f..fa7491e 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetJobsByCorrelationIdQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetJobsByCorrelationIdQuery.java
@@ -2,7 +2,6 @@
import java.util.List;
-import org.ovirt.engine.core.bll.job.JobRepositoryFactory;
import org.ovirt.engine.core.common.job.Job;
import
org.ovirt.engine.core.common.queries.GetJobsByCorrelationIdQueryParameters;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
@@ -19,11 +18,6 @@
@Override
protected void executeQueryCommand() {
List<Job> jobs =
DbFacade.getInstance().getJobDao().getJobsByCorrelationId(getParameters().getCorrelationId());
-
- for (Job job : jobs) {
- JobRepositoryFactory.getJobRepository().loadJobSteps(job);
- }
-
getQueryReturnValue().setReturnValue(jobs);
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/JobRepository.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/JobRepository.java
index 268b455..1c421a0 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/JobRepository.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/JobRepository.java
@@ -77,14 +77,6 @@
Job getJobWithSteps(Guid jobId);
/**
- * Update the {@link Job} entity with its Steps.
- *
- * @param job
- * The job to update with its steps(can't be <code>null</code>).
- */
- void loadJobSteps(Job job);
-
- /**
* Update the {@link Step} entity with its Steps.
*
* @param step
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/JobRepositoryImpl.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/JobRepositoryImpl.java
index 860393a..5be4528 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/JobRepositoryImpl.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/JobRepositoryImpl.java
@@ -120,17 +120,8 @@
Map<Guid, VdcObjectType> jobSubjectEntity =
jobSubjectEntityDao.getJobSubjectEntityByJobId(jobId);
job.setJobSubjectEntities(jobSubjectEntity);
- loadJobSteps(job);
}
return job;
- }
-
- @Override
- public void loadJobSteps(final Job job) {
- List<Step> steps = stepDao.getStepsByJobId(job.getId());
- if (!steps.isEmpty()) {
- job.setSteps(buildStepsTree(steps));
- }
}
@Override
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/job/JobRepositoryTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/job/JobRepositoryTest.java
index 7e39f8a..30f9b29 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/job/JobRepositoryTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/job/JobRepositoryTest.java
@@ -52,22 +52,6 @@
}
@Test
- public void getJobWithSteps() {
- Job jobWithSteps = jobRepository.getJobWithSteps(job.getId());
- assertNotNull(jobWithSteps);
- assertNotNull(jobWithSteps.getSteps());
- assertTrue(!jobWithSteps.getSteps().isEmpty());
- assertEquals(JOB_SUBJECT_ENTITIES_MAP,
jobWithSteps.getJobSubjectEntities());
- }
-
- @Test
- public void loadJobSteps() {
- jobRepository.loadJobSteps(job);
- assertNotNull(job.getSteps());
- assertTrue(!job.getSteps().isEmpty());
- }
-
- @Test
public void getJobById() {
assertNotNull(jobRepository.getJob(job.getId()));
assertEquals(JOB_SUBJECT_ENTITIES_MAP, job.getJobSubjectEntities());
--
To view, visit https://gerrit.ovirt.org/42245
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I65719a36d2d401c71a9ee7d2b4258baa082ac6ec
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Liran Zelkha <lzel...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
