1 files changed, 13 insertions, 3 deletions
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 0e6cad78f6..d145208268 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
@@ -86,6 +86,7 @@ public class <%- camelize(type) %>Layer extends Layer {
    * @param sourceLayer the source layer to set
    * @return This
    */
+  @NonNull
   public <%- camelize(type) %>Layer withSourceLayer(String sourceLayer) {
     setSourceLayer(sourceLayer);
     return this;
@@ -98,6 +99,7 @@ public class <%- camelize(type) %>Layer extends Layer {
    *
    * @return id of the source
    */
+  @NonNull
   public String getSourceId() {
     checkThread();
     return nativeGetSourceId();
@@ -110,6 +112,7 @@ public class <%- camelize(type) %>Layer extends Layer {
    *
    * @return sourceLayer the source layer to get
    */
+  @NonNull
   public String getSourceLayer() {
     checkThread();
     return nativeGetSourceLayer();
@@ -120,7 +123,7 @@ public class <%- camelize(type) %>Layer extends Layer {
    *
    * @param filter the expression filter to set
    */
-  public void setFilter(Expression filter) {
+  public void setFilter(@NonNull Expression filter) {
     checkThread();
     nativeSetFilter(filter.toArray());
   }
@@ -131,7 +134,8 @@ public class <%- camelize(type) %>Layer extends Layer {
    * @param filter the expression filter to set
    * @return This
    */
-  public <%- camelize(type) %>Layer withFilter(Expression filter) {
+  @NonNull
+  public <%- camelize(type) %>Layer withFilter(@NonNull Expression filter) {
     setFilter(filter);
     return this;
   }
@@ -159,6 +163,7 @@ public class <%- camelize(type) %>Layer extends Layer {
    * @param properties the var-args properties
    * @return This
    */
+  @NonNull
   public <%- camelize(type) %>Layer withProperties(@NonNull PropertyValue<?>... properties) {
     setProperties(properties);
     return this;
@@ -172,6 +177,7 @@ public class <%- camelize(type) %>Layer extends Layer {
    *
    * @return property wrapper value around <%- propertyType(property) %>
    */
+  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<<%- propertyType(property) %>> get<%- camelize(property.name) %>() {
     checkThread();
@@ -201,6 +207,7 @@ public class <%- camelize(type) %>Layer extends Layer {
    * @return property wrapper value around <%- propertyType(property) %>
    * @see Expression#format(Expression.FormatEntry...)
    */
+  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<Formatted> getFormatted<%- camelize(property.name) %>() {
     checkThread();
@@ -233,6 +240,7 @@ public class <%- camelize(type) %>Layer extends Layer {
    *
    * @return transition options for <%- propertyType(property) %>
    */
+  @NonNull
   public TransitionOptions get<%- camelize(property.name) %>Transition() {
     checkThread();
     return nativeGet<%- camelize(property.name) %>Transition();
@@ -243,7 +251,7 @@ public class <%- camelize(type) %>Layer extends Layer {
    *
    * @param options transition options for <%- propertyType(property) %>
    */
-  public void set<%- camelize(property.name) %>Transition(TransitionOptions options) {
+  public void set<%- camelize(property.name) %>Transition(@NonNull TransitionOptions options) {
     checkThread();
     nativeSet<%- camelize(property.name) %>Transition(options.getDuration(), options.getDelay());
   }
@@ -251,10 +259,12 @@ public class <%- camelize(type) %>Layer extends Layer {
 <% } -%>
 
 <% for (const property of properties) { -%>
+  @NonNull
   @Keep
   private native Object nativeGet<%- camelize(property.name) %>();
 
 <% if (property.transition) { -%>
+  @NonNull
   @Keep
   private native TransitionOptions nativeGet<%- camelize(property.name) %>Transition();