From 319ef63510f87932b517104d6e3fdf4d2c5a9c0c Mon Sep 17 00:00:00 2001 From: olly Date: Tue, 1 Feb 2022 15:12:48 +0000 Subject: [PATCH] Use `ImmutableMap.Builder.buildOrThrow()` instead of deprecated `build()`. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit More info: ​go/immutable-map-buildorthrow-lsc NOTE: if the source of truth for this code is *NOT* `third_party`, please let me know and I'll revert this CL (and please consider upstreaming this change yourself). #inlineme Tested: TAP for global presubmit queue passed after automated deflaking of failures: http://mondo/deflaker/run/530857d2-45cb-4069-a234-48c5efe945f1 http://mondo/deflaker/run/0dce4296-e6bb-42d2-8b64-b393f45b6ad3 http://test/OCL:425453729:BASE:425451020:1643699365244:811c1a24 PiperOrigin-RevId: 425616165 --- .../exoplayer2/trackselection/TrackSelectionOverrides.java | 2 +- .../android/exoplayer2/analytics/AnalyticsCollector.java | 2 +- .../android/exoplayer2/source/rtsp/MediaDescription.java | 2 +- .../android/exoplayer2/source/rtsp/RtspMediaTrackTest.java | 2 +- .../google/android/exoplayer2/testutil/FakeExoMediaDrm.java | 2 +- .../android/exoplayer2/testutil/WebServerDispatcher.java | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/library/common/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionOverrides.java b/library/common/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionOverrides.java index c45e0c6981..a5390fbccd 100644 --- a/library/common/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionOverrides.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionOverrides.java @@ -297,7 +297,7 @@ public final class TrackSelectionOverrides implements Bundleable { TrackSelectionOverride trackSelectionOverride = trackSelectionOverrides.get(i); builder.put(trackSelectionOverride.trackGroup, trackSelectionOverride); } - return new TrackSelectionOverrides(builder.build()); + return new TrackSelectionOverrides(builder.buildOrThrow()); }; private static String keyForField(@FieldNumber int field) { diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java index 63e87a5539..a40845d39b 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java @@ -1120,7 +1120,7 @@ public class AnalyticsCollector addTimelineForMediaPeriodId(builder, currentPlayerMediaPeriod, preferredTimeline); } } - mediaPeriodTimelines = builder.build(); + mediaPeriodTimelines = builder.buildOrThrow(); } private void addTimelineForMediaPeriodId( diff --git a/library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/MediaDescription.java b/library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/MediaDescription.java index 755a32f8a6..6ef06c1a4f 100644 --- a/library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/MediaDescription.java +++ b/library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/MediaDescription.java @@ -322,6 +322,6 @@ import java.util.HashMap; String[] parameterPair = Util.splitAtFirst(parameter, "="); formatParametersBuilder.put(parameterPair[0], parameterPair[1]); } - return formatParametersBuilder.build(); + return formatParametersBuilder.buildOrThrow(); } } diff --git a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspMediaTrackTest.java b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspMediaTrackTest.java index 7a24183084..33ef70eaf0 100644 --- a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspMediaTrackTest.java +++ b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspMediaTrackTest.java @@ -161,7 +161,7 @@ public class RtspMediaTrackTest { .put("indexlength", "3") .put("indexdeltalength", "3") .put("config", "1208") - .build()); + .buildOrThrow()); assertThat(format).isEqualTo(expectedFormat); } diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExoMediaDrm.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExoMediaDrm.java index 8d55c0e424..ed88822831 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExoMediaDrm.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExoMediaDrm.java @@ -552,7 +552,7 @@ public final class FakeExoMediaDrm implements ExoMediaDrm { optionalParameters.put(optionalParameterKeys.get(i), optionalParameterValues.get(i)); } - this.optionalParameters = optionalParameters.build(); + this.optionalParameters = optionalParameters.buildOrThrow(); } public byte[] toByteArray() { diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/WebServerDispatcher.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/WebServerDispatcher.java index 3b9a6fe0f0..341c345513 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/WebServerDispatcher.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/WebServerDispatcher.java @@ -404,7 +404,7 @@ public class WebServerDispatcher extends Dispatcher { @Nullable String qvalue = matcher.group(2); parsedEncodings.put(contentCoding, qvalue == null ? -1f : Float.parseFloat(qvalue)); } - return parsedEncodings.build(); + return parsedEncodings.buildOrThrow(); } /** @@ -430,7 +430,7 @@ public class WebServerDispatcher extends Dispatcher { ImmutableMap.builder() .putAll(acceptEncodingHeader) .put("identity", -1f) - .build(); + .buildOrThrow(); } float asteriskQvalue = acceptEncodingHeader.getOrDefault("*", 0f); @Nullable String preferredContentCoding = null;