1 files changed, 26 insertions, 66 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
index 1ce1f4ba38..48c571ee98 100755
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
@@ -50,23 +50,18 @@ final class NativeMapView {
   private static final String TAG = "Mbgl-NativeMapView";
 
   //Hold a reference to prevent it from being GC'd as long as it's used on the native side
-  @NonNull
   private final FileSource fileSource;
 
   // Used to schedule work on the MapRenderer Thread
-  @NonNull
   private final MapRenderer mapRenderer;
 
   // Used to validate if methods are called from the correct thread
-  @NonNull
   private final Thread thread;
 
   // Used for view callbacks
-  @NonNull
   private ViewCallback viewCallback;
 
   // Used for map change callbacks
-  @NonNull
   private StateCallback stateCallback;
 
   // Device density
@@ -92,16 +87,15 @@ final class NativeMapView {
   // Constructors
   //
 
-  public NativeMapView(@NonNull final Context context, final boolean crossSourceCollisions,
-                       @NonNull final ViewCallback viewCallback, @NonNull final StateCallback stateCallback,
-                       @NonNull final MapRenderer mapRenderer) {
-    this(context, context.getResources().getDisplayMetrics().density,
-      crossSourceCollisions, viewCallback, stateCallback, mapRenderer);
+  public NativeMapView(final Context context, final boolean crossSourceCollisions, final ViewCallback viewCallback,
+                       final StateCallback stateCallback, final MapRenderer mapRenderer) {
+    this(context, context.getResources().getDisplayMetrics().density, crossSourceCollisions, viewCallback,
+      stateCallback, mapRenderer);
   }
 
-  public NativeMapView(@NonNull final Context context, final float pixelRatio, final boolean crossSourceCollisions,
-                       @NonNull final ViewCallback viewCallback, @NonNull final StateCallback stateCallback,
-                       @NonNull final MapRenderer mapRenderer) {
+  public NativeMapView(final Context context, final float pixelRatio, final boolean crossSourceCollisions,
+                       final ViewCallback viewCallback, final StateCallback stateCallback,
+                       final MapRenderer mapRenderer) {
     this.mapRenderer = mapRenderer;
     this.viewCallback = viewCallback;
     this.fileSource = FileSource.getInstance(context);
@@ -249,14 +243,14 @@ final class NativeMapView {
     nativeMoveBy(dx / pixelRatio, dy / pixelRatio, duration);
   }
 
-  public void setLatLng(@NonNull LatLng latLng) {
+  public void setLatLng(LatLng latLng) {
     if (checkState("setLatLng")) {
       return;
     }
     setLatLng(latLng, 0);
   }
 
-  public void setLatLng(@NonNull LatLng latLng, long duration) {
+  public void setLatLng(LatLng latLng, long duration) {
     if (checkState("setLatLng")) {
       return;
     }
@@ -322,7 +316,7 @@ final class NativeMapView {
     nativeSetPitch(pitch, duration);
   }
 
-  public void setZoom(double zoom, @NonNull PointF focalPoint, long duration) {
+  public void setZoom(double zoom, PointF focalPoint, long duration) {
     if (checkState("setZoom")) {
       return;
     }
@@ -447,8 +441,7 @@ final class NativeMapView {
     return nativeAddMarkers(markers)[0];
   }
 
-  @NonNull
-  public long[] addMarkers(@NonNull List<Marker> markers) {
+  public long[] addMarkers(List<Marker> markers) {
     if (checkState("addMarkers")) {
       return new long[] {};
     }
@@ -463,8 +456,7 @@ final class NativeMapView {
     return nativeAddPolylines(polylines)[0];
   }
 
-  @NonNull
-  public long[] addPolylines(@NonNull List<Polyline> polylines) {
+  public long[] addPolylines(List<Polyline> polylines) {
     if (checkState("addPolylines")) {
       return new long[] {};
     }
@@ -479,15 +471,14 @@ final class NativeMapView {
     return nativeAddPolygons(polygons)[0];
   }
 
-  @NonNull
-  public long[] addPolygons(@NonNull List<Polygon> polygons) {
+  public long[] addPolygons(List<Polygon> polygons) {
     if (checkState("addPolygons")) {
       return new long[] {};
     }
     return nativeAddPolygons(polygons.toArray(new Polygon[polygons.size()]));
   }
 
-  public void updateMarker(@NonNull Marker marker) {
+  public void updateMarker(Marker marker) {
     if (checkState("updateMarker")) {
       return;
     }
@@ -496,14 +487,14 @@ final class NativeMapView {
     nativeUpdateMarker(marker.getId(), position.getLatitude(), position.getLongitude(), icon.getId());
   }
 
-  public void updatePolygon(@NonNull Polygon polygon) {
+  public void updatePolygon(Polygon polygon) {
     if (checkState("updatePolygon")) {
       return;
     }
     nativeUpdatePolygon(polygon.getId(), polygon);
   }
 
-  public void updatePolyline(@NonNull Polyline polyline) {
+  public void updatePolyline(Polyline polyline) {
     if (checkState("updatePolyline")) {
       return;
     }
@@ -525,7 +516,6 @@ final class NativeMapView {
     nativeRemoveAnnotations(ids);
   }
 
-  @NonNull
   public long[] queryPointAnnotations(RectF rect) {
     if (checkState("queryPointAnnotations")) {
       return new long[] {};
@@ -533,7 +523,6 @@ final class NativeMapView {
     return nativeQueryPointAnnotations(rect);
   }
 
-  @NonNull
   public long[] queryShapeAnnotations(RectF rectF) {
     if (checkState("queryShapeAnnotations")) {
       return new long[] {};
@@ -611,14 +600,14 @@ final class NativeMapView {
     return nativeGetMetersPerPixelAtLatitude(lat, getZoom()) / pixelRatio;
   }
 
-  public ProjectedMeters projectedMetersForLatLng(@NonNull LatLng latLng) {
+  public ProjectedMeters projectedMetersForLatLng(LatLng latLng) {
     if (checkState("projectedMetersForLatLng")) {
       return null;
     }
     return nativeProjectedMetersForLatLng(latLng.getLatitude(), latLng.getLongitude());
   }
 
-  public LatLng latLngForProjectedMeters(@NonNull ProjectedMeters projectedMeters) {
+  public LatLng latLngForProjectedMeters(ProjectedMeters projectedMeters) {
     if (checkState("latLngForProjectedMeters")) {
       return new LatLng();
     }
@@ -626,8 +615,7 @@ final class NativeMapView {
       projectedMeters.getEasting()).wrap();
   }
 
-  @NonNull
-  public PointF pixelForLatLng(@NonNull LatLng latLng) {
+  public PointF pixelForLatLng(LatLng latLng) {
     if (checkState("pixelForLatLng")) {
       return new PointF();
     }
@@ -636,7 +624,7 @@ final class NativeMapView {
     return pointF;
   }
 
-  public LatLng latLngForPixel(@NonNull PointF pixel) {
+  public LatLng latLngForPixel(PointF pixel) {
     if (checkState("latLngForPixel")) {
       return new LatLng();
     }
@@ -650,14 +638,14 @@ final class NativeMapView {
     return nativeGetTopOffsetPixelsForAnnotationSymbol(symbolName);
   }
 
-  public void jumpTo(double angle, @NonNull LatLng center, double pitch, double zoom) {
+  public void jumpTo(double angle, LatLng center, double pitch, double zoom) {
     if (checkState("jumpTo")) {
       return;
     }
     nativeJumpTo(angle, center.getLatitude(), center.getLongitude(), pitch, zoom);
   }
 
-  public void easeTo(double angle, @NonNull LatLng center, long duration, double pitch, double zoom,
+  public void easeTo(double angle, LatLng center, long duration, double pitch, double zoom,
                      boolean easingInterpolator) {
     if (checkState("easeTo")) {
       return;
@@ -666,14 +654,13 @@ final class NativeMapView {
       easingInterpolator);
   }
 
-  public void flyTo(double angle, @NonNull LatLng center, long duration, double pitch, double zoom) {
+  public void flyTo(double angle, LatLng center, long duration, double pitch, double zoom) {
     if (checkState("flyTo")) {
       return;
     }
     nativeFlyTo(angle, center.getLatitude(), center.getLongitude(), duration, pitch, zoom);
   }
 
-  @NonNull
   public CameraPosition getCameraPosition() {
     if (checkState("getCameraValues")) {
       return new CameraPosition.Builder().build();
@@ -1020,7 +1007,7 @@ final class NativeMapView {
   }
 
   @Keep
-  protected void onSnapshotReady(@Nullable Bitmap mapContent) {
+  protected void onSnapshotReady(Bitmap mapContent) {
     if (checkState("OnSnapshotReady")) {
       return;
     }
@@ -1051,14 +1038,12 @@ final class NativeMapView {
   @Keep
   private native void nativeSetStyleUrl(String url);
 
-  @NonNull
   @Keep
   private native String nativeGetStyleUrl();
 
   @Keep
   private native void nativeSetStyleJson(String newStyleJson);
 
-  @NonNull
   @Keep
   private native String nativeGetStyleJson();
 
@@ -1077,16 +1062,13 @@ final class NativeMapView {
   @Keep
   private native void nativeSetLatLng(double latitude, double longitude, long duration);
 
-  @NonNull
   @Keep
   private native LatLng nativeGetLatLng();
 
-  @NonNull
   @Keep
   private native CameraPosition nativeGetCameraForLatLngBounds(
     LatLngBounds latLngBounds, double top, double left, double bottom, double right, double bearing, double tilt);
 
-  @NonNull
   @Keep
   private native CameraPosition nativeGetCameraForGeometry(
     Geometry geometry, double top, double left, double bottom, double right, double bearing, double tilt);
@@ -1142,26 +1124,21 @@ final class NativeMapView {
   @Keep
   private native void nativeUpdateMarker(long markerId, double lat, double lon, String iconId);
 
-  @NonNull
   @Keep
   private native long[] nativeAddMarkers(Marker[] markers);
 
-  @NonNull
   @Keep
   private native long[] nativeAddPolylines(Polyline[] polylines);
 
-  @NonNull
   @Keep
   private native long[] nativeAddPolygons(Polygon[] polygons);
 
   @Keep
   private native void nativeRemoveAnnotations(long[] id);
 
-  @NonNull
   @Keep
   private native long[] nativeQueryPointAnnotations(RectF rect);
 
-  @NonNull
   @Keep
   private native long[] nativeQueryShapeAnnotations(RectF rect);
 
@@ -1196,19 +1173,15 @@ final class NativeMapView {
   @Keep
   private native double nativeGetMetersPerPixelAtLatitude(double lat, double zoom);
 
-  @NonNull
   @Keep
   private native ProjectedMeters nativeProjectedMetersForLatLng(double latitude, double longitude);
 
-  @NonNull
   @Keep
   private native LatLng nativeLatLngForProjectedMeters(double northing, double easting);
 
-  @NonNull
   @Keep
   private native PointF nativePixelForLatLng(double lat, double lon);
 
-  @NonNull
   @Keep
   private native LatLng nativeLatLngForPixel(float x, float y);
 
@@ -1227,7 +1200,6 @@ final class NativeMapView {
   private native void nativeFlyTo(double angle, double latitude, double longitude,
                                   long duration, double pitch, double zoom);
 
-  @NonNull
   @Keep
   private native CameraPosition nativeGetCameraPosition();
 
@@ -1243,11 +1215,9 @@ final class NativeMapView {
   @Keep
   private native void nativeSetTransitionDelay(long delay);
 
-  @NonNull
   @Keep
   private native Layer[] nativeGetLayers();
 
-  @NonNull
   @Keep
   private native Layer nativeGetLayer(String layerId);
 
@@ -1260,22 +1230,18 @@ final class NativeMapView {
   @Keep
   private native void nativeAddLayerAt(long layerPtr, int index) throws CannotAddLayerException;
 
-  @NonNull
   @Keep
   private native Layer nativeRemoveLayerById(String layerId);
 
   @Keep
   private native void nativeRemoveLayer(long layerId);
 
-  @NonNull
   @Keep
   private native Layer nativeRemoveLayerAt(int index);
 
-  @NonNull
   @Keep
   private native Source[] nativeGetSources();
 
-  @NonNull
   @Keep
   private native Source nativeGetSource(String sourceId);
 
@@ -1294,7 +1260,6 @@ final class NativeMapView {
   @Keep
   private native void nativeRemoveImage(String name);
 
-  @NonNull
   @Keep
   private native Bitmap nativeGetImage(String name);
 
@@ -1307,20 +1272,17 @@ final class NativeMapView {
   @Keep
   private native void nativeTakeSnapshot();
 
-  @NonNull
   @Keep
   private native Feature[] nativeQueryRenderedFeaturesForPoint(float x, float y,
                                                                String[] layerIds,
                                                                Object[] filter);
 
-  @NonNull
   @Keep
   private native Feature[] nativeQueryRenderedFeaturesForBox(float left, float top,
                                                              float right, float bottom,
                                                              String[] layerIds,
                                                              Object[] filter);
 
-  @NonNull
   @Keep
   private native Light nativeGetLight();
 
@@ -1377,7 +1339,7 @@ final class NativeMapView {
     nativeTakeSnapshot();
   }
 
-  public void setOnFpsChangedListener(@NonNull final MapboxMap.OnFpsChangedListener listener) {
+  public void setOnFpsChangedListener(final MapboxMap.OnFpsChangedListener listener) {
     final Handler handler = new Handler();
     mapRenderer.queueEvent(new Runnable() {
 
@@ -1415,7 +1377,6 @@ final class NativeMapView {
       this.sdf = sdf;
     }
 
-    @NonNull
     @Override
     protected List<Image> doInBackground(HashMap<String, Bitmap>... params) {
       HashMap<String, Bitmap> bitmapHashMap = params[0];
@@ -1445,7 +1406,7 @@ final class NativeMapView {
     }
 
     @Override
-    protected void onPostExecute(@NonNull List<Image> images) {
+    protected void onPostExecute(List<Image> images) {
       super.onPostExecute(images);
       if (nativeMapView != null && !nativeMapView.checkState("nativeAddImages")) {
         nativeMapView.nativeAddImages(images.toArray(new Image[images.size()]));
@@ -1458,7 +1419,6 @@ final class NativeMapView {
 
     int getHeight();
 
-    @Nullable
     Bitmap getViewContent();
   }