1 files changed, 7 insertions, 36 deletions
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 14c80c044c..295ffd3963 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
@@ -62,7 +62,6 @@ public class FillLayer extends Layer {
    * @param sourceLayer the source layer to set
    * @return This
    */
-  @NonNull
   public FillLayer withSourceLayer(String sourceLayer) {
     setSourceLayer(sourceLayer);
     return this;
@@ -73,7 +72,6 @@ public class FillLayer extends Layer {
    *
    * @return id of the source
    */
-  @NonNull
   public String getSourceId() {
     checkThread();
     return nativeGetSourceId();
@@ -84,7 +82,6 @@ public class FillLayer extends Layer {
    *
    * @return sourceLayer the source layer to get
    */
-  @NonNull
   public String getSourceLayer() {
     checkThread();
     return nativeGetSourceLayer();
@@ -95,7 +92,7 @@ public class FillLayer extends Layer {
    *
    * @param filter the expression filter to set
    */
-  public void setFilter(@NonNull Expression filter) {
+  public void setFilter(Expression filter) {
     checkThread();
     nativeSetFilter(filter.toArray());
   }
@@ -106,8 +103,7 @@ public class FillLayer extends Layer {
    * @param filter the expression filter to set
    * @return This
    */
-  @NonNull
-  public FillLayer withFilter(@NonNull Expression filter) {
+  public FillLayer withFilter(Expression filter) {
     setFilter(filter);
     return this;
   }
@@ -134,7 +130,6 @@ public class FillLayer extends Layer {
    * @param properties the var-args properties
    * @return This
    */
-  @NonNull
   public FillLayer withProperties(@NonNull PropertyValue<?>... properties) {
     setProperties(properties);
     return this;
@@ -147,7 +142,6 @@ public class FillLayer extends Layer {
    *
    * @return property wrapper value around Boolean
    */
-  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<Boolean> getFillAntialias() {
     checkThread();
@@ -159,7 +153,6 @@ public class FillLayer extends Layer {
    *
    * @return property wrapper value around Float
    */
-  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getFillOpacity() {
     checkThread();
@@ -171,7 +164,6 @@ public class FillLayer extends Layer {
    *
    * @return transition options for Float
    */
-  @NonNull
   public TransitionOptions getFillOpacityTransition() {
     checkThread();
     return nativeGetFillOpacityTransition();
@@ -182,7 +174,7 @@ public class FillLayer extends Layer {
    *
    * @param options transition options for Float
    */
-  public void setFillOpacityTransition(@NonNull TransitionOptions options) {
+  public void setFillOpacityTransition(TransitionOptions options) {
     checkThread();
     nativeSetFillOpacityTransition(options.getDuration(), options.getDelay());
   }
@@ -192,7 +184,6 @@ public class FillLayer extends Layer {
    *
    * @return property wrapper value around String
    */
-  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getFillColor() {
     checkThread();
@@ -221,7 +212,6 @@ public class FillLayer extends Layer {
    *
    * @return transition options for String
    */
-  @NonNull
   public TransitionOptions getFillColorTransition() {
     checkThread();
     return nativeGetFillColorTransition();
@@ -232,7 +222,7 @@ public class FillLayer extends Layer {
    *
    * @param options transition options for String
    */
-  public void setFillColorTransition(@NonNull TransitionOptions options) {
+  public void setFillColorTransition(TransitionOptions options) {
     checkThread();
     nativeSetFillColorTransition(options.getDuration(), options.getDelay());
   }
@@ -242,7 +232,6 @@ public class FillLayer extends Layer {
    *
    * @return property wrapper value around String
    */
-  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getFillOutlineColor() {
     checkThread();
@@ -271,7 +260,6 @@ public class FillLayer extends Layer {
    *
    * @return transition options for String
    */
-  @NonNull
   public TransitionOptions getFillOutlineColorTransition() {
     checkThread();
     return nativeGetFillOutlineColorTransition();
@@ -282,7 +270,7 @@ public class FillLayer extends Layer {
    *
    * @param options transition options for String
    */
-  public void setFillOutlineColorTransition(@NonNull TransitionOptions options) {
+  public void setFillOutlineColorTransition(TransitionOptions options) {
     checkThread();
     nativeSetFillOutlineColorTransition(options.getDuration(), options.getDelay());
   }
@@ -292,7 +280,6 @@ public class FillLayer extends Layer {
    *
    * @return property wrapper value around Float[]
    */
-  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<Float[]> getFillTranslate() {
     checkThread();
@@ -304,7 +291,6 @@ public class FillLayer extends Layer {
    *
    * @return transition options for Float[]
    */
-  @NonNull
   public TransitionOptions getFillTranslateTransition() {
     checkThread();
     return nativeGetFillTranslateTransition();
@@ -315,7 +301,7 @@ public class FillLayer extends Layer {
    *
    * @param options transition options for Float[]
    */
-  public void setFillTranslateTransition(@NonNull TransitionOptions options) {
+  public void setFillTranslateTransition(TransitionOptions options) {
     checkThread();
     nativeSetFillTranslateTransition(options.getDuration(), options.getDelay());
   }
@@ -325,7 +311,6 @@ public class FillLayer extends Layer {
    *
    * @return property wrapper value around String
    */
-  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getFillTranslateAnchor() {
     checkThread();
@@ -337,7 +322,6 @@ public class FillLayer extends Layer {
    *
    * @return property wrapper value around String
    */
-  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getFillPattern() {
     checkThread();
@@ -349,7 +333,6 @@ public class FillLayer extends Layer {
    *
    * @return transition options for String
    */
-  @NonNull
   public TransitionOptions getFillPatternTransition() {
     checkThread();
     return nativeGetFillPatternTransition();
@@ -360,68 +343,56 @@ public class FillLayer extends Layer {
    *
    * @param options transition options for String
    */
-  public void setFillPatternTransition(@NonNull TransitionOptions options) {
+  public void setFillPatternTransition(TransitionOptions options) {
     checkThread();
     nativeSetFillPatternTransition(options.getDuration(), options.getDelay());
   }
 
-  @NonNull
   @Keep
   private native Object nativeGetFillAntialias();
 
-  @NonNull
   @Keep
   private native Object nativeGetFillOpacity();
 
-  @NonNull
   @Keep
   private native TransitionOptions nativeGetFillOpacityTransition();
 
   @Keep
   private native void nativeSetFillOpacityTransition(long duration, long delay);
 
-  @NonNull
   @Keep
   private native Object nativeGetFillColor();
 
-  @NonNull
   @Keep
   private native TransitionOptions nativeGetFillColorTransition();
 
   @Keep
   private native void nativeSetFillColorTransition(long duration, long delay);
 
-  @NonNull
   @Keep
   private native Object nativeGetFillOutlineColor();
 
-  @NonNull
   @Keep
   private native TransitionOptions nativeGetFillOutlineColorTransition();
 
   @Keep
   private native void nativeSetFillOutlineColorTransition(long duration, long delay);
 
-  @NonNull
   @Keep
   private native Object nativeGetFillTranslate();
 
-  @NonNull
   @Keep
   private native TransitionOptions nativeGetFillTranslateTransition();
 
   @Keep
   private native void nativeSetFillTranslateTransition(long duration, long delay);
 
-  @NonNull
   @Keep
   private native Object nativeGetFillTranslateAnchor();
 
-  @NonNull
   @Keep
   private native Object nativeGetFillPattern();
 
-  @NonNull
   @Keep
   private native TransitionOptions nativeGetFillPatternTransition();