Resolve lint issues

packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/ExoPlayerEventListener.java

@@ -42,7 +42,7 @@ public int getDegrees() {
   }
 
   public ExoPlayerEventListener(
-      ExoPlayer exoPlayer, VideoPlayerCallbacks events, boolean initialized) {
+      @NonNull ExoPlayer exoPlayer, @NonNull VideoPlayerCallbacks events, boolean initialized) {
     this.exoPlayer = exoPlayer;
     this.events = events;
     this.isInitialized = initialized;

packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/ExoPlayerState.java

@@ -4,6 +4,7 @@
 
 package io.flutter.plugins.videoplayer;
 
+import androidx.annotation.NonNull;
 import androidx.media3.common.PlaybackParameters;
 import androidx.media3.exoplayer.ExoPlayer;
 
@@ -24,7 +25,7 @@ public final class ExoPlayerState {
    * @param exoPlayer the active player instance.
    * @return an opaque object representing the state.
    */
-  public static ExoPlayerState save(ExoPlayer exoPlayer) {
+ @NonNull public static ExoPlayerState save(@NonNull ExoPlayer exoPlayer) {
     return new ExoPlayerState(
         /*position=*/ exoPlayer.getCurrentPosition(),
         /*repeatMode=*/ exoPlayer.getRepeatMode(),
@@ -60,7 +61,7 @@ private ExoPlayerState(
    *
    * @param exoPlayer the new player instance to reflect the state back to.
    */
-  public void restore(ExoPlayer exoPlayer) {
+  public void restore(@NonNull ExoPlayer exoPlayer) {
     exoPlayer.seekTo(position);
     exoPlayer.setRepeatMode(repeatMode);
     exoPlayer.setVolume(volume);

packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/HttpVideoAsset.java

@@ -57,8 +57,9 @@ public MediaItem getMediaItem() {
     return builder.build();
   }
 
+  @NonNull
   @Override
-  public MediaSource.Factory getMediaSourceFactory(Context context) {
+  public MediaSource.Factory getMediaSourceFactory(@NonNull Context context) {
     return getMediaSourceFactory(context, new DefaultHttpDataSource.Factory());
   }
 

packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/LocalVideoAsset.java

@@ -21,8 +21,9 @@ public MediaItem getMediaItem() {
     return new MediaItem.Builder().setUri(assetUrl).build();
   }
 
+  @NonNull
   @Override
-  public MediaSource.Factory getMediaSourceFactory(Context context) {
+  public MediaSource.Factory getMediaSourceFactory(@NonNull Context context) {
     return new DefaultMediaSourceFactory(context);
   }
 }

packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/VideoAsset.java

@@ -78,7 +78,8 @@ protected VideoAsset(@Nullable String assetUrl) {
    * @param context application context.
    * @return configured factory, or {@code null} if not needed for this asset type.
    */
-  public abstract MediaSource.Factory getMediaSourceFactory(Context context);
+  @NonNull
+  public abstract MediaSource.Factory getMediaSourceFactory(@NonNull Context context);
 
   /** Streaming formats that can be provided to the video player as a hint. */
   enum StreamingFormat {

packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayer.java

@@ -33,21 +33,23 @@ public interface ExoPlayerProvider {
      *
      * @return new instance.
      */
+    @NonNull
     ExoPlayer get();
   }
 
   public VideoPlayer(
-      @NonNull ExoPlayerProvider exoPlayerProvider,
       @NonNull VideoPlayerCallbacks events,
       @NonNull MediaItem mediaItem,
-      @NonNull VideoPlayerOptions options) {
-    this.exoPlayerProvider = exoPlayerProvider;
+      @NonNull VideoPlayerOptions options,
+      @NonNull ExoPlayerProvider exoPlayerProvider) {
     this.videoPlayerEvents = events;
     this.mediaItem = mediaItem;
     this.options = options;
+    this.exoPlayerProvider = exoPlayerProvider;
     this.exoPlayer = createVideoPlayer();
   }
 
+  @NonNull
   protected ExoPlayer createVideoPlayer() {
     ExoPlayer exoPlayer = exoPlayerProvider.get();
     exoPlayer.setMediaItem(mediaItem);
@@ -59,7 +61,9 @@ protected ExoPlayer createVideoPlayer() {
     return exoPlayer;
   }
 
-  protected abstract ExoPlayerEventListener createExoPlayerEventListener(ExoPlayer exoPlayer);
+  @NonNull
+  protected abstract ExoPlayerEventListener createExoPlayerEventListener(
+      @NonNull ExoPlayer exoPlayer);
 
   void sendBufferingUpdate() {
     videoPlayerEvents.onBufferingUpdate(exoPlayer.getBufferedPosition());

packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/platformview/PlatformViewExoPlayerEventListener.java

@@ -4,6 +4,7 @@
 
 package io.flutter.plugins.videoplayer.platformview;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.OptIn;
 import androidx.annotation.VisibleForTesting;
 import androidx.media3.common.Format;
@@ -15,12 +16,13 @@
 
 public final class PlatformViewExoPlayerEventListener extends ExoPlayerEventListener {
   @VisibleForTesting
-  public PlatformViewExoPlayerEventListener(ExoPlayer exoPlayer, VideoPlayerCallbacks events) {
+  public PlatformViewExoPlayerEventListener(
+      @NonNull ExoPlayer exoPlayer, @NonNull VideoPlayerCallbacks events) {
     this(exoPlayer, events, false);
   }
 
   public PlatformViewExoPlayerEventListener(
-      ExoPlayer exoPlayer, VideoPlayerCallbacks events, boolean initialized) {
+      @NonNull ExoPlayer exoPlayer, @NonNull VideoPlayerCallbacks events, boolean initialized) {
     super(exoPlayer, events, initialized);
   }
 

packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/platformview/PlatformViewVideoPlayer.java

@@ -22,11 +22,11 @@
 public class PlatformViewVideoPlayer extends VideoPlayer {
   @VisibleForTesting
   public PlatformViewVideoPlayer(
-      @NonNull ExoPlayerProvider exoPlayerProvider,
       @NonNull VideoPlayerCallbacks events,
       @NonNull MediaItem mediaItem,
-      @NonNull VideoPlayerOptions options) {
-    super(exoPlayerProvider, events, mediaItem, options);
+      @NonNull VideoPlayerOptions options,
+      @NonNull ExoPlayerProvider exoPlayerProvider) {
+    super(events, mediaItem, options, exoPlayerProvider);
   }
 
   /**
@@ -45,19 +45,20 @@ public static PlatformViewVideoPlayer create(
       @NonNull VideoAsset asset,
       @NonNull VideoPlayerOptions options) {
     return new PlatformViewVideoPlayer(
+        events,
+        asset.getMediaItem(),
+        options,
         () -> {
           ExoPlayer.Builder builder =
               new ExoPlayer.Builder(context)
                   .setMediaSourceFactory(asset.getMediaSourceFactory(context));
           return builder.build();
-        },
-        events,
-        asset.getMediaItem(),
-        options);
+        });
   }
 
+  @NonNull
   @Override
-  protected ExoPlayerEventListener createExoPlayerEventListener(ExoPlayer exoPlayer) {
+  protected ExoPlayerEventListener createExoPlayerEventListener(@NonNull ExoPlayer exoPlayer) {
     // Platform view video player does not suspend and re-create the exoPlayer, hence initialized
     // is always false.
     return new PlatformViewExoPlayerEventListener(exoPlayer, videoPlayerEvents, false);

packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/texture/TextureExoPlayerEventListener.java

@@ -5,6 +5,7 @@
 package io.flutter.plugins.videoplayer.texture;
 
 import android.os.Build;
+import androidx.annotation.NonNull;
 import androidx.annotation.OptIn;
 import androidx.annotation.VisibleForTesting;
 import androidx.media3.common.Format;
@@ -16,12 +17,13 @@
 
 public final class TextureExoPlayerEventListener extends ExoPlayerEventListener {
   @VisibleForTesting
-  public TextureExoPlayerEventListener(ExoPlayer exoPlayer, VideoPlayerCallbacks events) {
+  public TextureExoPlayerEventListener(
+      @NonNull ExoPlayer exoPlayer, @NonNull VideoPlayerCallbacks events) {
     this(exoPlayer, events, false);
   }
 
   public TextureExoPlayerEventListener(
-      ExoPlayer exoPlayer, VideoPlayerCallbacks events, boolean initialized) {
+      @NonNull ExoPlayer exoPlayer, @NonNull VideoPlayerCallbacks events, boolean initialized) {
     super(exoPlayer, events, initialized);
   }
 

packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/texture/TextureVideoPlayer.java

@@ -49,35 +49,36 @@ public static TextureVideoPlayer create(
       @NonNull VideoAsset asset,
       @NonNull VideoPlayerOptions options) {
     return new TextureVideoPlayer(
+        events,
+        surfaceProducer,
+        asset.getMediaItem(),
+        options,
         () -> {
           ExoPlayer.Builder builder =
               new ExoPlayer.Builder(context)
                   .setMediaSourceFactory(asset.getMediaSourceFactory(context));
           return builder.build();
-        },
-        events,
-        surfaceProducer,
-        asset.getMediaItem(),
-        options);
+        });
   }
 
   @VisibleForTesting
   public TextureVideoPlayer(
-      @NonNull ExoPlayerProvider exoPlayerProvider,
       @NonNull VideoPlayerCallbacks events,
       @NonNull TextureRegistry.SurfaceProducer surfaceProducer,
       @NonNull MediaItem mediaItem,
-      @NonNull VideoPlayerOptions options) {
-    super(exoPlayerProvider, events, mediaItem, options);
+      @NonNull VideoPlayerOptions options,
+      @NonNull ExoPlayerProvider exoPlayerProvider) {
+    super(events, mediaItem, options, exoPlayerProvider);
 
     this.surfaceProducer = surfaceProducer;
     surfaceProducer.setCallback(this);
 
     this.exoPlayer.setVideoSurface(surfaceProducer.getSurface());
   }
 
+  @NonNull
   @Override
-  protected ExoPlayerEventListener createExoPlayerEventListener(ExoPlayer exoPlayer) {
+  protected ExoPlayerEventListener createExoPlayerEventListener(@NonNull ExoPlayer exoPlayer) {
     return new TextureExoPlayerEventListener(
         exoPlayer, videoPlayerEvents, playerHasBeenSuspended());
   }

packages/video_player/video_player_android/android/src/test/java/io/flutter/plugins/videoplayer/FakeVideoAsset.java

@@ -29,8 +29,9 @@ public MediaItem getMediaItem() {
     return new MediaItem.Builder().setUri(assetUrl).build();
   }
 
+  @NonNull
   @Override
-  public MediaSource.Factory getMediaSourceFactory(Context context) {
+  public MediaSource.Factory getMediaSourceFactory(@NonNull Context context) {
     return mediaSourceFactory;
   }
 }

packages/video_player/video_player_android/android/src/test/java/io/flutter/plugins/videoplayer/TextureVideoPlayerTest.java

@@ -63,7 +63,7 @@ private VideoPlayer createVideoPlayer() {
 
   private TextureVideoPlayer createVideoPlayer(VideoPlayerOptions options) {
     return new TextureVideoPlayer(
-        () -> mockExoPlayer, mockEvents, mockProducer, fakeVideoAsset.getMediaItem(), options);
+        mockEvents, mockProducer, fakeVideoAsset.getMediaItem(), options, () -> mockExoPlayer);
   }
 
   @Test

packages/video_player/video_player_android/android/src/test/java/io/flutter/plugins/videoplayer/VideoPlayerTest.java

@@ -54,15 +54,16 @@ public final class VideoPlayerTest {
   /** A test subclass of {@link VideoPlayer} that exposes the abstract class for testing. */
   private final class TestVideoPlayer extends VideoPlayer {
     private TestVideoPlayer(
-        @NonNull ExoPlayerProvider exoPlayerProvider,
         @NonNull VideoPlayerCallbacks events,
         @NonNull MediaItem mediaItem,
-        @NonNull VideoPlayerOptions options) {
-      super(exoPlayerProvider, events, mediaItem, options);
+        @NonNull VideoPlayerOptions options,
+        @NonNull ExoPlayerProvider exoPlayerProvider) {
+      super(events, mediaItem, options, exoPlayerProvider);
     }
 
+    @NonNull
     @Override
-    protected ExoPlayerEventListener createExoPlayerEventListener(ExoPlayer exoPlayer) {
+    protected ExoPlayerEventListener createExoPlayerEventListener(@NonNull ExoPlayer exoPlayer) {
       // Use platform view implementation for testing.
       return new PlatformViewExoPlayerEventListener(exoPlayer, mockEvents);
     }
@@ -79,7 +80,7 @@ private VideoPlayer createVideoPlayer() {
 
   private VideoPlayer createVideoPlayer(VideoPlayerOptions options) {
     return new TestVideoPlayer(
-        () -> mockExoPlayer, mockEvents, fakeVideoAsset.getMediaItem(), options);
+        mockEvents, fakeVideoAsset.getMediaItem(), options, () -> mockExoPlayer);
   }
 
   @Test