Skip to content

Commit c1a72b8

Browse files
litetexlitetex
committed
Use Android Studios code style
1 parent fc27b8a commit c1a72b8

File tree

4 files changed

+49
-43
lines changed

4 files changed

+49
-43
lines changed

‎extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeMixPlaylistExtractor.java‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,23 @@
11
package org.schabi.newpipe.extractor.services.youtube.extractors;
22

3+
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.DISABLE_PRETTY_PRINT_PARAMETER;
4+
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.YOUTUBEI_V1_URL;
5+
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.addYouTubeHeaders;
6+
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.extractCookieValue;
7+
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.extractPlaylistTypeFromPlaylistId;
8+
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getKey;
9+
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getValidJsonResponseBody;
10+
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.prepareDesktopJsonBuilder;
11+
import static org.schabi.newpipe.extractor.utils.Utils.EMPTY_STRING;
12+
import static org.schabi.newpipe.extractor.utils.Utils.getQueryValue;
13+
import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
14+
import static org.schabi.newpipe.extractor.utils.Utils.stringToURL;
15+
316
import com.grack.nanojson.JsonArray;
417
import com.grack.nanojson.JsonBuilder;
518
import com.grack.nanojson.JsonObject;
619
import com.grack.nanojson.JsonWriter;
20+
721
import org.schabi.newpipe.extractor.ListExtractor;
822
import org.schabi.newpipe.extractor.Page;
923
import org.schabi.newpipe.extractor.StreamingService;
@@ -22,8 +36,6 @@
2236
import org.schabi.newpipe.extractor.stream.StreamInfoItemsCollector;
2337
import org.schabi.newpipe.extractor.utils.JsonUtils;
2438

25-
import javax.annotation.Nonnull;
26-
import javax.annotation.Nullable;
2739
import java.io.IOException;
2840
import java.net.URL;
2941
import java.nio.charset.StandardCharsets;
@@ -32,18 +44,8 @@
3244
import java.util.Map;
3345
import java.util.Objects;
3446

35-
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.DISABLE_PRETTY_PRINT_PARAMETER;
36-
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.YOUTUBEI_V1_URL;
37-
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.addYouTubeHeaders;
38-
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.extractCookieValue;
39-
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.extractPlaylistTypeFromPlaylistId;
40-
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getKey;
41-
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getValidJsonResponseBody;
42-
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.prepareDesktopJsonBuilder;
43-
import static org.schabi.newpipe.extractor.utils.Utils.EMPTY_STRING;
44-
import static org.schabi.newpipe.extractor.utils.Utils.getQueryValue;
45-
import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
46-
import static org.schabi.newpipe.extractor.utils.Utils.stringToURL;
47+
import javax.annotation.Nonnull;
48+
import javax.annotation.Nullable;
4749

4850
/**
4951
* A {@link YoutubePlaylistExtractor} for a mix (auto-generated playlist).

‎extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeMusicSearchExtractor.java‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,25 @@
11
package org.schabi.newpipe.extractor.services.youtube.extractors;
22

3+
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.DISABLE_PRETTY_PRINT_PARAMETER;
4+
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.fixThumbnailUrl;
5+
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getTextFromObject;
6+
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getUrlFromNavigationEndpoint;
7+
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getValidJsonResponseBody;
8+
import static org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeSearchQueryHandlerFactory.MUSIC_ALBUMS;
9+
import static org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeSearchQueryHandlerFactory.MUSIC_ARTISTS;
10+
import static org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeSearchQueryHandlerFactory.MUSIC_PLAYLISTS;
11+
import static org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeSearchQueryHandlerFactory.MUSIC_SONGS;
12+
import static org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeSearchQueryHandlerFactory.MUSIC_VIDEOS;
13+
import static org.schabi.newpipe.extractor.utils.Utils.EMPTY_STRING;
14+
import static org.schabi.newpipe.extractor.utils.Utils.UTF_8;
15+
import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
16+
317
import com.grack.nanojson.JsonArray;
418
import com.grack.nanojson.JsonObject;
519
import com.grack.nanojson.JsonParser;
620
import com.grack.nanojson.JsonParserException;
721
import com.grack.nanojson.JsonWriter;
22+
823
import org.schabi.newpipe.extractor.InfoItem;
924
import org.schabi.newpipe.extractor.MetaInfo;
1025
import org.schabi.newpipe.extractor.MultiInfoItemsCollector;
@@ -23,28 +38,15 @@
2338
import org.schabi.newpipe.extractor.utils.Parser;
2439
import org.schabi.newpipe.extractor.utils.Utils;
2540

26-
import javax.annotation.Nonnull;
27-
import javax.annotation.Nullable;
2841
import java.io.IOException;
2942
import java.util.Collections;
3043
import java.util.HashMap;
3144
import java.util.List;
3245
import java.util.Map;
3346
import java.util.stream.Collectors;
3447

35-
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.DISABLE_PRETTY_PRINT_PARAMETER;
36-
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.fixThumbnailUrl;
37-
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getTextFromObject;
38-
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getUrlFromNavigationEndpoint;
39-
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getValidJsonResponseBody;
40-
import static org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeSearchQueryHandlerFactory.MUSIC_ALBUMS;
41-
import static org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeSearchQueryHandlerFactory.MUSIC_ARTISTS;
42-
import static org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeSearchQueryHandlerFactory.MUSIC_PLAYLISTS;
43-
import static org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeSearchQueryHandlerFactory.MUSIC_SONGS;
44-
import static org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeSearchQueryHandlerFactory.MUSIC_VIDEOS;
45-
import static org.schabi.newpipe.extractor.utils.Utils.EMPTY_STRING;
46-
import static org.schabi.newpipe.extractor.utils.Utils.UTF_8;
47-
import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
48+
import javax.annotation.Nonnull;
49+
import javax.annotation.Nullable;
4850

4951
public class YoutubeMusicSearchExtractor extends SearchExtractor {
5052
private JsonObject initialData;

‎extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeMixPlaylistExtractorTest.java‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
package org.schabi.newpipe.extractor.services.youtube;
22

3+
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
import static org.junit.jupiter.api.Assertions.assertFalse;
5+
import static org.junit.jupiter.api.Assertions.assertThrows;
6+
import static org.junit.jupiter.api.Assertions.assertTrue;
7+
import static org.schabi.newpipe.extractor.ExtractorAsserts.assertIsSecureUrl;
8+
import static org.schabi.newpipe.extractor.ServiceList.YouTube;
9+
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.DISABLE_PRETTY_PRINT_PARAMETER;
10+
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.YOUTUBEI_V1_URL;
11+
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getKey;
12+
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.prepareDesktopJsonBuilder;
13+
314
import com.grack.nanojson.JsonWriter;
15+
416
import org.junit.jupiter.api.BeforeAll;
517
import org.junit.jupiter.api.Test;
618
import org.schabi.newpipe.downloader.DownloaderFactory;
@@ -22,17 +34,6 @@
2234
import java.util.Map;
2335
import java.util.Set;
2436

25-
import static org.junit.jupiter.api.Assertions.assertEquals;
26-
import static org.junit.jupiter.api.Assertions.assertFalse;
27-
import static org.junit.jupiter.api.Assertions.assertThrows;
28-
import static org.junit.jupiter.api.Assertions.assertTrue;
29-
import static org.schabi.newpipe.extractor.ExtractorAsserts.assertIsSecureUrl;
30-
import static org.schabi.newpipe.extractor.ServiceList.YouTube;
31-
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.DISABLE_PRETTY_PRINT_PARAMETER;
32-
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.YOUTUBEI_V1_URL;
33-
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getKey;
34-
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.prepareDesktopJsonBuilder;
35-
3637
public class YoutubeMixPlaylistExtractorTest {
3738

3839
private static final String RESOURCE_PATH = DownloaderFactory.RESOURCE_PATH + "services/youtube/extractor/mix/";

‎extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/search/YoutubeMusicSearchExtractorTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package org.schabi.newpipe.extractor.services.youtube.search;
22

3+
import static org.schabi.newpipe.extractor.ServiceList.YouTube;
4+
import static java.util.Collections.singletonList;
5+
36
import org.junit.jupiter.api.BeforeAll;
47
import org.junit.jupiter.api.Disabled;
58
import org.schabi.newpipe.downloader.DownloaderTestImpl;
@@ -10,11 +13,9 @@
1013
import org.schabi.newpipe.extractor.services.DefaultSearchExtractorTest;
1114
import org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeSearchQueryHandlerFactory;
1215

13-
import javax.annotation.Nullable;
1416
import java.net.URLEncoder;
1517

16-
import static java.util.Collections.singletonList;
17-
import static org.schabi.newpipe.extractor.ServiceList.YouTube;
18+
import javax.annotation.Nullable;
1819

1920
// Doesn't work with mocks. Makes request with different `dataToSend` I think
2021
public class YoutubeMusicSearchExtractorTest {

0 commit comments

Comments
 (0)