1 files changed, 14 insertions, 9 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
index 69bf92ecb4..cd32fac942 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
@@ -36,6 +36,7 @@ import java.util.Map;
 @Deprecated
 public class MarkerViewManager implements MapView.OnDidFinishRenderingFrameListener {
 
+  @NonNull
   private final ViewGroup markerViewContainer;
   private final ViewTreeObserver.OnPreDrawListener markerViewPreDrawObserver =
     new ViewTreeObserver.OnPreDrawListener() {
@@ -56,6 +57,7 @@ public class MarkerViewManager implements MapView.OnDidFinishRenderingFrameListe
 
   private boolean enabled;
   private long updateTime;
+  @Nullable
   private MapboxMap.OnMarkerViewClickListener onMarkerViewClickListener;
   private boolean isWaitingForRenderInvoke;
 
@@ -330,7 +332,7 @@ public class MarkerViewManager implements MapView.OnDidFinishRenderingFrameListe
    * @param convertView the View presentation of the MarkerView.
    * @param adapter     the adapter used to adapt the marker to the convertView.
    */
-  public void select(@NonNull MarkerView marker, View convertView, MapboxMap.MarkerViewAdapter adapter) {
+  public void select(@NonNull MarkerView marker, View convertView, @NonNull MapboxMap.MarkerViewAdapter adapter) {
     select(marker, convertView, adapter, true);
   }
 
@@ -347,8 +349,8 @@ public class MarkerViewManager implements MapView.OnDidFinishRenderingFrameListe
    * @param adapter       the adapter used to adapt the marker to the convertView.
    * @param callbackToMap indicates if select marker must be called on MapboxMap.
    */
-  public void select(@NonNull MarkerView marker, View convertView, MapboxMap.MarkerViewAdapter adapter,
-                     boolean callbackToMap) {
+  public void select(@NonNull MarkerView marker, @Nullable View convertView,
+                     @NonNull MapboxMap.MarkerViewAdapter adapter, boolean callbackToMap) {
     if (convertView != null) {
       if (adapter.onSelect(marker, convertView, false)) {
         if (callbackToMap) {
@@ -379,7 +381,7 @@ public class MarkerViewManager implements MapView.OnDidFinishRenderingFrameListe
    * @return the MarkerView adapter.
    */
   @Nullable
-  public MapboxMap.MarkerViewAdapter getViewAdapter(MarkerView markerView) {
+  public MapboxMap.MarkerViewAdapter getViewAdapter(@NonNull MarkerView markerView) {
     MapboxMap.MarkerViewAdapter adapter = null;
     for (MapboxMap.MarkerViewAdapter a : markerViewAdapters) {
       if (a.getMarkerClass().equals(markerView.getClass())) {
@@ -400,7 +402,7 @@ public class MarkerViewManager implements MapView.OnDidFinishRenderingFrameListe
    *
    * @param marker the MarkerView to remove.
    */
-  public void removeMarkerView(MarkerView marker) {
+  public void removeMarkerView(@Nullable MarkerView marker) {
     final View viewHolder = markerViewMap.get(marker);
     if (viewHolder != null && marker != null) {
       for (final MapboxMap.MarkerViewAdapter<?> adapter : markerViewAdapters) {
@@ -425,7 +427,7 @@ public class MarkerViewManager implements MapView.OnDidFinishRenderingFrameListe
    *
    * @param markerViewAdapter the MarkerViewAdapter to add.
    */
-  public void addMarkerViewAdapter(MapboxMap.MarkerViewAdapter markerViewAdapter) {
+  public void addMarkerViewAdapter(@NonNull MapboxMap.MarkerViewAdapter markerViewAdapter) {
     if (markerViewAdapter.getMarkerClass().equals(MarkerView.class)) {
       throw new RuntimeException("Providing a custom MarkerViewAdapter requires subclassing MarkerView");
     }
@@ -441,6 +443,7 @@ public class MarkerViewManager implements MapView.OnDidFinishRenderingFrameListe
    *
    * @return a List of MarkerViewAdapters.
    */
+  @NonNull
   public List<MapboxMap.MarkerViewAdapter> getMarkerViewAdapters() {
     return markerViewAdapters;
   }
@@ -559,7 +562,7 @@ public class MarkerViewManager implements MapView.OnDidFinishRenderingFrameListe
    * @param markerView that the click event occurred
    * @return true if the marker view click has been handled, false if not
    */
-  public boolean onClickMarkerView(MarkerView markerView) {
+  public boolean onClickMarkerView(@NonNull MarkerView markerView) {
     boolean clickHandled = false;
 
     MapboxMap.MarkerViewAdapter adapter = getViewAdapter(markerView);
@@ -581,7 +584,7 @@ public class MarkerViewManager implements MapView.OnDidFinishRenderingFrameListe
    *
    * @param marker that we are ensuring info window offset
    */
-  public void ensureInfoWindowOffset(MarkerView marker) {
+  public void ensureInfoWindowOffset(@NonNull MarkerView marker) {
     View view = null;
     if (markerViewMap.containsKey(marker)) {
       view = markerViewMap.get(marker);
@@ -620,11 +623,13 @@ public class MarkerViewManager implements MapView.OnDidFinishRenderingFrameListe
     }
   }
 
+  @NonNull
   public ViewGroup getMarkerViewContainer() {
     return markerViewContainer;
   }
 
-  public void addOnMarkerViewAddedListener(MarkerView markerView, OnMarkerViewAddedListener onMarkerViewAddedListener) {
+  public void addOnMarkerViewAddedListener(@NonNull MarkerView markerView,
+                                           OnMarkerViewAddedListener onMarkerViewAddedListener) {
     markerViewAddedListenerMap.put(markerView.getId(), onMarkerViewAddedListener);
   }