Replace ExoPlayer's functional types with Guava alternatives

This removes Supplier, Function and Predicate. Consumer is kept because Guava doesn't have an equivalent (Java 8 does, but we can't use that yet). #exofixit PiperOrigin-RevId: 323324392
google · Jul 27, 2020 · 478f59f · 478f59f
1 parent f99023e
commit 478f59f
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 106 deletions.
diff --git a/extensions/cronet/build.gradle b/extensions/cronet/build.gradle
@@ -17,6 +17,7 @@ dependencies {
  api "com.google.android.gms:play-services-cronet:17.0.0"
  implementation project(modulePrefix + 'library-core')
  implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
+ implementation 'com.google.guava:guava:' + guavaVersion
  compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
  compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
  testImplementation project(modulePrefix + 'library')

diff --git a/...sions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java b/...sions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java
@@ -30,8 +30,8 @@
 import com.google.android.exoplayer2.util.Clock;
 import com.google.android.exoplayer2.util.ConditionVariable;
 import com.google.android.exoplayer2.util.Log;
-import com.google.android.exoplayer2.util.Predicate;
 import com.google.android.exoplayer2.util.Util;
+import com.google.common.base.Predicate;
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.net.SocketTimeoutException;
@@ -477,7 +477,7 @@ public long open(DataSpec dataSpec) throws HttpDataSourceException {
  if (contentTypePredicate != null) {
  List<String> contentTypeHeaders = responseInfo.getAllHeaders().get(CONTENT_TYPE);
  String contentType = isEmpty(contentTypeHeaders) ? null : contentTypeHeaders.get(0);
- if (contentType != null && !contentTypePredicate.evaluate(contentType)) {
+ if (contentType != null && !contentTypePredicate.apply(contentType)) {
  throw new InvalidContentTypeException(contentType, dataSpec);
  }
  }

diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle
@@ -16,6 +16,7 @@ apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
 dependencies {
  implementation project(modulePrefix + 'library-core')
  implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
+ implementation 'com.google.guava:guava:' + guavaVersion
  compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
  compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
  testImplementation project(modulePrefix + 'testutils')

diff --git a/...sions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java b/...sions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java
@@ -26,8 +26,8 @@
 import com.google.android.exoplayer2.upstream.DataSpec;
 import com.google.android.exoplayer2.upstream.HttpDataSource;
 import com.google.android.exoplayer2.util.Assertions;
-import com.google.android.exoplayer2.util.Predicate;
 import com.google.android.exoplayer2.util.Util;
+import com.google.common.base.Predicate;
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -252,7 +252,7 @@ public long open(DataSpec dataSpec) throws HttpDataSourceException {
  // Check for a valid content type.
  MediaType mediaType = responseBody.contentType();
  String contentType = mediaType != null ? mediaType.toString() : "";
- if (contentTypePredicate != null && !contentTypePredicate.evaluate(contentType)) {
+ if (contentTypePredicate != null && !contentTypePredicate.apply(contentType)) {
  closeConnectionQuietly();
  throw new InvalidContentTypeException(contentType, dataSpec);
  }

diff --git a/library/common/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java
@@ -18,8 +18,8 @@
 import android.text.TextUtils;
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
-import com.google.android.exoplayer2.util.Predicate;
 import com.google.android.exoplayer2.util.Util;
+import com.google.common.base.Predicate;
 import java.io.IOException;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;

diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/Function.java b/library/common/src/main/java/com/google/android/exoplayer2/util/Function.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/Predicate.java b/library/common/src/main/java/com/google/android/exoplayer2/util/Predicate.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/Supplier.java b/library/common/src/main/java/com/google/android/exoplayer2/util/Supplier.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -43,9 +43,9 @@
 import com.google.android.exoplayer2.util.Clock;
 import com.google.android.exoplayer2.util.HandlerWrapper;
 import com.google.android.exoplayer2.util.Log;
-import com.google.android.exoplayer2.util.Supplier;
 import com.google.android.exoplayer2.util.TraceUtil;
 import com.google.android.exoplayer2.util.Util;
+import com.google.common.base.Supplier;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/.../src/main/java/com/google/android/exoplayer2/analytics/DefaultPlaybackSessionManager.java b/.../src/main/java/com/google/android/exoplayer2/analytics/DefaultPlaybackSessionManager.java
@@ -27,8 +27,8 @@
 import com.google.android.exoplayer2.analytics.AnalyticsListener.EventTime;
 import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
 import com.google.android.exoplayer2.util.Assertions;
-import com.google.android.exoplayer2.util.Supplier;
 import com.google.android.exoplayer2.util.Util;
+import com.google.common.base.Supplier;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Random;

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
@@ -23,8 +23,8 @@
 import com.google.android.exoplayer2.upstream.DataSpec.HttpMethod;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
-import com.google.android.exoplayer2.util.Predicate;
 import com.google.android.exoplayer2.util.Util;
+import com.google.common.base.Predicate;
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -319,7 +319,7 @@ public long open(DataSpec dataSpec) throws HttpDataSourceException {
 
  // Check for a valid content type.
  String contentType = connection.getContentType();
- if (contentTypePredicate != null && !contentTypePredicate.evaluate(contentType)) {
+ if (contentTypePredicate != null && !contentTypePredicate.apply(contentType)) {
  closeConnectionQuietly();
  throw new InvalidContentTypeException(contentType, dataSpec);
  }

diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java
@@ -24,9 +24,9 @@
 import com.google.android.exoplayer2.testutil.Dumper.Dumpable;
 import com.google.android.exoplayer2.upstream.DataReader;
 import com.google.android.exoplayer2.util.Assertions;
-import com.google.android.exoplayer2.util.Function;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.Util;
+import com.google.common.base.Function;
 import com.google.common.primitives.Bytes;
 import java.io.EOFException;
 import java.io.IOException;

diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/TestUtil.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/TestUtil.java
@@ -41,9 +41,9 @@
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Clock;
 import com.google.android.exoplayer2.util.ConditionVariable;
-import com.google.android.exoplayer2.util.Supplier;
 import com.google.android.exoplayer2.util.SystemClock;
 import com.google.android.exoplayer2.util.Util;
+import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableList;
 import com.google.common.primitives.Bytes;
 import java.io.File;

diff --git a/testutils/src/test/java/com/google/android/exoplayer2/testutil/TestUtilTest.java b/testutils/src/test/java/com/google/android/exoplayer2/testutil/TestUtilTest.java
@@ -26,7 +26,7 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.util.Clock;
 import com.google.android.exoplayer2.util.ConditionVariable;
-import com.google.android.exoplayer2.util.Supplier;
+import com.google.common.base.Supplier;
 import java.util.concurrent.TimeoutException;
 import org.junit.Test;
 import org.junit.runner.RunWith;