From 8943545441008358e3b014e109df9501e31f64f3 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Wed, 5 Aug 2009 10:42:48 +0200
Subject: [PATCH]  ItEr20S04ArquitecturaServidorItEr19S04: Removed methods
 "forceLoad*" from entities.

---
 .../business/orders/entities/HoursGroup.java         |  4 ----
 .../business/resources/entities/Resource.java        |  7 -------
 .../resources/services/CriterionServiceTest.java     | 10 +++++++++-
 .../web/resources/worker/WorkerModel.java            | 12 ++++++++++--
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java
index 2a7806db4..a53ace17d 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java
@@ -141,10 +141,6 @@ public class HoursGroup extends BaseEntity implements Cloneable {
         }
     }
 
-    public void forceLoadCriterions() {
-        criterions.size();
-    }
-
     public void setParentOrderLine(OrderLine parentOrderLine) {
         this.parentOrderLine = parentOrderLine;
     }
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java
index f0cd3698f..7a7fcf333 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java
@@ -170,13 +170,6 @@ public abstract class Resource extends BaseEntity {
         return new Query();
     }
 
-    public void forceLoadSatisfactions() {
-        for (CriterionSatisfaction criterionSatisfaction : criterionSatisfactions) {
-            criterionSatisfaction.getCriterion().getName();
-            criterionSatisfaction.getCriterion().getType().getName();
-        }
-    }
-
     public abstract int getDailyCapacity();
 
     /**
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/services/CriterionServiceTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/services/CriterionServiceTest.java
index 07281da88..3083f7a05 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/services/CriterionServiceTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/services/CriterionServiceTest.java
@@ -264,7 +264,7 @@ public class CriterionServiceTest {
                         try {
                             Resource result = resourceService
                                     .findResource(worker1.getId());
-                            result.forceLoadSatisfactions();
+                            forceLoadSatisfactions(result);
                             return result;
                         } catch (InstanceNotFoundException e) {
                             throw new RuntimeException(e);
@@ -280,6 +280,14 @@ public class CriterionServiceTest {
         assertTrue(reloadedCriterion.isEquivalent(criterion));
     }
 
+    private void forceLoadSatisfactions(Resource resource) {
+        for (CriterionSatisfaction criterionSatisfaction : resource
+                .getAllSatisfactions()) {
+            criterionSatisfaction.getCriterion().getName();
+            criterionSatisfaction.getCriterion().getType().getName();
+        }
+    }
+
     @Test
     @NotTransactional
     public void shouldntThrowExceptionDueToTransparentProxyGotcha() throws ValidationException {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java
index dd2d844b8..51812aa93 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java
@@ -100,7 +100,7 @@ public class WorkerModel implements IWorkerModel {
         Validate.notNull(worker, "worker must be not null");
         try {
             this.worker = (Worker) resourceService.findResource(worker.getId());
-            this.worker.forceLoadSatisfactions();
+            forceLoadSatisfactions(this.worker);
             localizationsAssigner = new MultipleCriterionActiveAssigner(
                     criterionService, this.worker,
                     PredefinedCriterionTypes.LOCATION_GROUP);
@@ -109,6 +109,14 @@ public class WorkerModel implements IWorkerModel {
         }
     }
 
+    private static void forceLoadSatisfactions(Resource resource) {
+        for (CriterionSatisfaction criterionSatisfaction : resource
+                .getAllSatisfactions()) {
+            criterionSatisfaction.getCriterion().getName();
+            criterionSatisfaction.getCriterion().getType().getName();
+        }
+    }
+
     @Override
     @Transactional(readOnly = true)
     public AddingSatisfactionResult addSatisfaction(ICriterionType<?> type,
@@ -243,7 +251,7 @@ public class WorkerModel implements IWorkerModel {
             this.criterionService = criterionService;
             this.resource = resource;
             this.type = type;
-            this.resource.forceLoadSatisfactions();
+            forceLoadSatisfactions(this.resource);
             this.history = calculateInitialHistory();
             this.initialCriterionsNotAssigned = calculateInitialCriterionsNotAssigned();
             for (Criterion criterion : initialCriterionsNotAssigned) {