1 files changed, 5 insertions, 26 deletions

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 730471190c..796f6a28bb 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
@@ -62,7 +62,6 @@ public class HeatmapLayer extends Layer {
    * @param sourceLayer the source layer to set
    * @return This
    */
-  @NonNull
   public HeatmapLayer withSourceLayer(String sourceLayer) {
     setSourceLayer(sourceLayer);
     return this;
@@ -73,7 +72,6 @@ public class HeatmapLayer extends Layer {
    *
    * @return id of the source
    */
-  @NonNull
   public String getSourceId() {
     checkThread();
     return nativeGetSourceId();
@@ -84,7 +82,6 @@ public class HeatmapLayer extends Layer {
    *
    * @return sourceLayer the source layer to get
    */
-  @NonNull
   public String getSourceLayer() {
     checkThread();
     return nativeGetSourceLayer();
@@ -95,7 +92,7 @@ public class HeatmapLayer 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 HeatmapLayer extends Layer {
    * @param filter the expression filter to set
    * @return This
    */
-  @NonNull
-  public HeatmapLayer withFilter(@NonNull Expression filter) {
+  public HeatmapLayer withFilter(Expression filter) {
     setFilter(filter);
     return this;
   }
@@ -134,7 +130,6 @@ public class HeatmapLayer extends Layer {
    * @param properties the var-args properties
    * @return This
    */
-  @NonNull
   public HeatmapLayer withProperties(@NonNull PropertyValue<?>... properties) {
     setProperties(properties);
     return this;
@@ -147,7 +142,6 @@ public class HeatmapLayer extends Layer {
    *
    * @return property wrapper value around Float
    */
-  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getHeatmapRadius() {
     checkThread();
@@ -159,7 +153,6 @@ public class HeatmapLayer extends Layer {
    *
    * @return transition options for Float
    */
-  @NonNull
   public TransitionOptions getHeatmapRadiusTransition() {
     checkThread();
     return nativeGetHeatmapRadiusTransition();
@@ -170,7 +163,7 @@ public class HeatmapLayer extends Layer {
    *
    * @param options transition options for Float
    */
-  public void setHeatmapRadiusTransition(@NonNull TransitionOptions options) {
+  public void setHeatmapRadiusTransition(TransitionOptions options) {
     checkThread();
     nativeSetHeatmapRadiusTransition(options.getDuration(), options.getDelay());
   }
@@ -180,7 +173,6 @@ public class HeatmapLayer extends Layer {
    *
    * @return property wrapper value around Float
    */
-  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getHeatmapWeight() {
     checkThread();
@@ -192,7 +184,6 @@ public class HeatmapLayer extends Layer {
    *
    * @return property wrapper value around Float
    */
-  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getHeatmapIntensity() {
     checkThread();
@@ -204,7 +195,6 @@ public class HeatmapLayer extends Layer {
    *
    * @return transition options for Float
    */
-  @NonNull
   public TransitionOptions getHeatmapIntensityTransition() {
     checkThread();
     return nativeGetHeatmapIntensityTransition();
@@ -215,7 +205,7 @@ public class HeatmapLayer extends Layer {
    *
    * @param options transition options for Float
    */
-  public void setHeatmapIntensityTransition(@NonNull TransitionOptions options) {
+  public void setHeatmapIntensityTransition(TransitionOptions options) {
     checkThread();
     nativeSetHeatmapIntensityTransition(options.getDuration(), options.getDelay());
   }
@@ -225,7 +215,6 @@ public class HeatmapLayer extends Layer {
    *
    * @return property wrapper value around String
    */
-  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getHeatmapColor() {
     checkThread();
@@ -254,7 +243,6 @@ public class HeatmapLayer extends Layer {
    *
    * @return property wrapper value around Float
    */
-  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getHeatmapOpacity() {
     checkThread();
@@ -266,7 +254,6 @@ public class HeatmapLayer extends Layer {
    *
    * @return transition options for Float
    */
-  @NonNull
   public TransitionOptions getHeatmapOpacityTransition() {
     checkThread();
     return nativeGetHeatmapOpacityTransition();
@@ -277,46 +264,38 @@ public class HeatmapLayer extends Layer {
    *
    * @param options transition options for Float
    */
-  public void setHeatmapOpacityTransition(@NonNull TransitionOptions options) {
+  public void setHeatmapOpacityTransition(TransitionOptions options) {
     checkThread();
     nativeSetHeatmapOpacityTransition(options.getDuration(), options.getDelay());
   }
 
-  @NonNull
   @Keep
   private native Object nativeGetHeatmapRadius();
 
-  @NonNull
   @Keep
   private native TransitionOptions nativeGetHeatmapRadiusTransition();
 
   @Keep
   private native void nativeSetHeatmapRadiusTransition(long duration, long delay);
 
-  @NonNull
   @Keep
   private native Object nativeGetHeatmapWeight();
 
-  @NonNull
   @Keep
   private native Object nativeGetHeatmapIntensity();
 
-  @NonNull
   @Keep
   private native TransitionOptions nativeGetHeatmapIntensityTransition();
 
   @Keep
   private native void nativeSetHeatmapIntensityTransition(long duration, long delay);
 
-  @NonNull
   @Keep
   private native Object nativeGetHeatmapColor();
 
-  @NonNull
   @Keep
   private native Object nativeGetHeatmapOpacity();
 
-  @NonNull
   @Keep
   private native TransitionOptions nativeGetHeatmapOpacityTransition();