Author: athimel Date: 2012-05-30 09:50:27 +0200 (Wed, 30 May 2012) New Revision: 2562 Url: http://nuiton.org/repositories/revision/topia/2562 Log: fixes #2075 Rename method TopiaContext#find(String, Object...) to TopiaContext#findAll(String, Object...) Modified: branches/topia-2.6-maintenance/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java branches/topia-2.6-maintenance/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java branches/topia-2.6-maintenance/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java branches/topia-2.6-maintenance/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java branches/topia-2.6-maintenance/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java branches/topia-2.6-maintenance/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java branches/topia-2.6-maintenance/topia-service-security/src/main/java/org/nuiton/topia/security/TopiaSecurityServiceImpl.java branches/topia-2.6-maintenance/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java branches/topia-2.6-maintenance/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaLoginModule.java Modified: branches/topia-2.6-maintenance/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java =================================================================== --- branches/topia-2.6-maintenance/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2012-05-30 07:42:12 UTC (rev 2561) +++ branches/topia-2.6-maintenance/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2012-05-30 07:50:27 UTC (rev 2562) @@ -203,7 +203,7 @@ * @return La liste des resultats * @throws TopiaException si une erreur survient durant la requete */ - List find(String hql, Object... args) throws TopiaException; + List findAll(String hql, Object... args) throws TopiaException; /** * Permet de faire une requete HQL hibernate directement sur la base en Modified: branches/topia-2.6-maintenance/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- branches/topia-2.6-maintenance/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2012-05-30 07:42:12 UTC (rev 2561) +++ branches/topia-2.6-maintenance/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2012-05-30 07:50:27 UTC (rev 2562) @@ -173,7 +173,7 @@ * * The normal usage is to says yes (that's why the default value is * {@code true}), in that case whebn doing queries (says in method - * {@link #find(String, Object...)} or {@link #find(String, int, int, Object...)}) + * {@link #findAll(String, Object...)} or {@link #find(String, int, int, Object...)}) * it will use the flush mode {@link FlushMode#AUTO}). * * But sometimes, when doing a lot of queries (for some imports for example), @@ -988,9 +988,9 @@ } @Override - public List<?> find(String hql, Object... args) throws TopiaException { + public List<?> findAll(String hql, Object... args) throws TopiaException { checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", - "find")); + "findAll")); try { Query query = getHibernate().createQuery(hql); @@ -1219,7 +1219,7 @@ log.debug("acquire entities " + query); } // acquire data to replicate - List<?> entities = find(query); + List<?> entities = findAll(query); replicate0(dstContextImpl, entities.toArray()); if (log.isDebugEnabled()) { log.debug("replication of entities " + query + Modified: branches/topia-2.6-maintenance/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java =================================================================== --- branches/topia-2.6-maintenance/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2012-05-30 07:42:12 UTC (rev 2561) +++ branches/topia-2.6-maintenance/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2012-05-30 07:50:27 UTC (rev 2562) @@ -48,7 +48,7 @@ import java.util.Map; /** - * Query HQL managment to simplify usage of {@link TopiaContext#find(String, + * Query HQL managment to simplify usage of {@link TopiaContext#findAll(String, * Object...) }. * <p/> * TODO-FD20091224 JUnit Tests @@ -74,7 +74,7 @@ * SQL : * "SELECT * FROM PersonImpl WHERE firstName LIKE 'M%' AND year > 1980" * <p/> - * HQL using {@link TopiaContext#find(String, Object...) } : + * HQL using {@link TopiaContext#findAll(String, Object...) } : * TopiaContext context = rootContext.beginTransaction(); * context.find("FROM " + Person.class.getName() + " WHERE firstName LIKE * :firstName AND year > :year", @@ -92,7 +92,7 @@ * Example 2 : * ----------- * <p/> - * HQL using {@link TopiaContext#find(String, Object...) } : + * HQL using {@link TopiaContext#findAll(String, Object...) } : * TopiaContext context = rootContext.beginTransaction(); * <p/> * String query = "FROM " + Person.class.getName(); @@ -114,7 +114,7 @@ * separator = " AND "; * } * <p/> - * context.find(query, params.toArray()); + * context.findAll(query, params.toArray()); * <p/> * Here we have only two non obligatory params, but imagine if we must have * almost 6 or 7 parameters like this ! @@ -168,7 +168,7 @@ * ---------------- * <p/> * - execute : as the same result as - * {@link TopiaContext#find(String, Object...) } + * {@link TopiaContext#findAll(String, Object...) } * <p/> * Depends on entity type ; * ------------------------ @@ -1374,7 +1374,7 @@ * @param transaction the TopiaContext to use for execution * @return a List of results * @throws TopiaException for error on query execution - * @see TopiaContext#find(String, Object...) + * @see TopiaContext#findAll(String, Object...) */ public List execute(TopiaContext transaction) throws TopiaException { String query = fullQuery(); @@ -1386,7 +1386,7 @@ result = transaction.find(query, startIndex, endIndex, getParams().toArray()); } else { - result = transaction.find(query, getParams().toArray()); + result = transaction.findAll(query, getParams().toArray()); } return result; } Modified: branches/topia-2.6-maintenance/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java =================================================================== --- branches/topia-2.6-maintenance/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2012-05-30 07:42:12 UTC (rev 2561) +++ branches/topia-2.6-maintenance/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2012-05-30 07:50:27 UTC (rev 2562) @@ -357,7 +357,7 @@ "l'acces a l'entite pour le service Taas"); setOperationBody(op, "" /*{ TopiaContextImplementor context = getContext(); - List<String> result = context.find(query, "id", topiaId); + List<String> result = context.findAll(query, "id", topiaId); List<Permission> resultPermissions = new ArrayList<Permission>(); for (String topiaIdPermission : result) { Modified: branches/topia-2.6-maintenance/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java =================================================================== --- branches/topia-2.6-maintenance/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2012-05-30 07:42:12 UTC (rev 2561) +++ branches/topia-2.6-maintenance/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2012-05-30 07:50:27 UTC (rev 2562) @@ -524,7 +524,7 @@ // "l'acces a l'entite pour le service Taas"); setOperationBody(op, "" /*{ TopiaContextImplementor context = getContext(); - List<String> result = context.find(query, "id", topiaId); + List<String> result = context.findAll(query, "id", topiaId); List<Permission> resultPermissions = new ArrayList<Permission>(); for (String topiaIdPermission : result) { Modified: branches/topia-2.6-maintenance/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java =================================================================== --- branches/topia-2.6-maintenance/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java 2012-05-30 07:42:12 UTC (rev 2561) +++ branches/topia-2.6-maintenance/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java 2012-05-30 07:50:27 UTC (rev 2562) @@ -489,8 +489,8 @@ @Override public List<String> findAllIds() throws TopiaException { -// List<String> find = context.find("select src.topiaId from " + entityClass.getSimpleName() + "Impl src"); - List<String> find = context.find("select src.topiaId from " + getEntityClass() + " src"); +// List<String> findAll = context.findAll("select src.topiaId from " + entityClass.getSimpleName() + "Impl src"); + List<String> find = context.findAll("select src.topiaId from " + getEntityClass() + " src"); return find; } Modified: branches/topia-2.6-maintenance/topia-service-security/src/main/java/org/nuiton/topia/security/TopiaSecurityServiceImpl.java =================================================================== --- branches/topia-2.6-maintenance/topia-service-security/src/main/java/org/nuiton/topia/security/TopiaSecurityServiceImpl.java 2012-05-30 07:42:12 UTC (rev 2561) +++ branches/topia-2.6-maintenance/topia-service-security/src/main/java/org/nuiton/topia/security/TopiaSecurityServiceImpl.java 2012-05-30 07:50:27 UTC (rev 2562) @@ -402,7 +402,7 @@ //FIXME : Voir si on peut mettre en relation un objet vers plusieurs objets protected List<String> getRealExpressions(String topiaId) { try { - List<String> allBy = getSecurityContext().find("select distinct link.by from " + + List<String> allBy = getSecurityContext().findAll("select distinct link.by from " + TopiaExpressionLink.class.getName() + " link where link.replace=:replace", "replace", topiaId); getSecurityContext().commitTransaction(); Modified: branches/topia-2.6-maintenance/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java =================================================================== --- branches/topia-2.6-maintenance/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java 2012-05-30 07:42:12 UTC (rev 2561) +++ branches/topia-2.6-maintenance/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java 2012-05-30 07:50:27 UTC (rev 2562) @@ -66,7 +66,7 @@ String where = "test.topiaId=:test and association.topiaId=:association"; TopiaContext context = getTopiaContext(); try { - List<?> find = context.find("select " + select + " from " + from + " where " + where, + List<?> find = context.findAll("select " + select + " from " + from + " where " + where, "test", thisExpression, "association", thatExpression); return (Long)find.get(0) >= 1; Modified: branches/topia-2.6-maintenance/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaLoginModule.java =================================================================== --- branches/topia-2.6-maintenance/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaLoginModule.java 2012-05-30 07:42:12 UTC (rev 2561) +++ branches/topia-2.6-maintenance/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaLoginModule.java 2012-05-30 07:50:27 UTC (rev 2562) @@ -148,7 +148,7 @@ // Force le rechargement des groupes d'où la non utilisation de // la méthode : user.getTopiaGroup() - Set<TopiaGroup> groups = new HashSet<TopiaGroup>(securityManager.getSecurityContext().find( + Set<TopiaGroup> groups = new HashSet<TopiaGroup>(securityManager.getSecurityContext().findAll( "select topiaGroup from " + TopiaGroup.class.getName() + " topiaGroup join topiaGroup.topiaUser as topiaUser where topiaUser = :user", "user", user));