From 83ac1152757dfda0964383ac0fed6d87cd188b6d Mon Sep 17 00:00:00 2001
From: tobrun <tobrun.van.nuland@gmail.com>
Date: Mon, 22 Oct 2018 14:02:44 +0200
Subject: Revert "[android] - infer nullity"

This reverts commit 617742710852a5a958a13f2b659f8c307973e49d.
---
 .../mapboxsdk/style/layers/HillshadeLayer.java     | 31 +++-------------------
 1 file changed, 4 insertions(+), 27 deletions(-)

(limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java')

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java
index 22df96f2c6..d548d2c9f6 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java
@@ -62,7 +62,6 @@ public class HillshadeLayer extends Layer {
    * @param sourceLayer the source layer to set
    * @return This
    */
-  @NonNull
   public HillshadeLayer withSourceLayer(String sourceLayer) {
     setSourceLayer(sourceLayer);
     return this;
@@ -73,7 +72,6 @@ public class HillshadeLayer extends Layer {
    *
    * @return id of the source
    */
-  @NonNull
   public String getSourceId() {
     checkThread();
     return nativeGetSourceId();
@@ -85,7 +83,6 @@ public class HillshadeLayer extends Layer {
    * @param properties the var-args properties
    * @return This
    */
-  @NonNull
   public HillshadeLayer withProperties(@NonNull PropertyValue<?>... properties) {
     setProperties(properties);
     return this;
@@ -98,7 +95,6 @@ public class HillshadeLayer extends Layer {
    *
    * @return property wrapper value around Float
    */
-  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getHillshadeIlluminationDirection() {
     checkThread();
@@ -110,7 +106,6 @@ public class HillshadeLayer extends Layer {
    *
    * @return property wrapper value around String
    */
-  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getHillshadeIlluminationAnchor() {
     checkThread();
@@ -122,7 +117,6 @@ public class HillshadeLayer extends Layer {
    *
    * @return property wrapper value around Float
    */
-  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<Float> getHillshadeExaggeration() {
     checkThread();
@@ -134,7 +128,6 @@ public class HillshadeLayer extends Layer {
    *
    * @return transition options for Float
    */
-  @NonNull
   public TransitionOptions getHillshadeExaggerationTransition() {
     checkThread();
     return nativeGetHillshadeExaggerationTransition();
@@ -145,7 +138,7 @@ public class HillshadeLayer extends Layer {
    *
    * @param options transition options for Float
    */
-  public void setHillshadeExaggerationTransition(@NonNull TransitionOptions options) {
+  public void setHillshadeExaggerationTransition(TransitionOptions options) {
     checkThread();
     nativeSetHillshadeExaggerationTransition(options.getDuration(), options.getDelay());
   }
@@ -155,7 +148,6 @@ public class HillshadeLayer extends Layer {
    *
    * @return property wrapper value around String
    */
-  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getHillshadeShadowColor() {
     checkThread();
@@ -184,7 +176,6 @@ public class HillshadeLayer extends Layer {
    *
    * @return transition options for String
    */
-  @NonNull
   public TransitionOptions getHillshadeShadowColorTransition() {
     checkThread();
     return nativeGetHillshadeShadowColorTransition();
@@ -195,7 +186,7 @@ public class HillshadeLayer extends Layer {
    *
    * @param options transition options for String
    */
-  public void setHillshadeShadowColorTransition(@NonNull TransitionOptions options) {
+  public void setHillshadeShadowColorTransition(TransitionOptions options) {
     checkThread();
     nativeSetHillshadeShadowColorTransition(options.getDuration(), options.getDelay());
   }
@@ -205,7 +196,6 @@ public class HillshadeLayer extends Layer {
    *
    * @return property wrapper value around String
    */
-  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getHillshadeHighlightColor() {
     checkThread();
@@ -234,7 +224,6 @@ public class HillshadeLayer extends Layer {
    *
    * @return transition options for String
    */
-  @NonNull
   public TransitionOptions getHillshadeHighlightColorTransition() {
     checkThread();
     return nativeGetHillshadeHighlightColorTransition();
@@ -245,7 +234,7 @@ public class HillshadeLayer extends Layer {
    *
    * @param options transition options for String
    */
-  public void setHillshadeHighlightColorTransition(@NonNull TransitionOptions options) {
+  public void setHillshadeHighlightColorTransition(TransitionOptions options) {
     checkThread();
     nativeSetHillshadeHighlightColorTransition(options.getDuration(), options.getDelay());
   }
@@ -255,7 +244,6 @@ public class HillshadeLayer extends Layer {
    *
    * @return property wrapper value around String
    */
-  @NonNull
   @SuppressWarnings("unchecked")
   public PropertyValue<String> getHillshadeAccentColor() {
     checkThread();
@@ -284,7 +272,6 @@ public class HillshadeLayer extends Layer {
    *
    * @return transition options for String
    */
-  @NonNull
   public TransitionOptions getHillshadeAccentColorTransition() {
     checkThread();
     return nativeGetHillshadeAccentColorTransition();
@@ -295,57 +282,47 @@ public class HillshadeLayer extends Layer {
    *
    * @param options transition options for String
    */
-  public void setHillshadeAccentColorTransition(@NonNull TransitionOptions options) {
+  public void setHillshadeAccentColorTransition(TransitionOptions options) {
     checkThread();
     nativeSetHillshadeAccentColorTransition(options.getDuration(), options.getDelay());
   }
 
-  @NonNull
   @Keep
   private native Object nativeGetHillshadeIlluminationDirection();
 
-  @NonNull
   @Keep
   private native Object nativeGetHillshadeIlluminationAnchor();
 
-  @NonNull
   @Keep
   private native Object nativeGetHillshadeExaggeration();
 
-  @NonNull
   @Keep
   private native TransitionOptions nativeGetHillshadeExaggerationTransition();
 
   @Keep
   private native void nativeSetHillshadeExaggerationTransition(long duration, long delay);
 
-  @NonNull
   @Keep
   private native Object nativeGetHillshadeShadowColor();
 
-  @NonNull
   @Keep
   private native TransitionOptions nativeGetHillshadeShadowColorTransition();
 
   @Keep
   private native void nativeSetHillshadeShadowColorTransition(long duration, long delay);
 
-  @NonNull
   @Keep
   private native Object nativeGetHillshadeHighlightColor();
 
-  @NonNull
   @Keep
   private native TransitionOptions nativeGetHillshadeHighlightColorTransition();
 
   @Keep
   private native void nativeSetHillshadeHighlightColorTransition(long duration, long delay);
 
-  @NonNull
   @Keep
   private native Object nativeGetHillshadeAccentColor();
 
-  @NonNull
   @Keep
   private native TransitionOptions nativeGetHillshadeAccentColorTransition();
 
-- 
cgit v1.2.1