[android] - binding integration for expression filtersupstream/tvn-expression-filter-support

17 files changed, 71 insertions, 289 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
index 2fd9a9010c..785654ac6f 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
@@ -39,7 +39,7 @@ import com.mapbox.mapboxsdk.constants.Style;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.geometry.LatLngBounds;
 import com.mapbox.mapboxsdk.maps.widgets.MyLocationViewSettings;
-import com.mapbox.mapboxsdk.style.layers.Filter;
+import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.Layer;
 import com.mapbox.mapboxsdk.style.light.Light;
 import com.mapbox.mapboxsdk.style.sources.Source;
@@ -2205,9 +2205,10 @@ public final class MapboxMap {
    */
   @NonNull
   public List<Feature> queryRenderedFeatures(@NonNull PointF coordinates,
-                                             @Nullable Filter.Statement filter,
+                                             @Nullable Expression filter,
                                              @Nullable String... layerIds) {
-    return nativeMapView.queryRenderedFeatures(coordinates, layerIds, filter);
+//    return nativeMapView.queryRenderedFeatures(coordinates, layerIds, filter);
+    return null;
   }
 
   /**
@@ -2233,9 +2234,10 @@ public final class MapboxMap {
    */
   @NonNull
   public List<Feature> queryRenderedFeatures(@NonNull RectF coordinates,
-                                             @Nullable Filter.Statement filter,
+                                             @Nullable Expression filter,
                                              @Nullable String... layerIds) {
-    return nativeMapView.queryRenderedFeatures(coordinates, layerIds, filter);
+//    return nativeMapView.queryRenderedFeatures(coordinates, layerIds, filter);
+    return null;
   }
 
   FocalPointChangeListener createFocalPointChangeListener() {
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
index 785b045779..979ea1d665 100755
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
@@ -24,8 +24,8 @@ import com.mapbox.mapboxsdk.geometry.LatLngBounds;
 import com.mapbox.mapboxsdk.geometry.ProjectedMeters;
 import com.mapbox.mapboxsdk.maps.renderer.MapRenderer;
 import com.mapbox.mapboxsdk.storage.FileSource;
+import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.CannotAddLayerException;
-import com.mapbox.mapboxsdk.style.layers.Filter;
 import com.mapbox.mapboxsdk.style.layers.Layer;
 import com.mapbox.mapboxsdk.style.light.Light;
 import com.mapbox.mapboxsdk.style.sources.CannotAddSourceException;
@@ -801,19 +801,19 @@ final class NativeMapView {
   @NonNull
   public List<Feature> queryRenderedFeatures(@NonNull PointF coordinates,
                                              @Nullable String[] layerIds,
-                                             @Nullable Filter.Statement filter) {
+                                             @Nullable Expression filter) {
     if (isDestroyedOn("queryRenderedFeatures")) {
       return new ArrayList<>();
     }
     Feature[] features = nativeQueryRenderedFeaturesForPoint(coordinates.x / pixelRatio,
       coordinates.y / pixelRatio, layerIds, filter != null ? filter.toArray() : null);
-    return features != null ? Arrays.asList(features) : new ArrayList<Feature>();
+    return features != null ? Arrays.asList(features) : new ArrayList<>();
   }
 
   @NonNull
   public List<Feature> queryRenderedFeatures(@NonNull RectF coordinates,
                                              @Nullable String[] layerIds,
-                                             @Nullable Filter.Statement filter) {
+                                             @Nullable Expression filter) {
     if (isDestroyedOn("queryRenderedFeatures")) {
       return new ArrayList<>();
     }
@@ -824,7 +824,7 @@ final class NativeMapView {
       coordinates.bottom / pixelRatio,
       layerIds,
       filter != null ? filter.toArray() : null);
-    return features != null ? Arrays.asList(features) : new ArrayList<Feature>();
+    return features != null ? Arrays.asList(features) : new ArrayList<>();
   }
 
   public void setApiBaseUrl(String baseUrl) {
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java
index 978fa29ef8..67472ced6c 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java
@@ -8,6 +8,7 @@ import android.support.annotation.UiThread;
 
 import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
 
+import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
 
 /**
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java
index 10663142b5..14f0e2ab2a 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java
@@ -8,6 +8,7 @@ import android.support.annotation.UiThread;
 
 import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
 
+import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
 
 /**
@@ -71,20 +72,20 @@ public class CircleLayer extends Layer {
   /**
    * Set a single filter.
    *
-   * @param filter the filter to set
+   * @param expression the expression filter to set
    */
-  public void setFilter(Filter.Statement filter) {
-    nativeSetFilter(filter.toArray());
+  public void setFilter(Expression expression) {
+    nativeSetFilter(expression.toArray());
   }
 
   /**
    * Set a single filter.
    *
-   * @param filter the filter to set
+   * @param expression the expression filter to set
    * @return This
    */
-  public CircleLayer withFilter(Filter.Statement filter) {
-    setFilter(filter);
+  public CircleLayer withFilter(Expression expression) {
+    setFilter(expression);
     return this;
   }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java
index 6772da73b1..b7391f1be4 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java
@@ -8,6 +8,7 @@ import android.support.annotation.UiThread;
 
 import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
 
+import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
 
 /**
@@ -71,20 +72,20 @@ public class FillExtrusionLayer extends Layer {
   /**
    * Set a single filter.
    *
-   * @param filter the filter to set
+   * @param expression the expression filter to set
    */
-  public void setFilter(Filter.Statement filter) {
-    nativeSetFilter(filter.toArray());
+  public void setFilter(Expression expression) {
+    nativeSetFilter(expression.toArray());
   }
 
   /**
    * Set a single filter.
    *
-   * @param filter the filter to set
+   * @param expression the expression filter to set
    * @return This
    */
-  public FillExtrusionLayer withFilter(Filter.Statement filter) {
-    setFilter(filter);
+  public FillExtrusionLayer withFilter(Expression expression) {
+    setFilter(expression);
     return this;
   }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java
index 3719ae9e1b..067f8a14a8 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java
@@ -8,6 +8,7 @@ import android.support.annotation.UiThread;
 
 import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
 
+import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
 
 /**
@@ -71,20 +72,20 @@ public class FillLayer extends Layer {
   /**
    * Set a single filter.
    *
-   * @param filter the filter to set
+   * @param expression the expression filter to set
    */
-  public void setFilter(Filter.Statement filter) {
-    nativeSetFilter(filter.toArray());
+  public void setFilter(Expression expression) {
+    nativeSetFilter(expression.toArray());
   }
 
   /**
    * Set a single filter.
    *
-   * @param filter the filter to set
+   * @param expression the expression filter to set
    * @return This
    */
-  public FillLayer withFilter(Filter.Statement filter) {
-    setFilter(filter);
+  public FillLayer withFilter(Expression expression) {
+    setFilter(expression);
     return this;
   }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Filter.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Filter.java
deleted file mode 100644
index 4dbb461e4c..0000000000
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Filter.java
+++ /dev/null
@@ -1,230 +0,0 @@
-package com.mapbox.mapboxsdk.style.layers;
-
-import java.util.ArrayList;
-import java.util.Collections;
-
-/**
- * Utility to build filter expressions more easily.
- *
- * @see <a href="https://www.mapbox.com/mapbox-gl-style-spec/#types-filter">The online documentation</a>
- */
-public class Filter {
-
-  /**
-   * Base Filter statement. Subclassed to provide concrete statements.
-   */
-  public abstract static class Statement {
-    protected final String operator;
-
-    public Statement(String operator) {
-      this.operator = operator;
-    }
-
-    /**
-     * Generate a raw array representation of the filter
-     *
-     * @return the filter represented as an array
-     */
-    public abstract Object[] toArray();
-  }
-
-  /**
-   * Represents a {@link Filter} statement. Can be unary (eg `has()`, etc) or take any number of values.
-   */
-  private static class SimpleStatement extends Statement {
-    private final String key;
-    private final Object[] values;
-
-    /**
-     * @param operator the operator (eg `=`, etc)
-     * @param key      the property key
-     * @param values   the values to operate on, if any
-     */
-    SimpleStatement(String operator, String key, Object... values) {
-      super(operator);
-      this.key = key;
-      this.values = values;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Object[] toArray() {
-      ArrayList<Object> array = new ArrayList<>(2 + values.length);
-      array.add(operator);
-      array.add(key);
-      Collections.addAll(array, values);
-      return array.toArray();
-    }
-  }
-
-  /**
-   * Represents a collection of {@link Statement}s with an operator that describes their relationship
-   */
-  private static class CompoundStatement extends Statement {
-    private final Statement[] statements;
-
-    /**
-     * @param operator   the relationship operator
-     * @param statements the statements to compound
-     */
-    CompoundStatement(String operator, Statement... statements) {
-      super(operator);
-      this.statements = statements;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Object[] toArray() {
-      ArrayList<Object> array = new ArrayList<>(1 + statements.length);
-      array.add(operator);
-      for (Statement statement : statements) {
-        array.add(statement.toArray());
-      }
-      return array.toArray();
-    }
-  }
-
-  /**
-   * Groups a collection of statements in an 'all' relationship
-   *
-   * @param statements the collection of statements
-   * @return the statements compounded
-   */
-  public static Statement all(Statement... statements) {
-    return new CompoundStatement("all", statements);
-  }
-
-  /**
-   * Groups a collection of statements in an 'any' relationship
-   *
-   * @param statements the collection of statements
-   * @return the statements compounded
-   */
-  public static Statement any(Statement... statements) {
-    return new CompoundStatement("any", statements);
-  }
-
-  /**
-   * Groups a collection of statements in an 'none' relationship
-   *
-   * @param statements the collection of statements
-   * @return the statements compounded
-   */
-  public static Statement none(Statement... statements) {
-    return new CompoundStatement("none", statements);
-  }
-
-  /**
-   * Check the property's existence
-   *
-   * @param key the property key
-   * @return the statement
-   */
-  public static Statement has(String key) {
-    return new SimpleStatement("has", key);
-  }
-
-  /**
-   * Check the property's existence, negated
-   *
-   * @param key the property key
-   * @return the statement
-   */
-  public static Statement notHas(String key) {
-    return new SimpleStatement("!has", key);
-  }
-
-  /**
-   * Check the property equals the given value
-   *
-   * @param key   the property key
-   * @param value the value to check against
-   * @return the statement
-   */
-  public static Statement eq(String key, Object value) {
-    return new SimpleStatement("==", key, value);
-  }
-
-  /**
-   * Check the property does not equals the given value
-   *
-   * @param key   the property key
-   * @param value the value to check against
-   * @return the statement
-   */
-  public static Statement neq(String key, Object value) {
-    return new SimpleStatement("!=", key, value);
-  }
-
-  /**
-   * Check the property exceeds the given value
-   *
-   * @param key   the property key
-   * @param value the value to check against
-   * @return the statement
-   */
-  public static Statement gt(String key, Object value) {
-    return new SimpleStatement(">", key, value);
-  }
-
-  /**
-   * Check the property exceeds or equals the given value
-   *
-   * @param key   the property key
-   * @param value the value to check against
-   * @return the statement
-   */
-  public static Statement gte(String key, Object value) {
-    return new SimpleStatement(">=", key, value);
-  }
-
-  /**
-   * Check the property does not exceeds the given value
-   *
-   * @param key   the property key
-   * @param value the value to check against
-   * @return the statement
-   */
-  public static Statement lt(String key, Object value) {
-    return new SimpleStatement("<", key, value);
-  }
-
-  /**
-   * Check the property equals or does not exceeds the given value
-   *
-   * @param key   the property key
-   * @param value the value to check against
-   * @return the statement
-   */
-  public static Statement lte(String key, Object value) {
-    return new SimpleStatement("<=", key, value);
-  }
-
-  /**
-   * Check the property is within the given set
-   *
-   * @param key    the property key
-   * @param values the set of values to check against
-   * @return the statement
-   */
-  public static Statement in(String key, Object... values) {
-    return new SimpleStatement("in", key, values);
-  }
-
-  /**
-   * Check the property is not within the given set
-   *
-   * @param key    the property key
-   * @param values the set of values to check against
-   * @return the statement
-   */
-  public static Statement notIn(String key, Object... values) {
-    return new SimpleStatement("!in", key, values);
-  }
-
-}
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java
index 6b8fd65def..3603434475 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java
@@ -8,6 +8,7 @@ import android.support.annotation.UiThread;
 
 import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
 
+import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
 
 /**
@@ -71,20 +72,20 @@ public class HeatmapLayer extends Layer {
   /**
    * Set a single filter.
    *
-   * @param filter the filter to set
+   * @param expression the expression filter to set
    */
-  public void setFilter(Filter.Statement filter) {
-    nativeSetFilter(filter.toArray());
+  public void setFilter(Expression expression) {
+    nativeSetFilter(expression.toArray());
   }
 
   /**
    * Set a single filter.
    *
-   * @param filter the filter to set
+   * @param expression the expression filter to set
    * @return This
    */
-  public HeatmapLayer withFilter(Filter.Statement filter) {
-    setFilter(filter);
+  public HeatmapLayer withFilter(Expression expression) {
+    setFilter(expression);
     return this;
   }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java
index 7e3d3a7779..f700c0eacd 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java
@@ -8,6 +8,7 @@ import android.support.annotation.UiThread;
 
 import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
 
+import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
 
 /**
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java
index 5400e04589..40a7429ba9 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java
@@ -70,7 +70,7 @@ public abstract class Layer {
 
   protected native void nativeSetPaintProperty(String name, Object value);
 
-  protected native void nativeSetFilter(Object[] filter);
+  protected native void nativeSetFilter(Object[] expression);
 
   protected native void nativeSetSourceLayer(String sourceLayer);
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java
index ca106cc106..8ec495d18b 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java
@@ -8,6 +8,7 @@ import android.support.annotation.UiThread;
 
 import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
 
+import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
 
 /**
@@ -71,20 +72,20 @@ public class LineLayer extends Layer {
   /**
    * Set a single filter.
    *
-   * @param filter the filter to set
+   * @param expression the expression filter to set
    */
-  public void setFilter(Filter.Statement filter) {
-    nativeSetFilter(filter.toArray());
+  public void setFilter(Expression expression) {
+    nativeSetFilter(expression.toArray());
   }
 
   /**
    * Set a single filter.
    *
-   * @param filter the filter to set
+   * @param expression the expression filter to set
    * @return This
    */
-  public LineLayer withFilter(Filter.Statement filter) {
-    setFilter(filter);
+  public LineLayer withFilter(Expression expression) {
+    setFilter(expression);
     return this;
   }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java
index a0f45535f6..9d9937e427 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java
@@ -8,6 +8,7 @@ import android.support.annotation.UiThread;
 
 import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
 
+import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
 
 /**
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java
index d0fb82dce5..a16aa3fcb6 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java
@@ -8,6 +8,7 @@ import android.support.annotation.UiThread;
 
 import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
 
+import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
 
 /**
@@ -71,20 +72,20 @@ public class SymbolLayer extends Layer {
   /**
    * Set a single filter.
    *
-   * @param filter the filter to set
+   * @param expression the expression filter to set
    */
-  public void setFilter(Filter.Statement filter) {
-    nativeSetFilter(filter.toArray());
+  public void setFilter(Expression expression) {
+    nativeSetFilter(expression.toArray());
   }
 
   /**
    * Set a single filter.
    *
-   * @param filter the filter to set
+   * @param expression the expression filter to set
    * @return This
    */
-  public SymbolLayer withFilter(Filter.Statement filter) {
-    setFilter(filter);
+  public SymbolLayer withFilter(Expression expression) {
+    setFilter(expression);
     return this;
   }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs
index 77fa11808e..7d8ff151a2 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs
@@ -13,6 +13,7 @@ import android.support.annotation.UiThread;
 
 import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
 
+import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
 
 /**
@@ -91,20 +92,20 @@ public class <%- camelize(type) %>Layer extends Layer {
   /**
    * Set a single filter.
    *
-   * @param filter the filter to set
+   * @param expression the expression filter to set
    */
-  public void setFilter(Filter.Statement filter) {
-    nativeSetFilter(filter.toArray());
+  public void setFilter(Expression expression) {
+    nativeSetFilter(expression.toArray());
   }
 
   /**
    * Set a single filter.
    *
-   * @param filter the filter to set
+   * @param expression the expression filter to set
    * @return This
    */
-  public <%- camelize(type) %>Layer withFilter(Filter.Statement filter) {
-    setFilter(filter);
+  public <%- camelize(type) %>Layer withFilter(Expression expression) {
+    setFilter(expression);
     return this;
   }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySource.java
index 1b0999ae2e..dd98455235 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySource.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySource.java
@@ -8,7 +8,7 @@ import android.support.annotation.WorkerThread;
 import com.mapbox.geojson.Feature;
 import com.mapbox.geojson.FeatureCollection;
 import com.mapbox.mapboxsdk.geometry.LatLngBounds;
-import com.mapbox.mapboxsdk.style.layers.Filter;
+import com.mapbox.mapboxsdk.style.expressions.Expression;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
@@ -98,7 +98,7 @@ public class CustomGeometrySource extends Source {
    * @return the features
    */
   @NonNull
-  public List<Feature> querySourceFeatures(@Nullable Filter.Statement filter) {
+  public List<Feature> querySourceFeatures(@Nullable Expression filter) {
     Feature[] features = querySourceFeatures(filter != null ? filter.toArray() : null);
     return features != null ? Arrays.asList(features) : new ArrayList<Feature>();
   }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
index 5c740554cd..3ca7062c40 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
@@ -7,7 +7,7 @@ import android.support.annotation.UiThread;
 import com.mapbox.geojson.Feature;
 import com.mapbox.geojson.FeatureCollection;
 import com.mapbox.geojson.Geometry;
-import com.mapbox.mapboxsdk.style.layers.Filter;
+import com.mapbox.mapboxsdk.style.expressions.Expression;
 
 import java.net.URL;
 import java.util.ArrayList;
@@ -242,7 +242,7 @@ public class GeoJsonSource extends Source {
    * @return the features
    */
   @NonNull
-  public List<Feature> querySourceFeatures(@Nullable Filter.Statement filter) {
+  public List<Feature> querySourceFeatures(@Nullable Expression filter) {
     Feature[] features = querySourceFeatures(filter != null ? filter.toArray() : null);
     return features != null ? Arrays.asList(features) : new ArrayList<Feature>();
   }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java
index 62b08a90ed..a284bb993d 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java
@@ -6,7 +6,7 @@ import android.support.annotation.Size;
 import android.support.annotation.UiThread;
 
 import com.mapbox.geojson.Feature;
-import com.mapbox.mapboxsdk.style.layers.Filter;
+import com.mapbox.mapboxsdk.style.expressions.Expression;
 
 import java.net.URL;
 import java.util.ArrayList;
@@ -69,7 +69,7 @@ public class VectorSource extends Source {
    */
   @NonNull
   public List<Feature> querySourceFeatures(@Size(min = 1) String[] sourceLayerIds,
-                                           @Nullable Filter.Statement filter) {
+                                           @Nullable Expression filter) {
     Feature[] features = querySourceFeatures(
       sourceLayerIds,
       filter != null ? filter.toArray() : null);