Add GeoRSS to FeedReader

Author: w3stling

src/main/java/com/apptasticsoftware/rssreader/FeedChannel.java

@@ -1,5 +1,6 @@
 package com.apptasticsoftware.rssreader;
 
+import com.apptasticsoftware.rssreader.module.georss.GeoRssChannel;
 import com.apptasticsoftware.rssreader.module.itunes.ItunesChannel;
 import com.apptasticsoftware.rssreader.module.mediarss.MediaRssChannel;
 import com.apptasticsoftware.rssreader.module.opensearch.OpenSearchChannel;
@@ -8,5 +9,5 @@
 import com.apptasticsoftware.rssreader.module.spotify.SpotifyChannel;
 import com.apptasticsoftware.rssreader.module.youtube.YoutubeChannel;
 
-public interface FeedChannel extends Channel, ItunesChannel, MediaRssChannel, OpenSearchChannel, PodcastChannel, PscChannel, SpotifyChannel, YoutubeChannel {
+public interface FeedChannel extends Channel, GeoRssChannel, ItunesChannel, MediaRssChannel, OpenSearchChannel, PodcastChannel, PscChannel, SpotifyChannel, YoutubeChannel {
 }

src/main/java/com/apptasticsoftware/rssreader/FeedItem.java

@@ -1,5 +1,6 @@
 package com.apptasticsoftware.rssreader;
 
+import com.apptasticsoftware.rssreader.module.georss.GeoRssItem;
 import com.apptasticsoftware.rssreader.module.itunes.ItunesItem;
 import com.apptasticsoftware.rssreader.module.mediarss.MediaRssItem;
 import com.apptasticsoftware.rssreader.module.opensearch.OpenSearchItem;
@@ -8,6 +9,6 @@
 import com.apptasticsoftware.rssreader.module.spotify.SpotifyItem;
 import com.apptasticsoftware.rssreader.module.youtube.YoutubeItem;
 
-public interface FeedItem extends Item, ItunesItem, MediaRssItem, OpenSearchItem, PodcastItem, PscItem, SpotifyItem, YoutubeItem {
+public interface FeedItem extends Item, GeoRssItem, ItunesItem, MediaRssItem, OpenSearchItem, PodcastItem, PscItem, SpotifyItem, YoutubeItem {
 
 }

src/main/java/com/apptasticsoftware/rssreader/FeedReader.java

@@ -2,6 +2,7 @@
 
 import com.apptasticsoftware.rssreader.internal.FeedChannelImpl;
 import com.apptasticsoftware.rssreader.internal.FeedItemImpl;
+import com.apptasticsoftware.rssreader.module.georss.GeoRssExtensions;
 import com.apptasticsoftware.rssreader.module.itunes.ItunesExtensions;
 import com.apptasticsoftware.rssreader.module.mediarss.MediaRssExtensions;
 import com.apptasticsoftware.rssreader.module.opensearch.OpenSearchExtensions;
@@ -26,6 +27,7 @@ protected FeedItem createItem(DateTimeParser dateTimeParser) {
     protected void registerChannelTags() {
         super.registerChannelTags();
         var registry = getFeedExtensionRegistry();
+        GeoRssExtensions.register(registry);
         ItunesExtensions.register(registry);
         MediaRssExtensions.register(registry);
         OpenSearchExtensions.register(registry);

src/main/java/com/apptasticsoftware/rssreader/internal/FeedChannelImpl.java

@@ -2,6 +2,8 @@
 
 import com.apptasticsoftware.rssreader.DateTimeParser;
 import com.apptasticsoftware.rssreader.FeedChannel;
+import com.apptasticsoftware.rssreader.module.georss.GeoRssChannelData;
+import com.apptasticsoftware.rssreader.module.georss.internal.GeoRssChannelDataImpl;
 import com.apptasticsoftware.rssreader.module.itunes.ItunesChannelData;
 import com.apptasticsoftware.rssreader.module.itunes.internal.ItunesChannelDataImpl;
 import com.apptasticsoftware.rssreader.module.mediarss.MediaRssChannelData;
@@ -18,6 +20,7 @@
 import java.util.Objects;
 
 public class FeedChannelImpl extends ChannelImpl implements FeedChannel {
+    private final GeoRssChannelData geoRssChannelData = new GeoRssChannelDataImpl();
     private final ItunesChannelData itunesChannelData = new ItunesChannelDataImpl();
     private final MediaRssChannelData mediaRssChannelData = new MediaRssChannelDataImpl();
     private final OpenSearchChannelData openSearchChannelData = new OpenSearchChannelDataImpl();
@@ -34,6 +37,11 @@ public FeedChannelImpl(DateTimeParser dateTimeParser) {
         super(dateTimeParser);
     }
 
+    @Override
+    public GeoRssChannelData getGeoRssChannelData() {
+        return geoRssChannelData;
+    }
+
     @Override
     public ItunesChannelData getItunesChannelData() {
         return itunesChannelData;

src/main/java/com/apptasticsoftware/rssreader/internal/FeedItemImpl.java

@@ -2,6 +2,8 @@
 
 import com.apptasticsoftware.rssreader.DateTimeParser;
 import com.apptasticsoftware.rssreader.FeedItem;
+import com.apptasticsoftware.rssreader.module.georss.GeoRssItemData;
+import com.apptasticsoftware.rssreader.module.georss.internal.GeoRssItemDataImpl;
 import com.apptasticsoftware.rssreader.module.itunes.ItunesItemData;
 import com.apptasticsoftware.rssreader.module.itunes.internal.ItunesItemDataImpl;
 import com.apptasticsoftware.rssreader.module.mediarss.MediaRssItemData;
@@ -16,6 +18,7 @@
 import java.util.Objects;
 
 public class FeedItemImpl extends ItemImpl implements FeedItem {
+    private final GeoRssItemData geoRssItemData = new GeoRssItemDataImpl();
     private final ItunesItemData itunesItemData = new ItunesItemDataImpl();
     private final MediaRssItemData mediaRssItemData = new MediaRssItemDataImpl();
     private final PodcastItemData podcastItemData;
@@ -32,6 +35,11 @@ public FeedItemImpl(DateTimeParser dateTimeParser) {
         podcastItemData = new PodcastItemDataImpl(dateTimeParser);
     }
 
+    @Override
+    public GeoRssItemData getGeoRssItemData() {
+        return geoRssItemData;
+    }
+
     @Override
     public ItunesItemData getItunesItemData() {
         return itunesItemData;

src/test/java/com/apptasticsoftware/rssreader/module/georss/GeoRssFeedReaderTest.java

@@ -1,13 +1,19 @@
 package com.apptasticsoftware.rssreader.module.georss;
 
+import com.apptasticsoftware.rssreader.AbstractRssReader;
+import com.apptasticsoftware.rssreader.FeedReader;
 import com.apptasticsoftware.rssreader.module.georss.internal.*;
 import com.apptasticsoftware.rssreader.util.Default;
 import nl.jqno.equalsverifier.EqualsVerifier;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import java.io.InputStream;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static com.github.npathai.hamcrestopt.OptionalMatchers.isPresentAndIs;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -17,9 +23,10 @@
 @SuppressWarnings("java:S5961")
 class GeoRssFeedReaderTest {
 
-    @Test
-    void example1() {
-        var items = new GeoRssFeedReader().read(fromFile("georss/example1.xml"))
+    @ParameterizedTest
+    @MethodSource("feedReaderArguments")
+    void example1(AbstractRssReader<GeoRssChannel, GeoRssItem> feedReader) {
+        var items = feedReader.read(fromFile("georss/example1.xml"))
                 .collect(Collectors.toList());
 
         assertEquals(1, items.size());
@@ -68,9 +75,10 @@ void example1() {
         assertThat(item.getGeoRssFeatureName(), isPresentAndIs("Podunk"));
     }
 
-    @Test
-    void example2() {
-        var items = new GeoRssFeedReader().read(fromFile("georss/example2.xml"))
+    @ParameterizedTest
+    @MethodSource("feedReaderArguments")
+    void example2(AbstractRssReader<GeoRssChannel, GeoRssItem> feedReader) {
+        var items = feedReader.read(fromFile("georss/example2.xml"))
                 .collect(Collectors.toList());
 
         assertEquals(1, items.size());
@@ -108,9 +116,10 @@ void example2() {
         assertThat(item.getGeoRssBoxAsCoordinates(), is(List.of(new Coordinate(42.943, -71.032), new Coordinate(43.039, -69.856))));
     }
 
-    @Test
-    void example3() {
-        var items = new GeoRssFeedReader().read(fromFile("georss/example3.xml"))
+    @ParameterizedTest
+    @MethodSource("feedReaderArguments")
+    void example3(AbstractRssReader<GeoRssChannel, GeoRssItem> feedReader) {
+        var items =feedReader.read(fromFile("georss/example3.xml"))
                 .collect(Collectors.toList());
 
         assertEquals(1, items.size());
@@ -144,6 +153,13 @@ void equalsContract() {
         EqualsVerifier.simple().forClass(Coordinate.class).verify();
     }
 
+    private static Stream<? extends Arguments> feedReaderArguments() {
+        return Stream.of(
+                Arguments.of(new GeoRssFeedReader()),
+                Arguments.of(new FeedReader())
+        );
+    }
+
     private InputStream fromFile(String fileName) {
         return getClass().getClassLoader().getResourceAsStream(fileName);
     }