[jboss-cvs] JBossAS SVN: r100297 - projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa.

[jboss-cvs-commits at lists.jboss.org]

Author: marius.bogoevici
Date: 2010-02-02 15:09:43 -0500 (Tue, 02 Feb 2010)
New Revision: 100297

Modified:
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaReservationRepository.java
Log:
Fix search for equipment types.

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaReservationRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaReservationRepository.java	2010-02-02 19:45:51 UTC (rev 100296)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaReservationRepository.java	2010-02-02 20:09:43 UTC (rev 100297)
@@ -50,17 +50,7 @@
       }
       if (criteria.getEquipmentType() != null && !criteria.getEquipmentType().isEmpty())
       {
-         StringBuilder sb = new StringBuilder();
-         String d = "";
-         for (EquipmentType type : criteria.getEquipmentType())
-         {
-            sb.append(d);
-            sb.append("'");
-            sb.append(type);
-            sb.append("'");
-            if (d.isEmpty()) d = ",";
-         }
-         q += " AND r.equipment.equipmentType IN (" + sb.toString() + ")";
+         q += " AND r.equipment.equipmentType IN (:equipmentTypes)";
       }
 
       Query query = entityManager.createQuery(q);
@@ -73,6 +63,10 @@
       {
          query.setParameter("to", criteria.getToDate());
       }
+      if (criteria.getEquipmentType() != null && !criteria.getEquipmentType().isEmpty())
+      {
+         query.setParameter("equipmentTypes", criteria.getEquipmentType());
+      }
       return query;
    }
 }