1 files changed, 53 insertions, 10 deletions

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 4718adc5c1..76f7b2f9fa 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
@@ -62,6 +62,7 @@ public class CircleLayer extends Layer {
    * @param sourceLayer the source layer to set
    * @return This
    */
+  @NonNull
   public CircleLayer withSourceLayer(String sourceLayer) {
     setSourceLayer(sourceLayer);
     return this;
@@ -72,6 +73,7 @@ public class CircleLayer extends Layer {
    *
    * @return id of the source
    */
+  @NonNull
   public String getSourceId() {
     checkThread();
     return nativeGetSourceId();
@@ -82,6 +84,7 @@ public class CircleLayer extends Layer {
    *
    * @return sourceLayer the source layer to get
    */
+  @NonNull
   public String getSourceLayer() {
     checkThread();
     return nativeGetSourceLayer();
@@ -92,7 +95,7 @@ public class CircleLayer 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 CircleLayer extends Layer {
    * @param filter the expression filter to set
    * @return This
    */
-  public CircleLayer withFilter(Expression filter) {
+  @NonNull
+  public CircleLayer withFilter(@NonNull Expression filter) {
     setFilter(filter);
     return this;
   }
@@ -130,6 +134,7 @@ public class CircleLayer extends Layer {
    * @param properties the var-args properties
    * @return This
    */
+  @NonNull
   public CircleLayer withProperties(@NonNull PropertyValue<?>... properties) {
     setProperties(properties);
     return this;
@@ -142,6 +147,7 @@ public class CircleLayer extends Layer {
    *
    * @return property wrapper value around Float
    */
+  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getCircleRadius() {
     checkThread();
@@ -153,6 +159,7 @@ public class CircleLayer extends Layer {
    *
    * @return transition options for Float
    */
+  @NonNull
   public TransitionOptions getCircleRadiusTransition() {
     checkThread();
     return nativeGetCircleRadiusTransition();
@@ -163,7 +170,7 @@ public class CircleLayer extends Layer {
    *
    * @param options transition options for Float
    */
-  public void setCircleRadiusTransition(TransitionOptions options) {
+  public void setCircleRadiusTransition(@NonNull TransitionOptions options) {
     checkThread();
     nativeSetCircleRadiusTransition(options.getDuration(), options.getDelay());
   }
@@ -173,6 +180,7 @@ public class CircleLayer extends Layer {
    *
    * @return property wrapper value around String
    */
+  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getCircleColor() {
     checkThread();
@@ -201,6 +209,7 @@ public class CircleLayer extends Layer {
    *
    * @return transition options for String
    */
+  @NonNull
   public TransitionOptions getCircleColorTransition() {
     checkThread();
     return nativeGetCircleColorTransition();
@@ -211,7 +220,7 @@ public class CircleLayer extends Layer {
    *
    * @param options transition options for String
    */
-  public void setCircleColorTransition(TransitionOptions options) {
+  public void setCircleColorTransition(@NonNull TransitionOptions options) {
     checkThread();
     nativeSetCircleColorTransition(options.getDuration(), options.getDelay());
   }
@@ -221,6 +230,7 @@ public class CircleLayer extends Layer {
    *
    * @return property wrapper value around Float
    */
+  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getCircleBlur() {
     checkThread();
@@ -232,6 +242,7 @@ public class CircleLayer extends Layer {
    *
    * @return transition options for Float
    */
+  @NonNull
   public TransitionOptions getCircleBlurTransition() {
     checkThread();
     return nativeGetCircleBlurTransition();
@@ -242,7 +253,7 @@ public class CircleLayer extends Layer {
    *
    * @param options transition options for Float
    */
-  public void setCircleBlurTransition(TransitionOptions options) {
+  public void setCircleBlurTransition(@NonNull TransitionOptions options) {
     checkThread();
     nativeSetCircleBlurTransition(options.getDuration(), options.getDelay());
   }
@@ -252,6 +263,7 @@ public class CircleLayer extends Layer {
    *
    * @return property wrapper value around Float
    */
+  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getCircleOpacity() {
     checkThread();
@@ -263,6 +275,7 @@ public class CircleLayer extends Layer {
    *
    * @return transition options for Float
    */
+  @NonNull
   public TransitionOptions getCircleOpacityTransition() {
     checkThread();
     return nativeGetCircleOpacityTransition();
@@ -273,7 +286,7 @@ public class CircleLayer extends Layer {
    *
    * @param options transition options for Float
    */
-  public void setCircleOpacityTransition(TransitionOptions options) {
+  public void setCircleOpacityTransition(@NonNull TransitionOptions options) {
     checkThread();
     nativeSetCircleOpacityTransition(options.getDuration(), options.getDelay());
   }
@@ -283,6 +296,7 @@ public class CircleLayer extends Layer {
    *
    * @return property wrapper value around Float[]
    */
+  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<Float[]> getCircleTranslate() {
     checkThread();
@@ -294,6 +308,7 @@ public class CircleLayer extends Layer {
    *
    * @return transition options for Float[]
    */
+  @NonNull
   public TransitionOptions getCircleTranslateTransition() {
     checkThread();
     return nativeGetCircleTranslateTransition();
@@ -304,7 +319,7 @@ public class CircleLayer extends Layer {
    *
    * @param options transition options for Float[]
    */
-  public void setCircleTranslateTransition(TransitionOptions options) {
+  public void setCircleTranslateTransition(@NonNull TransitionOptions options) {
     checkThread();
     nativeSetCircleTranslateTransition(options.getDuration(), options.getDelay());
   }
@@ -314,6 +329,7 @@ public class CircleLayer extends Layer {
    *
    * @return property wrapper value around String
    */
+  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getCircleTranslateAnchor() {
     checkThread();
@@ -325,6 +341,7 @@ public class CircleLayer extends Layer {
    *
    * @return property wrapper value around String
    */
+  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getCirclePitchScale() {
     checkThread();
@@ -336,6 +353,7 @@ public class CircleLayer extends Layer {
    *
    * @return property wrapper value around String
    */
+  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getCirclePitchAlignment() {
     checkThread();
@@ -347,6 +365,7 @@ public class CircleLayer extends Layer {
    *
    * @return property wrapper value around Float
    */
+  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getCircleStrokeWidth() {
     checkThread();
@@ -358,6 +377,7 @@ public class CircleLayer extends Layer {
    *
    * @return transition options for Float
    */
+  @NonNull
   public TransitionOptions getCircleStrokeWidthTransition() {
     checkThread();
     return nativeGetCircleStrokeWidthTransition();
@@ -368,7 +388,7 @@ public class CircleLayer extends Layer {
    *
    * @param options transition options for Float
    */
-  public void setCircleStrokeWidthTransition(TransitionOptions options) {
+  public void setCircleStrokeWidthTransition(@NonNull TransitionOptions options) {
     checkThread();
     nativeSetCircleStrokeWidthTransition(options.getDuration(), options.getDelay());
   }
@@ -378,6 +398,7 @@ public class CircleLayer extends Layer {
    *
    * @return property wrapper value around String
    */
+  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getCircleStrokeColor() {
     checkThread();
@@ -406,6 +427,7 @@ public class CircleLayer extends Layer {
    *
    * @return transition options for String
    */
+  @NonNull
   public TransitionOptions getCircleStrokeColorTransition() {
     checkThread();
     return nativeGetCircleStrokeColorTransition();
@@ -416,7 +438,7 @@ public class CircleLayer extends Layer {
    *
    * @param options transition options for String
    */
-  public void setCircleStrokeColorTransition(TransitionOptions options) {
+  public void setCircleStrokeColorTransition(@NonNull TransitionOptions options) {
     checkThread();
     nativeSetCircleStrokeColorTransition(options.getDuration(), options.getDelay());
   }
@@ -426,6 +448,7 @@ public class CircleLayer extends Layer {
    *
    * @return property wrapper value around Float
    */
+  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getCircleStrokeOpacity() {
     checkThread();
@@ -437,6 +460,7 @@ public class CircleLayer extends Layer {
    *
    * @return transition options for Float
    */
+  @NonNull
   public TransitionOptions getCircleStrokeOpacityTransition() {
     checkThread();
     return nativeGetCircleStrokeOpacityTransition();
@@ -447,86 +471,105 @@ public class CircleLayer extends Layer {
    *
    * @param options transition options for Float
    */
-  public void setCircleStrokeOpacityTransition(TransitionOptions options) {
+  public void setCircleStrokeOpacityTransition(@NonNull TransitionOptions options) {
     checkThread();
     nativeSetCircleStrokeOpacityTransition(options.getDuration(), options.getDelay());
   }
 
+  @NonNull
   @Keep
   private native Object nativeGetCircleRadius();
 
+  @NonNull
   @Keep
   private native TransitionOptions nativeGetCircleRadiusTransition();
 
   @Keep
   private native void nativeSetCircleRadiusTransition(long duration, long delay);
 
+  @NonNull
   @Keep
   private native Object nativeGetCircleColor();
 
+  @NonNull
   @Keep
   private native TransitionOptions nativeGetCircleColorTransition();
 
   @Keep
   private native void nativeSetCircleColorTransition(long duration, long delay);
 
+  @NonNull
   @Keep
   private native Object nativeGetCircleBlur();
 
+  @NonNull
   @Keep
   private native TransitionOptions nativeGetCircleBlurTransition();
 
   @Keep
   private native void nativeSetCircleBlurTransition(long duration, long delay);
 
+  @NonNull
   @Keep
   private native Object nativeGetCircleOpacity();
 
+  @NonNull
   @Keep
   private native TransitionOptions nativeGetCircleOpacityTransition();
 
   @Keep
   private native void nativeSetCircleOpacityTransition(long duration, long delay);
 
+  @NonNull
   @Keep
   private native Object nativeGetCircleTranslate();
 
+  @NonNull
   @Keep
   private native TransitionOptions nativeGetCircleTranslateTransition();
 
   @Keep
   private native void nativeSetCircleTranslateTransition(long duration, long delay);
 
+  @NonNull
   @Keep
   private native Object nativeGetCircleTranslateAnchor();
 
+  @NonNull
   @Keep
   private native Object nativeGetCirclePitchScale();
 
+  @NonNull
   @Keep
   private native Object nativeGetCirclePitchAlignment();
 
+  @NonNull
   @Keep
   private native Object nativeGetCircleStrokeWidth();
 
+  @NonNull
   @Keep
   private native TransitionOptions nativeGetCircleStrokeWidthTransition();
 
   @Keep
   private native void nativeSetCircleStrokeWidthTransition(long duration, long delay);
 
+  @NonNull
   @Keep
   private native Object nativeGetCircleStrokeColor();
 
+  @NonNull
   @Keep
   private native TransitionOptions nativeGetCircleStrokeColorTransition();
 
   @Keep
   private native void nativeSetCircleStrokeColorTransition(long duration, long delay);
 
+  @NonNull
   @Keep
   private native Object nativeGetCircleStrokeOpacity();
 
+  @NonNull
   @Keep
   private native TransitionOptions nativeGetCircleStrokeOpacityTransition();