From 2762c535d60e1dfb83c228768e0ac4fc5d0bcd81 Mon Sep 17 00:00:00 2001 From: Athou Date: Mon, 18 Dec 2023 17:48:13 +0100 Subject: [PATCH] cleanup --- commafeed-server/pom.xml | 4 ++-- .../commafeed/backend/feed/FeedParser.java | 22 ------------------- .../backend/feed/FeedRefreshUpdater.java | 8 ++----- 3 files changed, 4 insertions(+), 30 deletions(-) diff --git a/commafeed-server/pom.xml b/commafeed-server/pom.xml index c48c2ec3..4e373f92 100644 --- a/commafeed-server/pom.xml +++ b/commafeed-server/pom.xml @@ -408,7 +408,7 @@ com.h2database h2 - 2.1.214 + 2.1.214 com.mysql @@ -456,7 +456,7 @@ org.bouncycastle bcprov-jdk18on - 1.76 + 1.76 test diff --git a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedParser.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedParser.java index 8cdf2529..3d21c0c6 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedParser.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedParser.java @@ -38,12 +38,10 @@ import jakarta.inject.Singleton; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.Value; -import lombok.extern.slf4j.Slf4j; /** * Parses raw xml as a Feed object */ -@Slf4j @RequiredArgsConstructor(onConstructor = @__({ @Inject })) @Singleton public class FeedParser { @@ -243,26 +241,6 @@ public class FeedParser { return media; } - private String findHub(SyndFeed feed) { - for (SyndLink l : feed.getLinks()) { - if ("hub".equalsIgnoreCase(l.getRel())) { - log.debug("found hub {} for feed {}", l.getHref(), feed.getLink()); - return l.getHref(); - } - } - return null; - } - - private String findSelf(SyndFeed feed) { - for (SyndLink l : feed.getLinks()) { - if ("self".equalsIgnoreCase(l.getRel())) { - log.debug("found self {} for feed {}", l.getHref(), feed.getLink()); - return l.getHref(); - } - } - return null; - } - @Data private static class Media { private String description; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshUpdater.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshUpdater.java index d960932e..9342e6e5 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshUpdater.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshUpdater.java @@ -14,7 +14,6 @@ import org.apache.commons.lang3.StringUtils; import com.codahale.metrics.Meter; import com.codahale.metrics.MetricRegistry; -import com.commafeed.CommaFeedConfiguration; import com.commafeed.backend.cache.CacheService; import com.commafeed.backend.dao.FeedSubscriptionDAO; import com.commafeed.backend.dao.UnitOfWork; @@ -45,7 +44,6 @@ public class FeedRefreshUpdater implements Managed { private final UnitOfWork unitOfWork; private final FeedService feedService; private final FeedEntryService feedEntryService; - private final CommaFeedConfiguration config; private final FeedSubscriptionDAO feedSubscriptionDAO; private final CacheService cache; private final WebSocketSessions webSocketSessions; @@ -58,13 +56,11 @@ public class FeedRefreshUpdater implements Managed { private final Meter entryInserted; @Inject - public FeedRefreshUpdater(UnitOfWork unitOfWork, FeedService feedService, FeedEntryService feedEntryService, - CommaFeedConfiguration config, MetricRegistry metrics, FeedSubscriptionDAO feedSubscriptionDAO, CacheService cache, - WebSocketSessions webSocketSessions) { + public FeedRefreshUpdater(UnitOfWork unitOfWork, FeedService feedService, FeedEntryService feedEntryService, MetricRegistry metrics, + FeedSubscriptionDAO feedSubscriptionDAO, CacheService cache, WebSocketSessions webSocketSessions) { this.unitOfWork = unitOfWork; this.feedService = feedService; this.feedEntryService = feedEntryService; - this.config = config; this.feedSubscriptionDAO = feedSubscriptionDAO; this.cache = cache; this.webSocketSessions = webSocketSessions;