From 3c235dfc1ff6546d19c686de3eee3a2b58092c23 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 3 Oct 2019 09:57:55 +0100
Subject: [PATCH] Make factories return specific types

PiperOrigin-RevId: 272614917
---
 .../android/exoplayer2/ext/rtmp/RtmpDataSourceFactory.java  | 2 +-
 .../android/exoplayer2/upstream/FileDataSourceFactory.java  | 2 +-
 .../android/exoplayer2/upstream/ResolvingDataSource.java    | 6 ++----
 .../google/android/exoplayer2/testutil/FakeDataSource.java  | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSourceFactory.java b/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSourceFactory.java
index 505724e846..db60eea269 100644
--- a/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSourceFactory.java
+++ b/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSourceFactory.java
@@ -37,7 +37,7 @@ public final class RtmpDataSourceFactory implements DataSource.Factory {
   }
 
   @Override
-  public DataSource createDataSource() {
+  public RtmpDataSource createDataSource() {
     RtmpDataSource dataSource = new RtmpDataSource();
     if (listener != null) {
       dataSource.addTransferListener(listener);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSourceFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSourceFactory.java
index 0b4de1b43e..e0630c7989 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSourceFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSourceFactory.java
@@ -33,7 +33,7 @@ public final class FileDataSourceFactory implements DataSource.Factory {
   }
 
   @Override
-  public DataSource createDataSource() {
+  public FileDataSource createDataSource() {
     FileDataSource dataSource = new FileDataSource();
     if (listener != null) {
       dataSource.addTransferListener(listener);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/ResolvingDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/ResolvingDataSource.java
index 99f0dee207..412f866e99 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/ResolvingDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/ResolvingDataSource.java
@@ -64,9 +64,7 @@ public final class ResolvingDataSource implements DataSource {
     private final Resolver resolver;
 
     /**
-     * Creates factory for {@link ResolvingDataSource} instances.
-     *
-     * @param upstreamFactory The wrapped {@link DataSource.Factory} handling the resolved {@link
+     * @param upstreamFactory The wrapped {@link DataSource.Factory} for handling resolved {@link
      *     DataSpec DataSpecs}.
      * @param resolver The {@link Resolver} to resolve the {@link DataSpec DataSpecs}.
      */
@@ -76,7 +74,7 @@ public final class ResolvingDataSource implements DataSource {
     }
 
     @Override
-    public DataSource createDataSource() {
+    public ResolvingDataSource createDataSource() {
       return new ResolvingDataSource(upstreamFactory.createDataSource(), resolver);
     }
   }
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java
index 9f6fdc9d49..ab7c5be5b2 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java
@@ -52,7 +52,7 @@ public class FakeDataSource extends BaseDataSource {
     }
 
     @Override
-    public DataSource createDataSource() {
+    public FakeDataSource createDataSource() {
       return new FakeDataSource(fakeDataSet, isNetwork);
     }
   }