mirror of
https://github.com/Athou/commafeed.git
synced 2026-03-21 21:37:29 +00:00
cleanup
This commit is contained in:
@@ -314,7 +314,6 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.quarkus</groupId>
|
<groupId>io.quarkus</groupId>
|
||||||
<artifactId>quarkus-extension-processor</artifactId>
|
<artifactId>quarkus-extension-processor</artifactId>
|
||||||
<version>${quarkus.version}</version>
|
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|||||||
@@ -14,8 +14,6 @@ import jakarta.ws.rs.core.CacheControl;
|
|||||||
|
|
||||||
import org.apache.commons.lang3.ArrayUtils;
|
import org.apache.commons.lang3.ArrayUtils;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.hc.client5.http.DnsResolver;
|
|
||||||
import org.apache.hc.client5.http.SystemDefaultDnsResolver;
|
|
||||||
import org.apache.hc.client5.http.config.RequestConfig;
|
import org.apache.hc.client5.http.config.RequestConfig;
|
||||||
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
|
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
|
||||||
import org.apache.hc.client5.http.protocol.HttpClientContext;
|
import org.apache.hc.client5.http.protocol.HttpClientContext;
|
||||||
@@ -51,8 +49,6 @@ import lombok.extern.slf4j.Slf4j;
|
|||||||
@Singleton
|
@Singleton
|
||||||
@Slf4j
|
@Slf4j
|
||||||
public class HttpGetter {
|
public class HttpGetter {
|
||||||
private static final DnsResolver DNS_RESOLVER = SystemDefaultDnsResolver.INSTANCE;
|
|
||||||
|
|
||||||
private final CommaFeedConfiguration config;
|
private final CommaFeedConfiguration config;
|
||||||
private final InstantSource instantSource;
|
private final InstantSource instantSource;
|
||||||
private final CloseableHttpClient client;
|
private final CloseableHttpClient client;
|
||||||
|
|||||||
@@ -4,10 +4,8 @@ import jakarta.inject.Singleton;
|
|||||||
|
|
||||||
import org.kohsuke.MetaInfServices;
|
import org.kohsuke.MetaInfServices;
|
||||||
|
|
||||||
import com.commafeed.CommaFeedConfiguration;
|
|
||||||
import com.commafeed.backend.dao.UnitOfWork;
|
import com.commafeed.backend.dao.UnitOfWork;
|
||||||
import com.commafeed.backend.dao.UserDAO;
|
import com.commafeed.backend.dao.UserDAO;
|
||||||
import com.commafeed.backend.service.UserService;
|
|
||||||
|
|
||||||
import liquibase.database.Database;
|
import liquibase.database.Database;
|
||||||
import liquibase.database.core.PostgresDatabase;
|
import liquibase.database.core.PostgresDatabase;
|
||||||
@@ -22,8 +20,6 @@ public class DatabaseStartupService {
|
|||||||
|
|
||||||
private final UnitOfWork unitOfWork;
|
private final UnitOfWork unitOfWork;
|
||||||
private final UserDAO userDAO;
|
private final UserDAO userDAO;
|
||||||
private final UserService userService;
|
|
||||||
private final CommaFeedConfiguration config;
|
|
||||||
|
|
||||||
public boolean isInitialSetupRequired() {
|
public boolean isInitialSetupRequired() {
|
||||||
return unitOfWork.call(userDAO::count) == 0;
|
return unitOfWork.call(userDAO::count) == 0;
|
||||||
|
|||||||
@@ -47,7 +47,6 @@ import com.commafeed.backend.favicon.Favicon;
|
|||||||
import com.commafeed.backend.feed.FeedEntryKeyword;
|
import com.commafeed.backend.feed.FeedEntryKeyword;
|
||||||
import com.commafeed.backend.feed.FeedFetcher;
|
import com.commafeed.backend.feed.FeedFetcher;
|
||||||
import com.commafeed.backend.feed.FeedFetcher.FeedFetcherResult;
|
import com.commafeed.backend.feed.FeedFetcher.FeedFetcherResult;
|
||||||
import com.commafeed.backend.feed.FeedRefreshEngine;
|
|
||||||
import com.commafeed.backend.feed.FeedUtils;
|
import com.commafeed.backend.feed.FeedUtils;
|
||||||
import com.commafeed.backend.model.Feed;
|
import com.commafeed.backend.model.Feed;
|
||||||
import com.commafeed.backend.model.FeedCategory;
|
import com.commafeed.backend.model.FeedCategory;
|
||||||
@@ -111,7 +110,6 @@ public class FeedREST {
|
|||||||
private final FeedEntryService feedEntryService;
|
private final FeedEntryService feedEntryService;
|
||||||
private final FeedSubscriptionService feedSubscriptionService;
|
private final FeedSubscriptionService feedSubscriptionService;
|
||||||
private final FeedEntryFilteringService feedEntryFilteringService;
|
private final FeedEntryFilteringService feedEntryFilteringService;
|
||||||
private final FeedRefreshEngine feedRefreshEngine;
|
|
||||||
private final OPMLImporter opmlImporter;
|
private final OPMLImporter opmlImporter;
|
||||||
private final OPMLExporter opmlExporter;
|
private final OPMLExporter opmlExporter;
|
||||||
private final CommaFeedConfiguration config;
|
private final CommaFeedConfiguration config;
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ public abstract class BaseIT {
|
|||||||
private String webSocketUrl;
|
private String webSocketUrl;
|
||||||
|
|
||||||
@BeforeEach
|
@BeforeEach
|
||||||
void init() throws IOException {
|
void beforeEach() throws IOException {
|
||||||
this.mockServerClient = ClientAndServer.startClientAndServer(0);
|
this.mockServerClient = ClientAndServer.startClientAndServer(0);
|
||||||
|
|
||||||
this.feedUrl = "http://localhost:" + mockServerClient.getPort() + "/";
|
this.feedUrl = "http://localhost:" + mockServerClient.getPort() + "/";
|
||||||
@@ -62,7 +62,7 @@ public abstract class BaseIT {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@AfterEach
|
@AfterEach
|
||||||
void cleanup() {
|
void afterEach() {
|
||||||
if (this.mockServerClient != null) {
|
if (this.mockServerClient != null) {
|
||||||
this.mockServerClient.close();
|
this.mockServerClient.close();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user