From 8ba39000b1cd27d121d91fa8e5c969e1f50ffa8e Mon Sep 17 00:00:00 2001 From: Kavin <20838718+FireMasterK@users.noreply.github.com> Date: Thu, 3 Feb 2022 11:29:59 +0000 Subject: [PATCH] Simplify comparators (#181) --- src/main/java/me/kavin/piped/utils/LbryHelper.java | 2 +- src/main/java/me/kavin/piped/utils/ResponseHelper.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/me/kavin/piped/utils/LbryHelper.java b/src/main/java/me/kavin/piped/utils/LbryHelper.java index 4f95b39..355201d 100644 --- a/src/main/java/me/kavin/piped/utils/LbryHelper.java +++ b/src/main/java/me/kavin/piped/utils/LbryHelper.java @@ -11,7 +11,7 @@ import java.io.IOException; public class LbryHelper { - public static String getLBRYId(String videoId) throws IOException, InterruptedException { + public static String getLBRYId(String videoId) throws IOException { return new JSONObject( RequestUtils.sendGet("https://api.lbry.com/yt/resolve?video_ids=" + URLUtils.silentEncode(videoId)) ).getJSONObject("data").getJSONObject("videos").optString(videoId, null); diff --git a/src/main/java/me/kavin/piped/utils/ResponseHelper.java b/src/main/java/me/kavin/piped/utils/ResponseHelper.java index 5f35950..a651e76 100644 --- a/src/main/java/me/kavin/piped/utils/ResponseHelper.java +++ b/src/main/java/me/kavin/piped/utils/ResponseHelper.java @@ -727,7 +727,7 @@ public class ResponseHelper { }); - feedItems.sort((a, b) -> (int) (b.uploaded - a.uploaded)); + feedItems.sort(Comparator.comparing(o -> ((FeedItem) o).uploaded).reversed()); s.close(); @@ -764,7 +764,7 @@ public class ResponseHelper { .setParameter("user", user.getId()).addEntity("Video", Video.class) .addEntity("Channel", me.kavin.piped.utils.obj.db.Channel.class).getResultList(); - queryResults.sort((a, b) -> (int) (((Video) b[0]).getUploaded() - ((Video) a[0]).getUploaded())); + queryResults.sort(Comparator.comparing(o -> ((Video) (((Object[]) o)[0])).getUploaded()).reversed()); final List entries = new ObjectArrayList<>();