From 873d3b6311f15375f8ef681cfbc67113196ac78a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Sun, 19 Sep 2010 21:25:49 +0200
Subject: [PATCH] Remove method.

It was dangerous because it returned only the resources at the present
time. It looks like an usual functionality but a lot of times is
mistakenly used when findSatisfyingAllCriterionsAtSomePoint should be
used instead.

FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
---
 .../business/resources/daos/IResourceDAO.java | 10 -------
 .../business/resources/daos/ResourceDAO.java  | 26 -------------------
 .../test/resources/daos/ResourceDAOTest.java  |  8 +++---
 3 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/IResourceDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/IResourceDAO.java
index 457687e15..5e17c8e07 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/IResourceDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/IResourceDAO.java
@@ -49,16 +49,6 @@ public interface IResourceDAO extends IIntegrationEntityDAO<Resource> {
      */
     List<Resource> findResourcesRelatedTo(List<Task> tasks);
 
-    /**
-     * Returns a list of {@link Resource} satisfying all criterions
-     *
-     * @param criterions
-     * @return
-     */
-    List<Resource> findSatisfyingAllCriterions(
-            Collection<? extends Criterion> criterions,
-            boolean limitingResource);
-
     /**
      * Returns a list of {@link Resource} satisfying all criteria at some point
      * in time
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ResourceDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ResourceDAO.java
index 534b5f948..379b3b7b4 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ResourceDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ResourceDAO.java
@@ -128,32 +128,6 @@ public class ResourceDAO extends IntegrationEntityDAO<Resource> implements
         return (List<Resource>) query.list();
     }
 
-    @Override
-    public List<Resource> findSatisfyingAllCriterions(
-            Collection<? extends Criterion> criteria,
-            boolean limitingResource) {
-        // FIXME don't query all resources. One possible solution is to do a
-        // query for the first criteria and then filter in memory for the
-        // remaining
-        return selectSatisfiyingAllCriterions(new ArrayList<Resource>(
-                getResources()), criteria, limitingResource);
-    }
-
-    private List<Resource> selectSatisfiyingAllCriterions(
-            List<Resource> resources,
-            Collection<? extends Criterion> criterions,
-            Boolean limitingResource) {
-
-        List<Resource> result = new ArrayList<Resource>();
-        for (Resource each : resources) {
-            if (limitingResource.equals(each.isLimitingResource())
-                    && each.satisfiesCriterions(criterions)) {
-                result.add(each);
-            }
-        }
-        return result;
-    }
-
     @Override
     public List<Resource> findResourcesRelatedTo(List<Task> taskElements) {
         if (taskElements.isEmpty()) {
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/daos/ResourceDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/daos/ResourceDAOTest.java
index 19764b556..4dfae8071 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/daos/ResourceDAOTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/daos/ResourceDAOTest.java
@@ -21,9 +21,9 @@
 package org.navalplanner.business.test.resources.daos;
 
 import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.not;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertThat;
 import static org.navalplanner.business.BusinessGlobalNames.BUSINESS_SPRING_CONFIG_FILE;
@@ -117,7 +117,7 @@ public class ResourceDAOTest {
         Collection<Criterion> criterions = createCriterions();
         createAndSaveResourceSatisfyingAllCriterions(criterions);
         List<Resource> result = resourceDAO
-                .findSatisfyingAllCriterions(criterions, false);
+                .findSatisfyingAllCriterionsAtSomePoint(criterions);
         assertNotNull(result);
         assertEquals(1, result.size());
     }
@@ -173,9 +173,9 @@ public class ResourceDAOTest {
         criterions.add(createCriterion("criterion3"));
 
         List<Resource> result = resourceDAO
-                .findSatisfyingAllCriterions(criterions, false);
+                .findSatisfyingAllCriterionsAtSomePoint(criterions);
         assertNotNull(result);
-        assertTrue(result.size() != 1);
+        assertThat(result.size(), not(equalTo(1)));
     }
 
 }