From 8a6f4a91e94019ecc239b9c8a308685f6dec98ec Mon Sep 17 00:00:00 2001 From: microkatz Date: Fri, 29 Sep 2023 14:32:25 +0000 Subject: [PATCH] Format with google-java-format --- .../exoplayer/dash/manifest/UrlTemplate.java | 18 +++++++++++++----- .../dash/manifest/UrlTemplateTest.java | 10 ++++++---- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/manifest/UrlTemplate.java b/libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/manifest/UrlTemplate.java index ee1f9989b1..87af23d175 100644 --- a/libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/manifest/UrlTemplate.java +++ b/libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/manifest/UrlTemplate.java @@ -16,7 +16,6 @@ package androidx.media3.exoplayer.dash.manifest; import androidx.media3.common.util.UnstableApi; -import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Locale; @@ -63,7 +62,10 @@ public final class UrlTemplate { /** Internal constructor. Use {@link #compile(String)} to build instances of this class. */ private UrlTemplate( - ArrayList urlPieces, ArrayList identifiers, ArrayList identifierFormatTags, int identifierCount) { + ArrayList urlPieces, + ArrayList identifiers, + ArrayList identifierFormatTags, + int identifierCount) { this.urlPieces = urlPieces; this.identifiers = identifiers; this.identifierFormatTags = identifierFormatTags; @@ -115,17 +117,23 @@ public final class UrlTemplate { * @throws IllegalArgumentException If the template string is malformed. */ private static int parseTemplate( - String template, ArrayList urlPieces, ArrayList identifiers, ArrayList identifierFormatTags) { + String template, + ArrayList urlPieces, + ArrayList identifiers, + ArrayList identifierFormatTags) { urlPieces.add(""); int templateIndex = 0; int identifierCount = 0; while (templateIndex < template.length()) { int dollarIndex = template.indexOf("$", templateIndex); if (dollarIndex == -1) { - urlPieces.set(identifierCount, urlPieces.get(identifierCount) + template.substring(templateIndex)); + urlPieces.set( + identifierCount, urlPieces.get(identifierCount) + template.substring(templateIndex)); templateIndex = template.length(); } else if (dollarIndex != templateIndex) { - urlPieces.set(identifierCount, urlPieces.get(identifierCount) + template.substring(templateIndex, dollarIndex)); + urlPieces.set( + identifierCount, + urlPieces.get(identifierCount) + template.substring(templateIndex, dollarIndex)); templateIndex = dollarIndex; } else if (template.startsWith(ESCAPED_DOLLAR, templateIndex)) { urlPieces.set(identifierCount, urlPieces.get(identifierCount) + "$"); diff --git a/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/manifest/UrlTemplateTest.java b/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/manifest/UrlTemplateTest.java index 0b363a5cbc..9cdf9f3bb2 100644 --- a/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/manifest/UrlTemplateTest.java +++ b/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/manifest/UrlTemplateTest.java @@ -72,16 +72,18 @@ public class UrlTemplateTest { } @Test - public void fullWithMultipleOccurrences(){ - String template = "$Bandwidth$_a1_$RepresentationID$_b1_$Time$_c1_$Number$_$Bandwidth$_a2_$RepresentationID$_b2_$Time$_c2_$Number$"; + public void fullWithMultipleOccurrences() { + String template = + "$Bandwidth$_a1_$RepresentationID$_b1_$Time$_c1_$Number$_$Bandwidth$_a2_$RepresentationID$_b2_$Time$_c2_$Number$"; UrlTemplate urlTemplate = UrlTemplate.compile(template); String url = urlTemplate.buildUri("abc1", 10, 650000, 5000); assertThat(url).isEqualTo("650000_a1_abc1_b1_5000_c1_10_650000_a2_abc1_b2_5000_c2_10"); } @Test - public void fullWithMultipleOccurrencesAndDollarEscaping(){ - String template = "$$$Bandwidth$$$_a1$$_$RepresentationID$_b1_$Time$_c1_$Number$$$_$$$Bandwidth$$$_a2$$_$RepresentationID$_b2_$Time$_c2_$Number$$$"; + public void fullWithMultipleOccurrencesAndDollarEscaping() { + String template = + "$$$Bandwidth$$$_a1$$_$RepresentationID$_b1_$Time$_c1_$Number$$$_$$$Bandwidth$$$_a2$$_$RepresentationID$_b2_$Time$_c2_$Number$$$"; UrlTemplate urlTemplate = UrlTemplate.compile(template); String url = urlTemplate.buildUri("abc1", 10, 650000, 5000); assertThat(url).isEqualTo("$650000$_a1$_abc1_b1_5000_c1_10$_$650000$_a2$_abc1_b2_5000_c2_10$");