svn commit: r1523507 - in /ofbiz/trunk/framework/entity/src/org/ofbiz/entity: Delegator.java GenericDelegator.java

Author: jleroux
Date: Sun Sep 15 21:58:38 2013
New Revision: 1523507

URL: http://svn.apache.org/r1523507
Log:
As suggested on dev ML, reintroduces findAll("EntityName") but uses the new pattern with a cache variable rather than a signature with "Cache" in method name (thanks to Adrian's comment on dev ML)

Modified:
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/Delegator.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/Delegator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/Delegator.java?rev=1523507&r1=1523506&r2=1523507&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/Delegator.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/Delegator.java Sun Sep 15 21:58:38 2013
@@ -293,6 +293,19 @@ public interface Delegator {
     public EntityListIterator find(String entityName, EntityCondition whereEntityCondition, EntityCondition havingEntityCondition, Set<String> fieldsToSelect, List<String> orderBy, EntityFindOptions findOptions) throws GenericEntityException;
 
     /**
+     * Finds all Generic entities
+     *
+     * @param entityName
+     *            The Name of the Entity as defined in the entity XML file
+     * @param useCache
+     *            Whether to cache the results
+     * @return List containing all Generic entities
+     * @deprecated use {@link #findList(String entityName, EntityCondition entityCondition, Set<String> fieldsToSelect, List<String> orderBy, EntityFindOptions findOptions, boolean useCache)
+     */
+    @Deprecated
+    public List<GenericValue> findAll(String entityName, boolean useCache) throws GenericEntityException;
+
+    /**
      * Finds Generic Entity records by all of the specified fields (ie: combined
      * using AND) NOTE 20080502: 264 references
      *

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java?rev=1523507&r1=1523506&r2=1523507&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java Sun Sep 15 21:58:38 2013
@@ -1676,23 +1676,14 @@ public class GenericDelegator implements
     
     /** Finds all Generic entities
      *@param entityName The Name of the Entity as defined in the entity XML file
-     *@return    List containing all Generic entities
-     *@deprecated Use findList() instead
+     * @see org.ofbiz.entity.Delegator#findAll(java.lang.String, boolean)
+     * @deprecated use {@link #findList(java.lang.String, org.ofbiz.entity.condition.EntityCondition, java.util.Set, java.util.List, org.ofbiz.entity.util.EntityFindOptions, boolean)}
+     *
      */
-    public List<GenericValue> findAll(String entityName) throws GenericEntityException {
-        return this.findList(entityName, null, null, null, null, false);
+    public List<GenericValue> findAll(String entityName, boolean useCache) throws GenericEntityException {
+        return this.findList(entityName, null, null, null, null, useCache);
     }
     
-    /** Finds all Generic entities, looking first in the cache
-     *@param entityName The Name of the Entity as defined in the entity XML file
-     *@return    List containing all Generic entities
-     *@deprecated Use findList() instead
-     */
-    public List<GenericValue> findAllCache(String entityName) throws GenericEntityException {
-        return this.findList(entityName, null, null, null, null, true);
-    }
-    
-
     /* (non-Javadoc)
      * @see org.ofbiz.entity.Delegator#findByAnd(java.lang.String, java.lang.Object)
      * @deprecated use {@link #findByAnd(String, Map, List, boolean)}