Skip to content

Commit c8e99ff

Browse files
committed
Remove unused code
1 parent c20c5eb commit c8e99ff

File tree

5 files changed

+5
-33
lines changed

5 files changed

+5
-33
lines changed

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
import com.apptasticsoftware.rssreader.module.podcast.internal.PodcastItemDataImpl;
1111
import com.apptasticsoftware.rssreader.module.psc.PscItemData;
1212
import com.apptasticsoftware.rssreader.module.psc.internal.PscItemDataImpl;
13-
import com.apptasticsoftware.rssreader.module.spotify.SpotifyItemData;
14-
import com.apptasticsoftware.rssreader.module.spotify.internal.SpotifyItemDataImpl;
1513
import com.apptasticsoftware.rssreader.module.youtube.YoutubeItemData;
1614
import com.apptasticsoftware.rssreader.module.youtube.internal.YoutubeItemDataImpl;
1715

@@ -22,7 +20,6 @@ public class FeedItemImpl extends ItemImpl implements FeedItem {
2220
private final MediaRssItemData mediaRssItemData = new MediaRssItemDataImpl();
2321
private final PodcastItemData podcastItemData;
2422
private final PscItemData pscItemData = new PscItemDataImpl();
25-
private final SpotifyItemData spotifyItemData = new SpotifyItemDataImpl();
2623
private final YoutubeItemData youtubeItemData = new YoutubeItemDataImpl();
2724

2825
/**
@@ -55,11 +52,6 @@ public PscItemData getPscItemData() {
5552
return pscItemData;
5653
}
5754

58-
@Override
59-
public SpotifyItemData getSpotifyItemData() {
60-
return spotifyItemData;
61-
}
62-
6355
@Override
6456
public YoutubeItemData getYoutubeItemData() {
6557
return youtubeItemData;
@@ -70,11 +62,11 @@ public boolean equals(Object o) {
7062
if (!(o instanceof FeedItemImpl)) return false;
7163
if (!super.equals(o)) return false;
7264
FeedItemImpl feedItem = (FeedItemImpl) o;
73-
return Objects.equals(getItunesItemData(), feedItem.getItunesItemData()) && Objects.equals(getMediaRssItemData(), feedItem.getMediaRssItemData()) && Objects.equals(getPodcastItemData(), feedItem.getPodcastItemData()) && Objects.equals(getPscItemData(), feedItem.getPscItemData()) && Objects.equals(getSpotifyItemData(), feedItem.getSpotifyItemData()) && Objects.equals(getYoutubeItemData(), feedItem.getYoutubeItemData());
65+
return Objects.equals(getItunesItemData(), feedItem.getItunesItemData()) && Objects.equals(getMediaRssItemData(), feedItem.getMediaRssItemData()) && Objects.equals(getPodcastItemData(), feedItem.getPodcastItemData()) && Objects.equals(getPscItemData(), feedItem.getPscItemData()) && Objects.equals(getYoutubeItemData(), feedItem.getYoutubeItemData());
7466
}
7567

7668
@Override
7769
public int hashCode() {
78-
return Objects.hash(super.hashCode(), getItunesItemData(), getMediaRssItemData(), getPodcastItemData(), getPscItemData(), getSpotifyItemData(), getYoutubeItemData());
70+
return Objects.hash(super.hashCode(), getItunesItemData(), getMediaRssItemData(), getPodcastItemData(), getPscItemData(), getYoutubeItemData());
7971
}
8072
}
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
package com.apptasticsoftware.rssreader.module.spotify;
22

33
public interface SpotifyItemData {
4-
5-
SpotifyItemData getSpotifyItemData();
64
}

src/main/java/com/apptasticsoftware/rssreader/module/spotify/internal/SpotifyItemDataImpl.java

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/main/java/com/apptasticsoftware/rssreader/module/spotify/internal/SpotifyItemImpl.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@
99
import com.apptasticsoftware.rssreader.module.psc.PscItemData;
1010
import com.apptasticsoftware.rssreader.module.psc.internal.PscItemDataImpl;
1111
import com.apptasticsoftware.rssreader.module.spotify.SpotifyItem;
12-
import com.apptasticsoftware.rssreader.module.spotify.SpotifyItemData;
1312

1413
import java.util.Objects;
1514

1615
public class SpotifyItemImpl extends ItemImpl implements SpotifyItem {
17-
private final SpotifyItemData spotifyData = new SpotifyItemDataImpl();
1816
private final ItunesItemData itunesData = new ItunesItemDataImpl();
1917
private final MediaRssItemData mediaRssData = new MediaRssItemDataImpl();
2018
private final PscItemData pscData = new PscItemDataImpl();
@@ -23,11 +21,6 @@ public SpotifyItemImpl(DateTimeParser dateTimeParser) {
2321
super(dateTimeParser);
2422
}
2523

26-
@Override
27-
public SpotifyItemData getSpotifyItemData() {
28-
return spotifyData;
29-
}
30-
3124
@Override
3225
public ItunesItemData getItunesItemData() {
3326
return itunesData;
@@ -48,11 +41,11 @@ public boolean equals(Object o) {
4841
if (o == null || getClass() != o.getClass()) return false;
4942
if (!super.equals(o)) return false;
5043
SpotifyItemImpl that = (SpotifyItemImpl) o;
51-
return Objects.equals(getSpotifyItemData(), that.getSpotifyItemData()) && Objects.equals(getItunesItemData(), that.getItunesItemData()) && Objects.equals(getMediaRssItemData(), that.getMediaRssItemData()) && Objects.equals(getPscItemData(), that.getPscItemData());
44+
return Objects.equals(getItunesItemData(), that.getItunesItemData()) && Objects.equals(getMediaRssItemData(), that.getMediaRssItemData()) && Objects.equals(getPscItemData(), that.getPscItemData());
5245
}
5346

5447
@Override
5548
public int hashCode() {
56-
return Objects.hash(super.hashCode(), getSpotifyItemData(), getItunesItemData(), getMediaRssItemData(), getPscItemData());
49+
return Objects.hash(super.hashCode(), getItunesItemData(), getMediaRssItemData(), getPscItemData());
5750
}
5851
}

src/test/java/com/apptasticsoftware/rssreader/module/spotify/SpotifyRssReaderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ void example1(AbstractRssReader<SpotifyChannel, SpotifyItem> feedReader) {
8686
@SuppressWarnings("java:S5961")
8787
void equalsContract() {
8888
EqualsVerifier.simple().forClass(SpotifyChannelImpl.class).withNonnullFields("spotifyData", "itunesData", "mediaRssData").withIgnoredFields("dateTimeParser").withIgnoredFields("category").withNonnullFields("categories").withIgnoredFields("syUpdatePeriod").withIgnoredFields("syUpdateFrequency").verify();
89-
EqualsVerifier.simple().forClass(SpotifyItemImpl.class).withNonnullFields("spotifyData", "itunesData", "mediaRssData").withIgnoredFields("defaultComparator").withIgnoredFields("dateTimeParser").withIgnoredFields("category").withNonnullFields("categories").withIgnoredFields("enclosure").withNonnullFields("enclosures").verify();
89+
EqualsVerifier.simple().forClass(SpotifyItemImpl.class).withNonnullFields("itunesData", "mediaRssData").withIgnoredFields("defaultComparator").withIgnoredFields("dateTimeParser").withIgnoredFields("category").withNonnullFields("categories").withIgnoredFields("enclosure").withNonnullFields("enclosures").verify();
9090
}
9191

9292
private static Stream<? extends Arguments> feedReaderArguments() {

0 commit comments

Comments
 (0)