Author: echatellier Date: 2013-07-12 10:31:24 +0200 (Fri, 12 Jul 2013) New Revision: 2756 Url: http://nuiton.org/projects/topia/repository/revisions/2756 Log: refs #2752: Add generics support on TopiaContext#find*() methods Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaLoginModule.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2013-07-12 08:12:26 UTC (rev 2755) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2013-07-12 08:31:24 UTC (rev 2756) @@ -536,7 +536,7 @@ @Override public List<E> findAllContains(String propertyName, Object property) throws TopiaException { - List<E> find = (List<E>)context.findAll("from " + getEntityClass().getName() + + List<E> find = context.findAll("from " + getEntityClass().getName() + " WHERE :property in elements(" + propertyName + ")", "property", property); return find; } Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaLoginModule.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaLoginModule.java 2013-07-12 08:12:26 UTC (rev 2755) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaLoginModule.java 2013-07-12 08:31:24 UTC (rev 2756) @@ -148,9 +148,10 @@ // Force le rechargement des groupes d'où la non utilisation de // la méthode : user.getTopiaGroup() - Set<TopiaGroup> groups = new HashSet<TopiaGroup>(securityManager.getSecurityContext().findAll( + List<TopiaGroup> groupsList = securityManager.getSecurityContext().findAll( "select topiaGroup from " + TopiaGroup.class.getName() + - " topiaGroup join topiaGroup.topiaUser as topiaUser where topiaUser = :user", "user", user)); + " topiaGroup join topiaGroup.topiaUser as topiaUser where topiaUser = :user", "user", user); + Set<TopiaGroup> groups = new HashSet<TopiaGroup>(groupsList); if (groups != null) { for (TopiaGroup group : groups) {