1 files changed, 39 insertions, 8 deletions

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 339b25b3f7..864d1d5a20 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
@@ -62,6 +62,7 @@ public class FillExtrusionLayer extends Layer {
    * @param sourceLayer the source layer to set
    * @return This
    */
+  @NonNull
   public FillExtrusionLayer withSourceLayer(String sourceLayer) {
     setSourceLayer(sourceLayer);
     return this;
@@ -72,6 +73,7 @@ public class FillExtrusionLayer extends Layer {
    *
    * @return id of the source
    */
+  @NonNull
   public String getSourceId() {
     checkThread();
     return nativeGetSourceId();
@@ -82,6 +84,7 @@ public class FillExtrusionLayer extends Layer {
    *
    * @return sourceLayer the source layer to get
    */
+  @NonNull
   public String getSourceLayer() {
     checkThread();
     return nativeGetSourceLayer();
@@ -92,7 +95,7 @@ public class FillExtrusionLayer extends Layer {
    *
    * @param filter the expression filter to set
    */
-  public void setFilter(Expression filter) {
+  public void setFilter(@NonNull Expression filter) {
     checkThread();
     nativeSetFilter(filter.toArray());
   }
@@ -103,7 +106,8 @@ public class FillExtrusionLayer extends Layer {
    * @param filter the expression filter to set
    * @return This
    */
-  public FillExtrusionLayer withFilter(Expression filter) {
+  @NonNull
+  public FillExtrusionLayer withFilter(@NonNull Expression filter) {
     setFilter(filter);
     return this;
   }
@@ -130,6 +134,7 @@ public class FillExtrusionLayer extends Layer {
    * @param properties the var-args properties
    * @return This
    */
+  @NonNull
   public FillExtrusionLayer withProperties(@NonNull PropertyValue<?>... properties) {
     setProperties(properties);
     return this;
@@ -142,6 +147,7 @@ public class FillExtrusionLayer extends Layer {
    *
    * @return property wrapper value around Float
    */
+  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getFillExtrusionOpacity() {
     checkThread();
@@ -153,6 +159,7 @@ public class FillExtrusionLayer extends Layer {
    *
    * @return transition options for Float
    */
+  @NonNull
   public TransitionOptions getFillExtrusionOpacityTransition() {
     checkThread();
     return nativeGetFillExtrusionOpacityTransition();
@@ -163,7 +170,7 @@ public class FillExtrusionLayer extends Layer {
    *
    * @param options transition options for Float
    */
-  public void setFillExtrusionOpacityTransition(TransitionOptions options) {
+  public void setFillExtrusionOpacityTransition(@NonNull TransitionOptions options) {
     checkThread();
     nativeSetFillExtrusionOpacityTransition(options.getDuration(), options.getDelay());
   }
@@ -173,6 +180,7 @@ public class FillExtrusionLayer extends Layer {
    *
    * @return property wrapper value around String
    */
+  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getFillExtrusionColor() {
     checkThread();
@@ -201,6 +209,7 @@ public class FillExtrusionLayer extends Layer {
    *
    * @return transition options for String
    */
+  @NonNull
   public TransitionOptions getFillExtrusionColorTransition() {
     checkThread();
     return nativeGetFillExtrusionColorTransition();
@@ -211,7 +220,7 @@ public class FillExtrusionLayer extends Layer {
    *
    * @param options transition options for String
    */
-  public void setFillExtrusionColorTransition(TransitionOptions options) {
+  public void setFillExtrusionColorTransition(@NonNull TransitionOptions options) {
     checkThread();
     nativeSetFillExtrusionColorTransition(options.getDuration(), options.getDelay());
   }
@@ -221,6 +230,7 @@ public class FillExtrusionLayer extends Layer {
    *
    * @return property wrapper value around Float[]
    */
+  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<Float[]> getFillExtrusionTranslate() {
     checkThread();
@@ -232,6 +242,7 @@ public class FillExtrusionLayer extends Layer {
    *
    * @return transition options for Float[]
    */
+  @NonNull
   public TransitionOptions getFillExtrusionTranslateTransition() {
     checkThread();
     return nativeGetFillExtrusionTranslateTransition();
@@ -242,7 +253,7 @@ public class FillExtrusionLayer extends Layer {
    *
    * @param options transition options for Float[]
    */
-  public void setFillExtrusionTranslateTransition(TransitionOptions options) {
+  public void setFillExtrusionTranslateTransition(@NonNull TransitionOptions options) {
     checkThread();
     nativeSetFillExtrusionTranslateTransition(options.getDuration(), options.getDelay());
   }
@@ -252,6 +263,7 @@ public class FillExtrusionLayer extends Layer {
    *
    * @return property wrapper value around String
    */
+  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getFillExtrusionTranslateAnchor() {
     checkThread();
@@ -263,6 +275,7 @@ public class FillExtrusionLayer extends Layer {
    *
    * @return property wrapper value around String
    */
+  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getFillExtrusionPattern() {
     checkThread();
@@ -274,6 +287,7 @@ public class FillExtrusionLayer extends Layer {
    *
    * @return transition options for String
    */
+  @NonNull
   public TransitionOptions getFillExtrusionPatternTransition() {
     checkThread();
     return nativeGetFillExtrusionPatternTransition();
@@ -284,7 +298,7 @@ public class FillExtrusionLayer extends Layer {
    *
    * @param options transition options for String
    */
-  public void setFillExtrusionPatternTransition(TransitionOptions options) {
+  public void setFillExtrusionPatternTransition(@NonNull TransitionOptions options) {
     checkThread();
     nativeSetFillExtrusionPatternTransition(options.getDuration(), options.getDelay());
   }
@@ -294,6 +308,7 @@ public class FillExtrusionLayer extends Layer {
    *
    * @return property wrapper value around Float
    */
+  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getFillExtrusionHeight() {
     checkThread();
@@ -305,6 +320,7 @@ public class FillExtrusionLayer extends Layer {
    *
    * @return transition options for Float
    */
+  @NonNull
   public TransitionOptions getFillExtrusionHeightTransition() {
     checkThread();
     return nativeGetFillExtrusionHeightTransition();
@@ -315,7 +331,7 @@ public class FillExtrusionLayer extends Layer {
    *
    * @param options transition options for Float
    */
-  public void setFillExtrusionHeightTransition(TransitionOptions options) {
+  public void setFillExtrusionHeightTransition(@NonNull TransitionOptions options) {
     checkThread();
     nativeSetFillExtrusionHeightTransition(options.getDuration(), options.getDelay());
   }
@@ -325,6 +341,7 @@ public class FillExtrusionLayer extends Layer {
    *
    * @return property wrapper value around Float
    */
+  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getFillExtrusionBase() {
     checkThread();
@@ -336,6 +353,7 @@ public class FillExtrusionLayer extends Layer {
    *
    * @return transition options for Float
    */
+  @NonNull
   public TransitionOptions getFillExtrusionBaseTransition() {
     checkThread();
     return nativeGetFillExtrusionBaseTransition();
@@ -346,62 +364,75 @@ public class FillExtrusionLayer extends Layer {
    *
    * @param options transition options for Float
    */
-  public void setFillExtrusionBaseTransition(TransitionOptions options) {
+  public void setFillExtrusionBaseTransition(@NonNull TransitionOptions options) {
     checkThread();
     nativeSetFillExtrusionBaseTransition(options.getDuration(), options.getDelay());
   }
 
+  @NonNull
   @Keep
   private native Object nativeGetFillExtrusionOpacity();
 
+  @NonNull
   @Keep
   private native TransitionOptions nativeGetFillExtrusionOpacityTransition();
 
   @Keep
   private native void nativeSetFillExtrusionOpacityTransition(long duration, long delay);
 
+  @NonNull
   @Keep
   private native Object nativeGetFillExtrusionColor();
 
+  @NonNull
   @Keep
   private native TransitionOptions nativeGetFillExtrusionColorTransition();
 
   @Keep
   private native void nativeSetFillExtrusionColorTransition(long duration, long delay);
 
+  @NonNull
   @Keep
   private native Object nativeGetFillExtrusionTranslate();
 
+  @NonNull
   @Keep
   private native TransitionOptions nativeGetFillExtrusionTranslateTransition();
 
   @Keep
   private native void nativeSetFillExtrusionTranslateTransition(long duration, long delay);
 
+  @NonNull
   @Keep
   private native Object nativeGetFillExtrusionTranslateAnchor();
 
+  @NonNull
   @Keep
   private native Object nativeGetFillExtrusionPattern();
 
+  @NonNull
   @Keep
   private native TransitionOptions nativeGetFillExtrusionPatternTransition();
 
   @Keep
   private native void nativeSetFillExtrusionPatternTransition(long duration, long delay);
 
+  @NonNull
   @Keep
   private native Object nativeGetFillExtrusionHeight();
 
+  @NonNull
   @Keep
   private native TransitionOptions nativeGetFillExtrusionHeightTransition();
 
   @Keep
   private native void nativeSetFillExtrusionHeightTransition(long duration, long delay);
 
+  @NonNull
   @Keep
   private native Object nativeGetFillExtrusionBase();
 
+  @NonNull
   @Keep
   private native TransitionOptions nativeGetFillExtrusionBaseTransition();