Infer Nullity #13071

tobrun · 2018-10-10T08:42:18Z

Closes #11886 , This PR improves consuming our library from kotlin by applying as much as possible @Nullable/@NonNull annotations. Most changes were performed automatically using Analyze > Infer Nullity... in Android Studio.

…k, removes necessity to add question mark to all mapboxMap invocations

LukasPaczos

This is great! The converter tool (and any tweaks you added) looks really reliable. I love how builders will be cleaned up in the Kotlin code :)

I added comments wherever I've seen obvious adjustments, we can continue with the rest as we go. Also, do you think we need annotations on private fields? Lint is not great at picking up when assigning anything but a raw null to the field and it doesn't improve Kotlin interop by much, but adds a lot of lines of code and makes it less readable.

LukasPaczos · 2018-10-12T13:42:08Z

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Bubble.java

  private Path path = new Path();

-  Bubble(RectF rect, ArrowDirection arrowDirection, float arrowWidth, float arrowHeight, float arrowPosition,
+  Bubble(RectF rect, @NonNull ArrowDirection arrowDirection, float arrowWidth, float arrowHeight, float arrowPosition,


rect should not be null

LukasPaczos · 2018-10-12T13:42:31Z

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Bubble.java

@@ -81,7 +84,7 @@ public int getIntrinsicHeight() {
    return (int) rect.height();
  }

-  private void initPath(ArrowDirection arrowDirection, Path path, float strokeWidth) {
+  private void initPath(ArrowDirection arrowDirection, @NonNull Path path, float strokeWidth) {


arrowDirection should not be null

LukasPaczos · 2018-10-12T13:43:20Z

.../android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubbleLayout.java

@@ -111,6 +112,7 @@ public ArrowDirection getArrowDirection() {
   * @param arrowDirection The direction of the arrow
   * @return this
   */
+  @NonNull
  public BubbleLayout setArrowDirection(ArrowDirection arrowDirection) {


arrowDirection should not be null

LukasPaczos · 2018-10-12T13:44:46Z

...rm/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java

@@ -53,11 +55,11 @@
    initialize(view, mapboxMap);
  }

-  InfoWindow(View view, MapboxMap mapboxMap) {
+  InfoWindow(@NonNull View view, MapboxMap mapboxMap) {


mapboxMap should not be null

LukasPaczos · 2018-10-12T13:45:58Z

...rm/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java

    initialize(view, mapboxMap);
  }

-  private void initialize(View view, MapboxMap mapboxMap) {
+  private void initialize(@NonNull View view, MapboxMap mapboxMap) {


mapboxMap should not be null

LukasPaczos · 2018-10-12T14:57:53Z

...rm/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java

@@ -540,7 +555,7 @@ private void resolveForMarker(MarkerHit markerHit, Marker marker) {
      hitTestMarker(markerHit, marker, hitRectMarker);
    }

-    private void hitTestMarker(MarkerHit markerHit, Marker marker, RectF hitRectMarker) {
+    private void hitTestMarker(MarkerHit markerHit, @NonNull Marker marker, RectF hitRectMarker) {


hitRectMarker should not be null

LukasPaczos · 2018-10-12T15:03:50Z

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java

@@ -112,8 +117,8 @@ public void run() {
  }

  @UiThread
-  final void easeCamera(MapboxMap mapboxMap, CameraUpdate update, int durationMs, boolean easingInterpolator,
-                        final MapboxMap.CancelableCallback callback, boolean isDismissable) {
+  final void easeCamera(@NonNull MapboxMap mapboxMap, CameraUpdate update, int durationMs, boolean easingInterpolator,


update should not be null

LukasPaczos · 2018-10-12T15:04:47Z

...DK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewRenderThread.java

@@ -118,7 +122,7 @@ void requestRender() {
  /**
   * May be called from any thread
   */
-  void queueEvent(Runnable runnable) {
+  void queueEvent(@Nullable Runnable runnable) {


runnable should not be null

LukasPaczos · 2018-10-12T15:06:17Z

...ndroid/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java

-  private void drawAttribution(MapSnapshot mapSnapshot, Canvas canvas,
-                               AttributionMeasure measure, AttributionLayout layout) {
+  private void drawAttribution(@NonNull MapSnapshot mapSnapshot, @NonNull Canvas canvas,
+                               @NonNull AttributionMeasure measure, AttributionLayout layout) {


layout should not be null

LukasPaczos

Also seems like #11886 (comment) has not been fixed.

tobrun · 2018-10-12T15:59:38Z

@LukasPaczos comments have been adressed, except #13071 (review). It seems to be the same as the proposed change in #11886 (comment).

  // MapView.java
  public void addOnMapChangedListener(@NonNull OnMapChangedListener listener) {
  }
  public void removeOnMapChangedListener(@NonNull OnMapChangedListener listener) {
  }

LukasPaczos

@tobrun that's right, seems like it has been handled with a different PR 🚀

tobrun added the Android Mapbox Maps SDK for Android label Oct 10, 2018

tobrun added this to the android-v6.7.0 milestone Oct 10, 2018

tobrun self-assigned this Oct 10, 2018

tobrun requested a review from LukasPaczos October 10, 2018 08:42

tobrun force-pushed the tvn-kotlin-compability branch 4 times, most recently from 94ae262 to b6d3289 Compare October 11, 2018 08:54

[android] - add NonNull to MapboxMap parameter for onMapReady callbac…

66e4e97

…k, removes necessity to add question mark to all mapboxMap invocations

tobrun force-pushed the tvn-kotlin-compability branch from b6d3289 to 4853b35 Compare October 12, 2018 09:07

LukasPaczos reviewed Oct 12, 2018

View reviewed changes

[android] - infer nullity

5ec60dc

tobrun force-pushed the tvn-kotlin-compability branch from 4853b35 to 5ec60dc Compare October 12, 2018 15:58

LukasPaczos approved these changes Oct 12, 2018

View reviewed changes

tobrun merged commit 6177427 into master Oct 12, 2018

tobrun deleted the tvn-kotlin-compability branch October 12, 2018 16:40

This was referenced Oct 22, 2018

Revert adding nullable annotations #13147

Merged

Add nullable annotations to public API #13148

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Infer Nullity #13071

Infer Nullity #13071

tobrun commented Oct 10, 2018

LukasPaczos left a comment

LukasPaczos Oct 12, 2018

LukasPaczos Oct 12, 2018

LukasPaczos Oct 12, 2018

LukasPaczos Oct 12, 2018

LukasPaczos Oct 12, 2018

LukasPaczos Oct 12, 2018

LukasPaczos Oct 12, 2018

LukasPaczos Oct 12, 2018

LukasPaczos Oct 12, 2018

LukasPaczos left a comment

tobrun commented Oct 12, 2018 •

edited

Loading

LukasPaczos left a comment

Infer Nullity #13071

Infer Nullity #13071

Conversation

tobrun commented Oct 10, 2018

LukasPaczos left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LukasPaczos left a comment

Choose a reason for hiding this comment

tobrun commented Oct 12, 2018 • edited Loading

LukasPaczos left a comment

Choose a reason for hiding this comment

tobrun commented Oct 12, 2018 •

edited

Loading