From cb81b04dabd0edd2f17b2c5f6f5a8bee6fc7341c 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 --- .../java/androidx/media3/common/TrackSelectionOverrides.java | 2 +- .../media3/exoplayer/analytics/AnalyticsCollector.java | 2 +- .../java/androidx/media3/exoplayer/rtsp/MediaDescription.java | 2 +- .../androidx/media3/exoplayer/rtsp/RtspMediaTrackTest.java | 2 +- .../main/java/androidx/media3/test/utils/FakeExoMediaDrm.java | 2 +- .../java/androidx/media3/test/utils/WebServerDispatcher.java | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/common/src/main/java/androidx/media3/common/TrackSelectionOverrides.java b/libraries/common/src/main/java/androidx/media3/common/TrackSelectionOverrides.java index 1fe7c6ff8b..5c6b54a7b0 100644 --- a/libraries/common/src/main/java/androidx/media3/common/TrackSelectionOverrides.java +++ b/libraries/common/src/main/java/androidx/media3/common/TrackSelectionOverrides.java @@ -300,7 +300,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/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/AnalyticsCollector.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/AnalyticsCollector.java index 9a8c13f4ee..620d971217 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/AnalyticsCollector.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/AnalyticsCollector.java @@ -1122,7 +1122,7 @@ public class AnalyticsCollector addTimelineForMediaPeriodId(builder, currentPlayerMediaPeriod, preferredTimeline); } } - mediaPeriodTimelines = builder.build(); + mediaPeriodTimelines = builder.buildOrThrow(); } private void addTimelineForMediaPeriodId( diff --git a/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/MediaDescription.java b/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/MediaDescription.java index 2cec4df390..9a6c9b8387 100644 --- a/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/MediaDescription.java +++ b/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/MediaDescription.java @@ -324,6 +324,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/libraries/exoplayer_rtsp/src/test/java/androidx/media3/exoplayer/rtsp/RtspMediaTrackTest.java b/libraries/exoplayer_rtsp/src/test/java/androidx/media3/exoplayer/rtsp/RtspMediaTrackTest.java index 52ac808e85..b84c156a7a 100644 --- a/libraries/exoplayer_rtsp/src/test/java/androidx/media3/exoplayer/rtsp/RtspMediaTrackTest.java +++ b/libraries/exoplayer_rtsp/src/test/java/androidx/media3/exoplayer/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/libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeExoMediaDrm.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeExoMediaDrm.java index f57a5e784a..314726f85e 100644 --- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeExoMediaDrm.java +++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeExoMediaDrm.java @@ -554,7 +554,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/libraries/test_utils/src/main/java/androidx/media3/test/utils/WebServerDispatcher.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/WebServerDispatcher.java index 4d647380dc..99b75bd9a7 100644 --- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/WebServerDispatcher.java +++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/WebServerDispatcher.java @@ -406,7 +406,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(); } /** @@ -432,7 +432,7 @@ public class WebServerDispatcher extends Dispatcher { ImmutableMap.builder() .putAll(acceptEncodingHeader) .put("identity", -1f) - .build(); + .buildOrThrow(); } float asteriskQvalue = acceptEncodingHeader.getOrDefault("*", 0f); @Nullable String preferredContentCoding = null;