yuzurss

commit c0c137552e9a2360665db3eca8d5125fc845c306
parent bb9f30f59179a02760b27f6279c07af3e6ae0949
Author: Kebigon <git@kebigon.xyz>
Date:   Sat, 15 Dec 2018 22:43:05 +0900

Clean code
Diffstat:
M
src/main/java/fr/lrgn/yuzurss/FeedClient.java
 | 
5
++---
M
src/main/java/fr/lrgn/yuzurss/FeedController.java
 | 
2
+-

2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/fr/lrgn/yuzurss/FeedClient.java b/src/main/java/fr/lrgn/yuzurss/FeedClient.java
@@ -6,7 +6,6 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
-import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.XML;
@@ -73,6 +72,7 @@ public class FeedClient
 
 			entries = entries.mergeWith(Flux.just(new FeedEntry(title, link, published, author)));
 		}
+
 		return entries;
 	}
 
@@ -83,8 +83,7 @@ public class FeedClient
 		final JSONObject channel = root.getJSONObject("rss").getJSONObject("channel");
 		final String author = channel.getString("title");
 
-		final JSONArray jsonArray = channel.getJSONArray("item");
-		for (final Object entry : jsonArray)
+		for (final Object entry : channel.getJSONArray("item"))
 		{
 			final String link = ((JSONObject) entry).getString("link");
 			final String title = ((JSONObject) entry).getString("title");
diff --git a/src/main/java/fr/lrgn/yuzurss/FeedController.java b/src/main/java/fr/lrgn/yuzurss/FeedController.java
@@ -30,6 +30,6 @@ public class FeedController
 	@GetMapping("/{urls}/{limit}")
 	Flux<FeedEntry> getFeeds(@PathVariable String[] urls, @PathVariable int limit)
 	{
-		return Flux.fromArray(urls).map(url -> URI.create(url)).flatMap(uri -> client.getFeed(uri)).sort(FeedEntry.COMPARATOR).take(limit);
+		return Flux.fromArray(urls).flatMap(url -> client.getFeed(URI.create(url))).sort(FeedEntry.COMPARATOR).take(limit);
 	}
 }
 \ No newline at end of file