Author: athimel Date: 2012-05-29 18:38:29 +0200 (Tue, 29 May 2012) New Revision: 2557 Url: http://nuiton.org/repositories/revision/topia/2557 Log: fixes #2075 method without bounds is now called findAll This might introduce a non-backward compatibility, but it's still better than the actual name Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2012-05-29 16:36:57 UTC (rev 2556) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2012-05-29 16:38:29 UTC (rev 2557) @@ -363,7 +363,7 @@ * @return The result list * @throws TopiaException for any error during querying */ - List find(String jpaql, Object... paramNamesAndValues) + List findAll(String jpaql, Object... paramNamesAndValues) throws TopiaException; /** Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2012-05-29 16:36:57 UTC (rev 2556) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2012-05-29 16:38:29 UTC (rev 2557) @@ -152,8 +152,9 @@ * * 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...)}) - * it will use the flush mode {@link javax.persistence.FlushModeType#AUTO}). + * {@link #findAll(String, Object...)} or + * {@link #find(String, int, int, Object...)}) it will use the flush mode + * {@link javax.persistence.FlushModeType#AUTO}). * * But sometimes, when doing a lot of queries (for some imports for example), * we do NOT want the session to be flushed each time we do a find, then you @@ -859,7 +860,7 @@ } @Override - public List<?> find(String jpaql, Object... paramNamesAndValues) { + public List<?> findAll(String jpaql, Object... paramNamesAndValues) { List<?> result = find(jpaql, 0, -1, paramNamesAndValues); return result; } @@ -1264,7 +1265,7 @@ log.debug("acquire entities " + query); } // acquire data to replicate - List<?> entities = find(query); + List<?> entities = findAll(query); replicateOnDestinationContext(destinationContextImpl, entities.toArray()); if (log.isDebugEnabled()) { log.debug("replication of entities " + query + Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2012-05-29 16:36:57 UTC (rev 2556) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2012-05-29 16:38:29 UTC (rev 2557) @@ -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(); @@ -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 ; * ------------------------ @@ -1317,7 +1317,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(); @@ -1329,7 +1329,7 @@ result = transaction.find(query, startIndex, endIndex, getParams().toArray()); } else { - result = transaction.find(query, getParams().toArray()); + result = transaction.findAll(query, getParams().toArray()); } return result; }