From 2f5453923ca130bfc40fb3c66ffbbbcee3aa76c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Wed, 12 Aug 2009 11:56:02 +0200
Subject: [PATCH] ItEr21S04ArquitecturaServidorItEr20S04: No need to check if
 the criterion exists by id since the created criterions are transient
 instances.

---
 .../bootstrap/CriterionsBootstrap.java        |  3 +--
 .../bootstrap/CriterionsBootstrapTest.java    | 25 +++++--------------
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/bootstrap/CriterionsBootstrap.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/bootstrap/CriterionsBootstrap.java
index f5a0a3a62..1da19c0b6 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/bootstrap/CriterionsBootstrap.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/bootstrap/CriterionsBootstrap.java
@@ -61,8 +61,7 @@ public class CriterionsBootstrap implements ICriterionsBootstrap {
     private void ensureCriterionExists(String criterionName,
             CriterionType criterionType) {
         Criterion criterion = new Criterion(criterionName, criterionType);
-        if (!(criterionDAO.exists(criterion.getId()) || criterionDAO
-                .existsByNameAndType(criterion))) {
+        if (!criterionDAO.existsByNameAndType(criterion)) {
             criterionDAO.save(criterion);
         }
     }
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/bootstrap/CriterionsBootstrapTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/bootstrap/CriterionsBootstrapTest.java
index 0df748f5b..fbe31decd 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/bootstrap/CriterionsBootstrapTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/bootstrap/CriterionsBootstrapTest.java
@@ -30,32 +30,19 @@ public class CriterionsBootstrapTest {
     @Test
     public void testBootstrap() throws Exception {
         Criterion criterion = WorkingRelationship.FIRED.criterion();
-        if (criterionDAO.exists(criterion.getId())
-                || criterionDAO.existsByNameAndType(criterion)) {
-            if (criterion.getId() != null) {
-                criterionDAO.remove(criterion.getId());
-            } else {
-                criterionDAO.removeByNameAndType(criterion);
-            }
+        if (criterionDAO.existsByNameAndType(criterion)) {
+            criterionDAO.removeByNameAndType(criterion);
         }
-
         criterion = WorkingRelationship.HIRED.criterion();
-        if (criterionDAO.exists(criterion.getId())
-                || criterionDAO.existsByNameAndType(criterion)) {
-            if (criterion.getId() != null) {
-                criterionDAO.remove(criterion.getId());
-            } else {
-                criterionDAO.removeByNameAndType(criterion);
-            }
+        if (criterionDAO.existsByNameAndType(criterion)) {
+            criterionDAO.removeByNameAndType(criterion);
         }
 
         criterionsBootstrap.loadRequiredData();
         criterion = WorkingRelationship.FIRED.criterion();
-        assertTrue(criterionDAO.exists(criterion.getId())
-                || criterionDAO.existsByNameAndType(criterion));
+        assertTrue(criterionDAO.existsByNameAndType(criterion));
         criterion = WorkingRelationship.HIRED.criterion();
-        assertTrue(criterionDAO.exists(criterion.getId())
-                || criterionDAO.existsByNameAndType(criterion));
+        assertTrue(criterionDAO.existsByNameAndType(criterion));
     }
 
 }