Merged 1.2-dev to trunk.

1 files changed, 24 insertions, 0 deletions

diff --git a/src/main/java/com/amazon/carbonado/cursor/FilteredCursor.java b/src/main/java/com/amazon/carbonado/cursor/FilteredCursor.java
index c25f8db..faf990d 100644
--- a/src/main/java/com/amazon/carbonado/cursor/FilteredCursor.java
+++ b/src/main/java/com/amazon/carbonado/cursor/FilteredCursor.java
@@ -38,6 +38,27 @@ import com.amazon.carbonado.filter.OpenFilter;
  */

 public abstract class FilteredCursor<S> extends AbstractCursor<S> {

     /**

+     * Returns a Cursor that is filtered by the given filter expression and values.

+     *

+     * @param cursor cursor to wrap

+     * @param type type of storable

+     * @param filter filter to apply

+     * @param filterValues values for filter

+     * @return wrapped cursor which filters results

+     * @throws IllegalStateException if any values are not specified

+     * @throws IllegalArgumentException if any argument is null

+     */

+    public static <S extends Storable> Cursor<S> applyFilter(Cursor<S> cursor,

+                                                             Class<S> type,

+                                                             String filter,

+                                                             Object... filterValues)

+    {

+        Filter<S> f = Filter.filterFor(type, filter).bind();

+        FilterValues<S> fv = f.initialFilterValues().withValues(filterValues);

+        return applyFilter(f, fv, cursor);

+    }

+

+    /**

      * Returns a Cursor that is filtered by the given Filter and FilterValues.

      * The given Filter must be composed only of the same PropertyFilter

      * instances as used to construct the FilterValues. An

@@ -61,6 +82,9 @@ public abstract class FilteredCursor<S> extends AbstractCursor<S> {
             throw new IllegalArgumentException();

         }

 

+        // Make sure the filter is the same one that filterValues should be using.

+        filter = filter.bind();

+

         return FilteredCursorGenerator.getFactory(filter)

             .newFilteredCursor(cursor, filterValues.getValuesFor(filter));

     }