reorder imports using google java format

commafeed-server/pom.xml

@@ -287,6 +287,7 @@
                     <java>
                         <googleJavaFormat>
                             <style>AOSP</style>
+                            <reorderImports>true</reorderImports>
                         </googleJavaFormat>
                     </java>
                 </configuration>

commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java

@@ -4,10 +4,13 @@ import com.commafeed.backend.feed.FeedRefreshEngine;
 import com.commafeed.backend.feed.ImageProxyUrl;
 import com.commafeed.backend.task.TaskScheduler;
 import com.commafeed.security.password.PasswordConstraintValidator;
+
 import io.quarkus.runtime.ShutdownEvent;
 import io.quarkus.runtime.StartupEvent;
+
 import jakarta.enterprise.event.Observes;
 import jakarta.inject.Singleton;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 

commafeed-server/src/main/java/com/commafeed/CommaFeedConfiguration.java

@@ -1,14 +1,17 @@
 package com.commafeed;
 
 import com.commafeed.backend.feed.FeedRefreshIntervalCalculator;
+
 import io.quarkus.runtime.annotations.ConfigDocSection;
 import io.quarkus.runtime.annotations.ConfigPhase;
 import io.quarkus.runtime.annotations.ConfigRoot;
 import io.quarkus.runtime.configuration.MemorySize;
 import io.smallrye.config.ConfigMapping;
 import io.smallrye.config.WithDefault;
+
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.Positive;
+
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Optional;

commafeed-server/src/main/java/com/commafeed/CommaFeedProducers.java

@@ -1,8 +1,10 @@
 package com.commafeed;
 
 import com.codahale.metrics.MetricRegistry;
+
 import jakarta.enterprise.inject.Produces;
 import jakarta.inject.Singleton;
+
 import java.time.InstantSource;
 
 @Singleton

commafeed-server/src/main/java/com/commafeed/CommaFeedVersion.java

@@ -1,10 +1,12 @@
 package com.commafeed;
 
 import jakarta.inject.Singleton;
+
+import lombok.Getter;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
-import lombok.Getter;
 
 @Singleton
 @Getter

commafeed-server/src/main/java/com/commafeed/ExceptionMappers.java

@@ -1,14 +1,18 @@
 package com.commafeed;
 
 import com.commafeed.security.CookieService;
+
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import io.quarkus.security.AuthenticationFailedException;
 import io.quarkus.security.UnauthorizedException;
+
 import jakarta.annotation.Priority;
 import jakarta.validation.ValidationException;
 import jakarta.ws.rs.core.NewCookie;
 import jakarta.ws.rs.ext.Provider;
+
 import lombok.RequiredArgsConstructor;
+
 import org.jboss.resteasy.reactive.RestResponse;
 import org.jboss.resteasy.reactive.RestResponse.ResponseBuilder;
 import org.jboss.resteasy.reactive.RestResponse.Status;

commafeed-server/src/main/java/com/commafeed/JacksonCustomizer.java

@@ -5,8 +5,11 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+
 import io.quarkus.jackson.ObjectMapperCustomizer;
+
 import jakarta.inject.Singleton;
+
 import java.util.concurrent.TimeUnit;
 
 @Singleton

commafeed-server/src/main/java/com/commafeed/NativeImageClasses.java

@@ -6,6 +6,7 @@ import com.codahale.metrics.Histogram;
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
+
 import io.quarkus.runtime.annotations.RegisterForReflection;
 
 @RegisterForReflection(

commafeed-server/src/main/java/com/commafeed/backend/Digests.java

@@ -2,9 +2,11 @@ package com.commafeed.backend;
 
 import com.google.common.hash.HashFunction;
 import com.google.common.hash.Hashing;
-import java.nio.charset.StandardCharsets;
+
 import lombok.experimental.UtilityClass;
 
+import java.nio.charset.StandardCharsets;
+
 @UtilityClass
 @SuppressWarnings("deprecation")
 public class Digests {

commafeed-server/src/main/java/com/commafeed/backend/HttpClientFactory.java

@@ -3,21 +3,18 @@ package com.commafeed.backend;
 import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.CommaFeedVersion;
 import com.google.common.net.HttpHeaders;
+
 import inet.ipaddr.IPAddress;
 import inet.ipaddr.IPAddressNetwork;
 import inet.ipaddr.IPAddressString;
+
 import jakarta.inject.Singleton;
-import java.net.InetAddress;
+
-import java.net.URI;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.SequencedMap;
-import java.util.zip.GZIPInputStream;
 import lombok.RequiredArgsConstructor;
+
 import nl.altindag.ssl.SSLFactory;
 import nl.altindag.ssl.apache5.util.Apache5SslUtils;
+
 import org.apache.hc.client5.http.DnsResolver;
 import org.apache.hc.client5.http.SystemDefaultDnsResolver;
 import org.apache.hc.client5.http.config.ConnectionConfig;
@@ -42,6 +39,15 @@ import org.apache.hc.core5.util.TimeValue;
 import org.apache.hc.core5.util.Timeout;
 import org.brotli.dec.BrotliInputStream;
 
+import java.net.InetAddress;
+import java.net.URI;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.SequencedMap;
+import java.util.zip.GZIPInputStream;
+
 @Singleton
 @RequiredArgsConstructor
 public class HttpClientFactory {

commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java

@@ -8,22 +8,17 @@ import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.Iterables;
 import com.google.common.io.ByteStreams;
 import com.google.common.net.HttpHeaders;
+
 import jakarta.inject.Singleton;
 import jakarta.ws.rs.core.CacheControl;
-import java.io.IOException;
+
-import java.io.InputStream;
-import java.net.URI;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.InstantSource;
-import java.util.Optional;
-import java.util.concurrent.ExecutionException;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Lombok;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hc.client5.http.config.RequestConfig;
@@ -39,6 +34,15 @@ import org.apache.hc.core5.http.io.support.ClassicRequestBuilder;
 import org.apache.hc.core5.util.Timeout;
 import org.jboss.resteasy.reactive.common.headers.CacheControlDelegate;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.InstantSource;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
+
 /** Smart HTTP getter: handles gzip, ssl, last modified and etag headers */
 @Singleton
 @Slf4j

commafeed-server/src/main/java/com/commafeed/backend/Urls.java

@@ -1,13 +1,15 @@
 package com.commafeed.backend;
 
-import java.net.URI;
-import java.util.regex.Pattern;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.lang3.Strings;
 import org.netpreserve.urlcanon.Canonicalizer;
 import org.netpreserve.urlcanon.ParsedUrl;
 
+import java.net.URI;
+import java.util.regex.Pattern;
+
 @UtilityClass
 @Slf4j
 public class Urls {

commafeed-server/src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java

@@ -5,8 +5,10 @@ import com.commafeed.backend.model.QFeedCategory;
 import com.commafeed.backend.model.QUser;
 import com.commafeed.backend.model.User;
 import com.querydsl.core.types.Predicate;
+
 import jakarta.inject.Singleton;
 import jakarta.persistence.EntityManager;
+
 import java.util.List;
 import java.util.Objects;
 

commafeed-server/src/main/java/com/commafeed/backend/dao/FeedDAO.java

@@ -5,11 +5,14 @@ import com.commafeed.backend.model.QFeed;
 import com.commafeed.backend.model.QFeedSubscription;
 import com.querydsl.jpa.JPAExpressions;
 import com.querydsl.jpa.impl.JPAQuery;
+
 import jakarta.inject.Singleton;
 import jakarta.persistence.EntityManager;
+
+import org.apache.commons.lang3.Strings;
+
 import java.time.Instant;
 import java.util.List;
-import org.apache.commons.lang3.Strings;
 
 @Singleton
 public class FeedDAO extends GenericDAO<Feed> {

commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryContentDAO.java

@@ -3,8 +3,10 @@ package com.commafeed.backend.dao;
 import com.commafeed.backend.model.FeedEntryContent;
 import com.commafeed.backend.model.QFeedEntry;
 import com.commafeed.backend.model.QFeedEntryContent;
+
 import jakarta.inject.Singleton;
 import jakarta.persistence.EntityManager;
+
 import java.util.List;
 
 @Singleton

commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java

@@ -7,8 +7,10 @@ import com.google.common.collect.Lists;
 import com.querydsl.core.Tuple;
 import com.querydsl.core.types.dsl.NumberExpression;
 import com.querydsl.jpa.impl.JPAQuery;
+
 import jakarta.inject.Singleton;
 import jakarta.persistence.EntityManager;
+
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.HashSet;

commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java

@@ -21,14 +21,17 @@ import com.querydsl.core.Tuple;
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.core.types.dsl.NumberExpression;
 import com.querydsl.jpa.impl.JPAQuery;
+
 import jakarta.inject.Singleton;
 import jakarta.persistence.EntityManager;
+
+import org.apache.commons.collections4.CollectionUtils;
+
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import org.apache.commons.collections4.CollectionUtils;
 
 @Singleton
 public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {

commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryTagDAO.java

@@ -4,8 +4,10 @@ import com.commafeed.backend.model.FeedEntry;
 import com.commafeed.backend.model.FeedEntryTag;
 import com.commafeed.backend.model.QFeedEntryTag;
 import com.commafeed.backend.model.User;
+
 import jakarta.inject.Singleton;
 import jakarta.persistence.EntityManager;
+
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

commafeed-server/src/main/java/com/commafeed/backend/dao/FeedSubscriptionDAO.java

@@ -8,12 +8,10 @@ import com.commafeed.backend.model.Models;
 import com.commafeed.backend.model.QFeedSubscription;
 import com.commafeed.backend.model.User;
 import com.querydsl.jpa.JPQLQuery;
+
 import jakarta.inject.Singleton;
 import jakarta.persistence.EntityManager;
-import java.util.List;
+
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.event.service.spi.EventListenerRegistry;
 import org.hibernate.event.spi.EventType;
@@ -21,6 +19,11 @@ import org.hibernate.event.spi.PostCommitInsertEventListener;
 import org.hibernate.event.spi.PostInsertEvent;
 import org.hibernate.persister.entity.EntityPersister;
 
+import java.util.List;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
 @Singleton
 public class FeedSubscriptionDAO extends GenericDAO<FeedSubscription> {
 

commafeed-server/src/main/java/com/commafeed/backend/dao/GenericDAO.java

@@ -6,11 +6,15 @@ import com.querydsl.jpa.impl.JPADeleteClause;
 import com.querydsl.jpa.impl.JPAQuery;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import com.querydsl.jpa.impl.JPAUpdateClause;
+
 import jakarta.persistence.EntityManager;
+
+import lombok.RequiredArgsConstructor;
+
+import org.hibernate.jpa.SpecHints;
+
 import java.time.Duration;
 import java.util.Collection;
-import lombok.RequiredArgsConstructor;
-import org.hibernate.jpa.SpecHints;
 
 @RequiredArgsConstructor
 public abstract class GenericDAO<T extends AbstractModel> {

commafeed-server/src/main/java/com/commafeed/backend/dao/Predicates.java

@@ -4,6 +4,7 @@ import com.commafeed.backend.model.QFeedEntry;
 import com.commafeed.backend.model.QFeedEntryStatus;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.JPAExpressions;
+
 import lombok.experimental.UtilityClass;
 
 @UtilityClass

commafeed-server/src/main/java/com/commafeed/backend/dao/UnitOfWork.java

@@ -1,7 +1,9 @@
 package com.commafeed.backend.dao;
 
 import io.quarkus.narayana.jta.QuarkusTransaction;
+
 import jakarta.inject.Singleton;
+
 import java.util.concurrent.Callable;
 
 @Singleton

commafeed-server/src/main/java/com/commafeed/backend/dao/UserDAO.java

@@ -2,6 +2,7 @@ package com.commafeed.backend.dao;
 
 import com.commafeed.backend.model.QUser;
 import com.commafeed.backend.model.User;
+
 import jakarta.inject.Singleton;
 import jakarta.persistence.EntityManager;
 

commafeed-server/src/main/java/com/commafeed/backend/dao/UserRoleDAO.java

@@ -4,8 +4,10 @@ import com.commafeed.backend.model.QUserRole;
 import com.commafeed.backend.model.User;
 import com.commafeed.backend.model.UserRole;
 import com.commafeed.backend.model.UserRole.Role;
+
 import jakarta.inject.Singleton;
 import jakarta.persistence.EntityManager;
+
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;

commafeed-server/src/main/java/com/commafeed/backend/dao/UserSettingsDAO.java

@@ -3,6 +3,7 @@ package com.commafeed.backend.dao;
 import com.commafeed.backend.model.QUserSettings;
 import com.commafeed.backend.model.User;
 import com.commafeed.backend.model.UserSettings;
+
 import jakarta.inject.Singleton;
 import jakarta.persistence.EntityManager;
 

commafeed-server/src/main/java/com/commafeed/backend/favicon/FacebookFaviconFetcher.java

@@ -3,15 +3,19 @@ package com.commafeed.backend.favicon;
 import com.commafeed.backend.HttpGetter;
 import com.commafeed.backend.HttpGetter.HttpResult;
 import com.commafeed.backend.model.Feed;
+
 import jakarta.annotation.Priority;
 import jakarta.inject.Singleton;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.net.URIBuilder;
+
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.List;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.hc.core5.http.NameValuePair;
-import org.apache.hc.core5.net.URIBuilder;
 
 @Slf4j
 @RequiredArgsConstructor

commafeed-server/src/main/java/com/commafeed/backend/favicon/Favicon.java

@@ -1,6 +1,7 @@
 package com.commafeed.backend.favicon;
 
 import jakarta.ws.rs.core.MediaType;
+
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j

commafeed-server/src/main/java/com/commafeed/backend/favicon/FeedFaviconFetcher.java

@@ -3,8 +3,10 @@ package com.commafeed.backend.favicon;
 import com.commafeed.backend.HttpGetter;
 import com.commafeed.backend.HttpGetter.HttpResult;
 import com.commafeed.backend.model.Feed;
+
 import jakarta.annotation.Priority;
 import jakarta.inject.Singleton;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 

commafeed-server/src/main/java/com/commafeed/backend/favicon/HtmlFaviconFetcher.java

@@ -3,10 +3,13 @@ package com.commafeed.backend.favicon;
 import com.commafeed.backend.HttpGetter;
 import com.commafeed.backend.HttpGetter.HttpResult;
 import com.commafeed.backend.model.Feed;
+
 import jakarta.annotation.Priority;
 import jakarta.inject.Singleton;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.lang3.StringUtils;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;

commafeed-server/src/main/java/com/commafeed/backend/favicon/RootFaviconFetcher.java

@@ -3,12 +3,15 @@ package com.commafeed.backend.favicon;
 import com.commafeed.backend.HttpGetter;
 import com.commafeed.backend.HttpGetter.HttpResult;
 import com.commafeed.backend.model.Feed;
+
 import jakarta.annotation.Priority;
 import jakarta.inject.Singleton;
-import java.net.URI;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
+import java.net.URI;
+
 /** Fetches favicon from root of the domain (e.g. https://example.com/favicon.ico) */
 @Slf4j
 @RequiredArgsConstructor

commafeed-server/src/main/java/com/commafeed/backend/favicon/YoutubeFaviconFetcher.java

@@ -10,18 +10,22 @@ import com.commafeed.backend.model.Feed;
 import com.fasterxml.jackson.core.JsonPointer;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+
 import jakarta.annotation.Priority;
 import jakarta.inject.Singleton;
 import jakarta.ws.rs.core.UriBuilder;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.net.URIBuilder;
+
 import java.io.IOException;
 import java.net.URI;
 import java.util.List;
 import java.util.Optional;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.hc.core5.http.NameValuePair;
-import org.apache.hc.core5.net.URIBuilder;
 
 @Slf4j
 @RequiredArgsConstructor

commafeed-server/src/main/java/com/commafeed/backend/feed/FeedEntryKeyword.java

@@ -1,8 +1,9 @@
 package com.commafeed.backend.feed;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.commons.lang3.StringUtils;
 
 /** A keyword used in a search query */
 public record FeedEntryKeyword(String keyword, Mode mode) {

commafeed-server/src/main/java/com/commafeed/backend/feed/FeedFetcher.java

@@ -11,16 +11,21 @@ import com.commafeed.backend.feed.parser.FeedParser;
 import com.commafeed.backend.feed.parser.FeedParser.FeedParsingException;
 import com.commafeed.backend.feed.parser.FeedParserResult;
 import com.commafeed.backend.urlprovider.FeedURLProvider;
+
 import io.quarkus.arc.All;
+
 import jakarta.inject.Singleton;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
+
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Strings;
 
 /** Fetches a feed then parses it */
 @Slf4j

commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshEngine.java

@@ -11,7 +11,11 @@ import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.FeedEntry;
 import com.commafeed.backend.model.FeedSubscription;
 import com.google.common.util.concurrent.MoreExecutors;
+
 import jakarta.inject.Singleton;
+
+import lombok.extern.slf4j.Slf4j;
+
 import java.time.Instant;
 import java.util.List;
 import java.util.concurrent.BlockingDeque;
@@ -23,7 +27,6 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 @Singleton

commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshIntervalCalculator.java

@@ -3,12 +3,15 @@ package com.commafeed.backend.feed;
 import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.CommaFeedConfiguration.FeedRefreshErrorHandling;
 import com.google.common.primitives.Longs;
+
 import jakarta.inject.Singleton;
+
+import org.apache.commons.lang3.ObjectUtils;
+
 import java.time.Duration;
 import java.time.Instant;
 import java.time.InstantSource;
 import java.time.temporal.ChronoUnit;
-import org.apache.commons.lang3.ObjectUtils;
 
 @Singleton
 public class FeedRefreshIntervalCalculator {

commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshUpdater.java

@@ -14,7 +14,13 @@ import com.commafeed.backend.model.Models;
 import com.commafeed.backend.service.FeedEntryService;
 import com.commafeed.backend.service.FeedService;
 import com.google.common.util.concurrent.Striped;
+
 import jakarta.inject.Singleton;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.apache.commons.lang3.StringUtils;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -25,8 +31,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 
 /** Updates the feed in the database and inserts new entries */
 @Slf4j

commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshWorker.java

@@ -8,14 +8,18 @@ import com.commafeed.backend.HttpGetter.TooManyRequestsException;
 import com.commafeed.backend.feed.FeedFetcher.FeedFetcherResult;
 import com.commafeed.backend.feed.parser.FeedParserResult.Entry;
 import com.commafeed.backend.model.Feed;
+
 import jakarta.inject.Singleton;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.apache.commons.lang3.Strings;
+
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.Strings;
 
 /**
  * Calls {@link FeedFetcher} and updates the Feed object, but does not update the database, ({@link

commafeed-server/src/main/java/com/commafeed/backend/feed/FeedUpdateNotifier.java

@@ -9,11 +9,14 @@ import com.commafeed.backend.model.UserSettings;
 import com.commafeed.backend.service.PushNotificationService;
 import com.commafeed.frontend.ws.WebSocketMessageBuilder;
 import com.commafeed.frontend.ws.WebSocketSessions;
+
 import jakarta.inject.Singleton;
-import java.util.List;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.List;
+
 @Slf4j
 @Singleton
 @RequiredArgsConstructor

commafeed-server/src/main/java/com/commafeed/backend/feed/FeedUtils.java

@@ -7,16 +7,19 @@ import com.rometools.rome.feed.synd.SyndContentImpl;
 import com.rometools.rome.feed.synd.SyndEnclosureImpl;
 import com.rometools.rome.feed.synd.SyndEntry;
 import com.rometools.rome.feed.synd.SyndEntryImpl;
-import java.util.Collections;
+
-import java.util.Date;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.lang3.StringUtils;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
+import java.util.Collections;
+import java.util.Date;
+
 /** Utility methods related to feed handling */
 @UtilityClass
 @Slf4j

commafeed-server/src/main/java/com/commafeed/backend/feed/ImageProxyUrl.java

@@ -1,15 +1,19 @@
 package com.commafeed.backend.feed;
 
 import com.google.common.primitives.Bytes;
+
+import lombok.experimental.UtilityClass;
+
+import org.apache.commons.lang3.RandomUtils;
+
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Base64;
+
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.GCMParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
-import lombok.experimental.UtilityClass;
-import org.apache.commons.lang3.RandomUtils;
 
 @UtilityClass
 public class ImageProxyUrl {

commafeed-server/src/main/java/com/commafeed/backend/feed/parser/EncodingDetector.java

@@ -2,11 +2,14 @@ package com.commafeed.backend.feed.parser;
 
 import com.ibm.icu.text.CharsetDetector;
 import com.ibm.icu.text.CharsetMatch;
+
 import jakarta.inject.Singleton;
-import java.nio.charset.Charset;
+
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.Strings;
 
+import java.nio.charset.Charset;
+
 @Singleton
 public class EncodingDetector {
 

commafeed-server/src/main/java/com/commafeed/backend/feed/parser/FeedParser.java

@@ -18,7 +18,17 @@ import com.rometools.rome.feed.synd.SyndFeed;
 import com.rometools.rome.feed.synd.SyndLink;
 import com.rometools.rome.feed.synd.SyndLinkImpl;
 import com.rometools.rome.io.SyndFeedInput;
+
 import jakarta.inject.Singleton;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.SystemProperties;
+import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.xml.sax.InputSource;
+
 import java.io.StringReader;
 import java.nio.charset.Charset;
 import java.text.DateFormat;
@@ -28,13 +38,6 @@ import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.SystemProperties;
-import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
-import org.jdom2.Element;
-import org.jdom2.Namespace;
-import org.xml.sax.InputSource;
 
 /** Parses raw xml into a FeedParserResult object */
 @Singleton

commafeed-server/src/main/java/com/commafeed/backend/feed/parser/HtmlEntities.java

@@ -1,10 +1,11 @@
 package com.commafeed.backend.feed.parser;
 
+import lombok.experimental.UtilityClass;
+
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import lombok.experimental.UtilityClass;
 
 @UtilityClass
 class HtmlEntities {

commafeed-server/src/main/java/com/commafeed/backend/feed/parser/TextDirectionDetector.java

@@ -1,8 +1,9 @@
 package com.commafeed.backend.feed.parser;
 
+import org.apache.commons.lang3.math.NumberUtils;
+
 import java.text.Bidi;
 import java.util.regex.Pattern;
-import org.apache.commons.lang3.math.NumberUtils;
 
 public class TextDirectionDetector {
 

commafeed-server/src/main/java/com/commafeed/backend/feed/parser/XMLCleaner.java

@@ -1,13 +1,15 @@
 package com.commafeed.backend.feed.parser;
 
 import jakarta.inject.Singleton;
-import java.util.Collection;
+
-import java.util.regex.Pattern;
 import org.ahocorasick.trie.Emit;
 import org.ahocorasick.trie.Trie;
 import org.apache.commons.lang3.StringUtils;
 import org.jdom2.Verifier;
 
+import java.util.Collection;
+import java.util.regex.Pattern;
+
 @Singleton
 public class XMLCleaner {
 

commafeed-server/src/main/java/com/commafeed/backend/model/AbstractModel.java

@@ -5,10 +5,12 @@ import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.MappedSuperclass;
 import jakarta.persistence.TableGenerator;
-import java.io.Serializable;
+
 import lombok.Getter;
 import lombok.Setter;
 
+import java.io.Serializable;
+
 /** Abstract model for all entities, defining id and table generator */
 @SuppressWarnings("serial")
 @MappedSuperclass

commafeed-server/src/main/java/com/commafeed/backend/model/Feed.java

@@ -4,12 +4,15 @@ import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Lob;
 import jakarta.persistence.Table;
-import java.sql.Types;
+
-import java.time.Instant;
 import lombok.Getter;
 import lombok.Setter;
+
 import org.hibernate.annotations.JdbcTypeCode;
 
+import java.sql.Types;
+import java.time.Instant;
+
 @Entity
 @Table(name = "FEEDS")
 @SuppressWarnings("serial")

commafeed-server/src/main/java/com/commafeed/backend/model/FeedCategory.java

@@ -6,6 +6,7 @@ import jakarta.persistence.FetchType;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
+
 import lombok.Getter;
 import lombok.Setter;
 

commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntry.java

@@ -8,11 +8,13 @@ import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
-import java.time.Instant;
+
-import java.util.Set;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.time.Instant;
+import java.util.Set;
+
 @Entity
 @Table(name = "FEEDENTRIES")
 @SuppressWarnings("serial")

commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryContent.java

@@ -1,18 +1,22 @@
 package com.commafeed.backend.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
 import jakarta.persistence.Lob;
 import jakarta.persistence.Table;
-import java.sql.Types;
+
 import lombok.Getter;
 import lombok.Setter;
+
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.hibernate.annotations.JdbcTypeCode;
 
+import java.sql.Types;
+
 @Entity
 @Table(name = "FEEDENTRYCONTENTS")
 @SuppressWarnings("serial")

commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryStatus.java

@@ -7,11 +7,13 @@ import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import jakarta.persistence.Transient;
+
+import lombok.Getter;
+import lombok.Setter;
+
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
-import lombok.Getter;
-import lombok.Setter;
 
 @Entity
 @Table(name = "FEEDENTRYSTATUSES")

commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryTag.java

@@ -6,6 +6,7 @@ import jakarta.persistence.FetchType;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
+
 import lombok.Getter;
 import lombok.Setter;
 

commafeed-server/src/main/java/com/commafeed/backend/model/FeedSubscription.java

@@ -8,10 +8,12 @@ import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
-import java.util.Set;
+
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Set;
+
 @Entity
 @Table(name = "FEEDSUBSCRIPTIONS")
 @SuppressWarnings("serial")

commafeed-server/src/main/java/com/commafeed/backend/model/Models.java

@@ -1,13 +1,15 @@
 package com.commafeed.backend.model;
 
-import java.time.Duration;
-import java.time.Instant;
 import lombok.experimental.UtilityClass;
+
 import org.hibernate.Hibernate;
 import org.hibernate.HibernateException;
 import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.proxy.LazyInitializer;
 
+import java.time.Duration;
+import java.time.Instant;
+
 @UtilityClass
 public class Models {
 

commafeed-server/src/main/java/com/commafeed/backend/model/User.java

@@ -4,12 +4,15 @@ import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Lob;
 import jakarta.persistence.Table;
-import java.sql.Types;
+
-import java.time.Instant;
 import lombok.Getter;
 import lombok.Setter;
+
 import org.hibernate.annotations.JdbcTypeCode;
 
+import java.sql.Types;
+import java.time.Instant;
+
 @Entity
 @Table(name = "USERS")
 @SuppressWarnings("serial")

commafeed-server/src/main/java/com/commafeed/backend/model/UserRole.java

@@ -8,6 +8,7 @@ import jakarta.persistence.FetchType;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
+
 import lombok.Getter;
 import lombok.Setter;
 

commafeed-server/src/main/java/com/commafeed/backend/model/UserSettings.java

@@ -1,6 +1,7 @@
 package com.commafeed.backend.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.Embedded;
@@ -12,12 +13,15 @@ import jakarta.persistence.JoinColumn;
 import jakarta.persistence.Lob;
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
-import java.io.Serializable;
+
-import java.sql.Types;
 import lombok.Getter;
 import lombok.Setter;
+
 import org.hibernate.annotations.JdbcTypeCode;
 
+import java.io.Serializable;
+import java.sql.Types;
+
 @Entity
 @Table(name = "USERSETTINGS")
 @SuppressWarnings("serial")

commafeed-server/src/main/java/com/commafeed/backend/opml/OPMLExporter.java

@@ -8,12 +8,16 @@ import com.commafeed.backend.model.User;
 import com.rometools.opml.feed.opml.Attribute;
 import com.rometools.opml.feed.opml.Opml;
 import com.rometools.opml.feed.opml.Outline;
+
 import jakarta.inject.Singleton;
+
+import lombok.RequiredArgsConstructor;
+
+import org.apache.commons.lang3.ObjectUtils;
+
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
-import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang3.ObjectUtils;
 
 @RequiredArgsConstructor
 @Singleton

commafeed-server/src/main/java/com/commafeed/backend/opml/OPMLImporter.java

@@ -10,14 +10,18 @@ import com.rometools.opml.feed.opml.Opml;
 import com.rometools.opml.feed.opml.Outline;
 import com.rometools.rome.io.FeedException;
 import com.rometools.rome.io.WireFeedInput;
+
 import jakarta.inject.Singleton;
-import java.io.StringReader;
+
-import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
+import java.io.StringReader;
+import java.util.List;
+
 @Slf4j
 @RequiredArgsConstructor
 @Singleton

commafeed-server/src/main/java/com/commafeed/backend/rome/OPML11Parser.java

@@ -3,11 +3,14 @@ package com.commafeed.backend.rome;
 import com.rometools.opml.io.impl.OPML10Parser;
 import com.rometools.rome.feed.WireFeed;
 import com.rometools.rome.io.FeedException;
+
 import io.quarkus.runtime.annotations.RegisterForReflection;
-import java.util.Locale;
+
 import org.jdom2.Document;
 import org.jdom2.Element;
 
+import java.util.Locale;
+
 /** Support for OPML 1.1 parsing */
 @RegisterForReflection
 public class OPML11Parser extends OPML10Parser {

commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryContentCleaningService.java

@@ -2,13 +2,12 @@ package com.commafeed.backend.service;
 
 import com.steadystate.css.parser.CSSOMParser;
 import com.steadystate.css.parser.SACParserCSS21;
+
 import jakarta.inject.Singleton;
-import java.io.StringReader;
+
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.lang3.StringUtils;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
@@ -23,6 +22,11 @@ import org.w3c.css.sac.ErrorHandler;
 import org.w3c.css.sac.InputSource;
 import org.w3c.dom.css.CSSStyleDeclaration;
 
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 @RequiredArgsConstructor
 @Slf4j
 @Singleton

commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryContentService.java

@@ -7,11 +7,15 @@ import com.commafeed.backend.feed.parser.FeedParserResult.Content;
 import com.commafeed.backend.feed.parser.FeedParserResult.Enclosure;
 import com.commafeed.backend.feed.parser.FeedParserResult.Media;
 import com.commafeed.backend.model.FeedEntryContent;
+
 import jakarta.inject.Singleton;
-import java.util.Optional;
+
 import lombok.RequiredArgsConstructor;
+
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Optional;
+
 @RequiredArgsConstructor
 @Singleton
 public class FeedEntryContentService {

commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryFilteringService.java

@@ -2,6 +2,7 @@ package com.commafeed.backend.service;
 
 import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.model.FeedEntry;
+
 import dev.cel.common.CelAbstractSyntaxTree;
 import dev.cel.common.CelValidationException;
 import dev.cel.common.types.SimpleType;
@@ -10,7 +11,14 @@ import dev.cel.compiler.CelCompilerFactory;
 import dev.cel.runtime.CelEvaluationException;
 import dev.cel.runtime.CelRuntime;
 import dev.cel.runtime.CelRuntimeFactory;
+
 import jakarta.inject.Singleton;
+
+import lombok.RequiredArgsConstructor;
+
+import org.apache.commons.lang3.StringUtils;
+import org.jsoup.Jsoup;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
@@ -19,9 +27,6 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
-import org.jsoup.Jsoup;
 
 @RequiredArgsConstructor
 @Singleton

commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryService.java

@@ -13,13 +13,16 @@ import com.commafeed.backend.model.FeedEntryStatus;
 import com.commafeed.backend.model.FeedSubscription;
 import com.commafeed.backend.model.User;
 import com.commafeed.backend.service.FeedEntryFilteringService.FeedEntryFilterException;
+
 import jakarta.inject.Singleton;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
 import java.time.Instant;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 @RequiredArgsConstructor

commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryTagService.java

@@ -5,11 +5,14 @@ import com.commafeed.backend.dao.FeedEntryTagDAO;
 import com.commafeed.backend.model.FeedEntry;
 import com.commafeed.backend.model.FeedEntryTag;
 import com.commafeed.backend.model.User;
+
 import jakarta.inject.Singleton;
+
+import lombok.RequiredArgsConstructor;
+
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
-import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
 @Singleton

commafeed-server/src/main/java/com/commafeed/backend/service/FeedFaviconService.java

@@ -4,15 +4,20 @@ import com.commafeed.backend.favicon.Favicon;
 import com.commafeed.backend.favicon.FaviconFetcher;
 import com.commafeed.backend.model.Feed;
 import com.google.common.io.Resources;
+
 import io.quarkus.arc.All;
+
 import jakarta.inject.Singleton;
 import jakarta.ws.rs.core.MediaType;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.apache.commons.lang3.ArrayUtils;
+
 import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ArrayUtils;
 
 @Singleton
 @Slf4j

commafeed-server/src/main/java/com/commafeed/backend/service/FeedService.java

@@ -6,10 +6,13 @@ import com.commafeed.backend.dao.FeedDAO;
 import com.commafeed.backend.feed.FeedUtils;
 import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.Models;
+
 import jakarta.inject.Singleton;
-import java.time.Instant;
+
 import lombok.RequiredArgsConstructor;
 
+import java.time.Instant;
+
 @Singleton
 @RequiredArgsConstructor
 public class FeedService {

commafeed-server/src/main/java/com/commafeed/backend/service/FeedSubscriptionService.java

@@ -11,12 +11,15 @@ import com.commafeed.backend.model.FeedCategory;
 import com.commafeed.backend.model.FeedSubscription;
 import com.commafeed.backend.model.User;
 import com.commafeed.frontend.model.UnreadCount;
+
 import jakarta.inject.Singleton;
+
+import lombok.extern.slf4j.Slf4j;
+
 import java.time.Instant;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 @Singleton

commafeed-server/src/main/java/com/commafeed/backend/service/MailService.java

@@ -1,9 +1,12 @@
 package com.commafeed.backend.service;
 
 import com.commafeed.backend.model.User;
+
 import io.quarkus.mailer.Mail;
 import io.quarkus.mailer.Mailer;
+
 import jakarta.inject.Singleton;
+
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor

commafeed-server/src/main/java/com/commafeed/backend/service/PasswordEncryptionService.java

@@ -1,16 +1,20 @@
 package com.commafeed.backend.service;
 
 import jakarta.inject.Singleton;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import org.apache.commons.lang3.StringUtils;
+
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.security.spec.KeySpec;
+
 import javax.crypto.SecretKey;
 import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.PBEKeySpec;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 
 // taken from http://www.javacodegeeks.com/2012/05/secure-password-storage-donts-dos-and.html
 @Slf4j

commafeed-server/src/main/java/com/commafeed/backend/service/PushNotificationService.java

@@ -8,13 +8,13 @@ import com.commafeed.backend.Urls;
 import com.commafeed.backend.model.FeedEntry;
 import com.commafeed.backend.model.FeedSubscription;
 import com.commafeed.backend.model.UserSettings.PushNotificationUserSettings;
+
 import io.vertx.core.json.JsonObject;
+
 import jakarta.inject.Singleton;
-import java.io.IOException;
+
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hc.client5.http.classic.methods.HttpPost;
 import org.apache.hc.client5.http.config.RequestConfig;
@@ -26,6 +26,11 @@ import org.apache.hc.core5.http.io.entity.StringEntity;
 import org.apache.hc.core5.http.message.BasicNameValuePair;
 import org.apache.hc.core5.util.Timeout;
 
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+
 @Singleton
 @Slf4j
 public class PushNotificationService {

commafeed-server/src/main/java/com/commafeed/backend/service/UserService.java

@@ -13,15 +13,19 @@ import com.commafeed.backend.model.UserRole;
 import com.commafeed.backend.model.UserRole.Role;
 import com.commafeed.backend.service.internal.PostLoginActivities;
 import com.google.common.base.Preconditions;
+
 import jakarta.inject.Singleton;
+
+import lombok.RequiredArgsConstructor;
+
+import org.apache.commons.lang3.StringUtils;
+
 import java.time.Instant;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
-import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
 
 @RequiredArgsConstructor
 @Singleton

commafeed-server/src/main/java/com/commafeed/backend/service/db/DatabaseCleaningService.java

@@ -11,10 +11,13 @@ import com.commafeed.backend.dao.FeedEntryStatusDAO;
 import com.commafeed.backend.dao.UnitOfWork;
 import com.commafeed.backend.model.AbstractModel;
 import com.commafeed.backend.model.Feed;
+
 import jakarta.inject.Singleton;
+
+import lombok.extern.slf4j.Slf4j;
+
 import java.time.Instant;
 import java.util.List;
-import lombok.extern.slf4j.Slf4j;
 
 /** Contains utility methods for cleaning the database */
 @Slf4j

commafeed-server/src/main/java/com/commafeed/backend/service/db/DatabaseStartupService.java

@@ -2,12 +2,16 @@ package com.commafeed.backend.service.db;
 
 import com.commafeed.backend.dao.UnitOfWork;
 import com.commafeed.backend.dao.UserDAO;
+
 import jakarta.inject.Singleton;
+
 import liquibase.database.Database;
 import liquibase.database.core.PostgresDatabase;
 import liquibase.structure.DatabaseObject;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+
 import org.kohsuke.MetaInfServices;
 
 @Slf4j

commafeed-server/src/main/java/com/commafeed/backend/service/internal/PostLoginActivities.java

@@ -3,10 +3,13 @@ package com.commafeed.backend.service.internal;
 import com.commafeed.backend.dao.UnitOfWork;
 import com.commafeed.backend.dao.UserDAO;
 import com.commafeed.backend.model.User;
+
 import jakarta.inject.Singleton;
+
+import lombok.RequiredArgsConstructor;
+
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
-import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
 @Singleton

commafeed-server/src/main/java/com/commafeed/backend/task/AutoMarkAsReadTask.java

@@ -1,10 +1,13 @@
 package com.commafeed.backend.task;
 
 import com.commafeed.backend.service.db.DatabaseCleaningService;
+
 import jakarta.inject.Singleton;
-import java.util.concurrent.TimeUnit;
+
 import lombok.RequiredArgsConstructor;
 
+import java.util.concurrent.TimeUnit;
+
 @RequiredArgsConstructor
 @Singleton
 public class AutoMarkAsReadTask extends ScheduledTask {

commafeed-server/src/main/java/com/commafeed/backend/task/DemoAccountCleanupTask.java

@@ -6,11 +6,14 @@ import com.commafeed.backend.dao.UnitOfWork;
 import com.commafeed.backend.dao.UserDAO;
 import com.commafeed.backend.model.User;
 import com.commafeed.backend.service.UserService;
+
 import jakarta.inject.Singleton;
-import java.util.concurrent.TimeUnit;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.concurrent.TimeUnit;
+
 @RequiredArgsConstructor
 @Singleton
 @Slf4j

commafeed-server/src/main/java/com/commafeed/backend/task/EntriesExceedingFeedCapacityCleanupTask.java

@@ -2,10 +2,13 @@ package com.commafeed.backend.task;
 
 import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.service.db.DatabaseCleaningService;
+
 import jakarta.inject.Singleton;
-import java.util.concurrent.TimeUnit;
+
 import lombok.RequiredArgsConstructor;
 
+import java.util.concurrent.TimeUnit;
+
 @RequiredArgsConstructor
 @Singleton
 public class EntriesExceedingFeedCapacityCleanupTask extends ScheduledTask {

commafeed-server/src/main/java/com/commafeed/backend/task/OldEntriesCleanupTask.java

@@ -2,11 +2,14 @@ package com.commafeed.backend.task;
 
 import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.service.db.DatabaseCleaningService;
+
 import jakarta.inject.Singleton;
+
+import lombok.RequiredArgsConstructor;
+
 import java.time.Duration;
 import java.time.Instant;
 import java.util.concurrent.TimeUnit;
-import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
 @Singleton

commafeed-server/src/main/java/com/commafeed/backend/task/OldStatusesCleanupTask.java

@@ -2,10 +2,13 @@ package com.commafeed.backend.task;
 
 import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.service.db.DatabaseCleaningService;
+
 import jakarta.inject.Singleton;
+
+import lombok.RequiredArgsConstructor;
+
 import java.time.Instant;
 import java.util.concurrent.TimeUnit;
-import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
 @Singleton

commafeed-server/src/main/java/com/commafeed/backend/task/OrphanedContentsCleanupTask.java

@@ -1,10 +1,13 @@
 package com.commafeed.backend.task;
 
 import com.commafeed.backend.service.db.DatabaseCleaningService;
+
 import jakarta.inject.Singleton;
-import java.util.concurrent.TimeUnit;
+
 import lombok.RequiredArgsConstructor;
 
+import java.util.concurrent.TimeUnit;
+
 @RequiredArgsConstructor
 @Singleton
 public class OrphanedContentsCleanupTask extends ScheduledTask {

commafeed-server/src/main/java/com/commafeed/backend/task/OrphanedFeedsCleanupTask.java

@@ -1,10 +1,13 @@
 package com.commafeed.backend.task;
 
 import com.commafeed.backend.service.db.DatabaseCleaningService;
+
 import jakarta.inject.Singleton;
-import java.util.concurrent.TimeUnit;
+
 import lombok.RequiredArgsConstructor;
 
+import java.util.concurrent.TimeUnit;
+
 @RequiredArgsConstructor
 @Singleton
 public class OrphanedFeedsCleanupTask extends ScheduledTask {

commafeed-server/src/main/java/com/commafeed/backend/task/ScheduledTask.java

@@ -1,8 +1,9 @@
 package com.commafeed.backend.task;
 
+import lombok.extern.slf4j.Slf4j;
+
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 public abstract class ScheduledTask {

commafeed-server/src/main/java/com/commafeed/backend/task/TaskScheduler.java

@@ -2,12 +2,16 @@ package com.commafeed.backend.task;
 
 import com.commafeed.CommaFeedConfiguration;
 import com.google.common.util.concurrent.MoreExecutors;
+
 import io.quarkus.arc.All;
+
 import jakarta.inject.Singleton;
+
+import lombok.extern.slf4j.Slf4j;
+
 import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
-import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 @Singleton

commafeed-server/src/main/java/com/commafeed/backend/urlprovider/InPageReferenceFeedURLProvider.java

@@ -1,11 +1,13 @@
 package com.commafeed.backend.urlprovider;
 
 import jakarta.inject.Singleton;
-import java.util.List;
+
-import java.util.stream.Stream;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 
+import java.util.List;
+import java.util.stream.Stream;
+
 @Singleton
 public class InPageReferenceFeedURLProvider implements FeedURLProvider {
 

commafeed-server/src/main/java/com/commafeed/backend/urlprovider/YoutubeFeedURLProvider.java

@@ -1,9 +1,11 @@
 package com.commafeed.backend.urlprovider;
 
 import jakarta.inject.Singleton;
-import java.util.List;
+
 import org.apache.commons.lang3.Strings;
 
+import java.util.List;
+
 /**
  * Workaround for Youtube channels
  *

commafeed-server/src/main/java/com/commafeed/frontend/model/Category.java

@@ -1,11 +1,14 @@
 package com.commafeed.frontend.model;
 
 import io.quarkus.runtime.annotations.RegisterForReflection;
+
+import lombok.Data;
+
+import org.eclipse.microprofile.openapi.annotations.media.Schema;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
-import lombok.Data;
-import org.eclipse.microprofile.openapi.annotations.media.Schema;
 
 @SuppressWarnings("serial")
 @Schema(description = "Entry details")

commafeed-server/src/main/java/com/commafeed/frontend/model/Entries.java

@@ -1,11 +1,14 @@
 package com.commafeed.frontend.model;
 
 import io.quarkus.runtime.annotations.RegisterForReflection;
+
+import lombok.Data;
+
+import org.eclipse.microprofile.openapi.annotations.media.Schema;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
-import lombok.Data;
-import org.eclipse.microprofile.openapi.annotations.media.Schema;
 
 @SuppressWarnings("serial")
 @Schema(description = "List of entries with some metadata")

commafeed-server/src/main/java/com/commafeed/frontend/model/Entry.java

@@ -6,15 +6,19 @@ import com.commafeed.backend.model.FeedEntryContent;
 import com.commafeed.backend.model.FeedEntryStatus;
 import com.commafeed.backend.model.FeedEntryTag;
 import com.commafeed.backend.model.FeedSubscription;
+
 import io.quarkus.runtime.annotations.RegisterForReflection;
-import java.io.Serializable;
+
-import java.time.Instant;
-import java.util.List;
 import lombok.Data;
+
 import org.apache.commons.lang3.Strings;
 import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 
+import java.io.Serializable;
+import java.time.Instant;
+import java.util.List;
+
 @SuppressWarnings("serial")
 @Schema(description = "Entry details")
 @Data

commafeed-server/src/main/java/com/commafeed/frontend/model/FeedInfo.java

@@ -1,10 +1,13 @@
 package com.commafeed.frontend.model;
 
 import io.quarkus.runtime.annotations.RegisterForReflection;
-import java.io.Serializable;
+
 import lombok.Data;
+
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 
+import java.io.Serializable;
+
 @SuppressWarnings("serial")
 @Schema(description = "Feed details")
 @Data

commafeed-server/src/main/java/com/commafeed/frontend/model/ServerInfo.java

@@ -1,10 +1,13 @@
 package com.commafeed.frontend.model;
 
 import io.quarkus.runtime.annotations.RegisterForReflection;
-import java.io.Serializable;
+
 import lombok.Data;
+
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 
+import java.io.Serializable;
+
 @SuppressWarnings("serial")
 @Schema(description = "Server infos")
 @Data

commafeed-server/src/main/java/com/commafeed/frontend/model/Settings.java

@@ -5,11 +5,15 @@ import com.commafeed.backend.model.UserSettings.PushNotificationType;
 import com.commafeed.backend.model.UserSettings.ReadingMode;
 import com.commafeed.backend.model.UserSettings.ReadingOrder;
 import com.commafeed.backend.model.UserSettings.ScrollMode;
+
 import io.quarkus.runtime.annotations.RegisterForReflection;
-import java.io.Serializable;
+
 import lombok.Data;
+
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 
+import java.io.Serializable;
+
 @SuppressWarnings("serial")
 @Schema(description = "User settings")
 @Data

commafeed-server/src/main/java/com/commafeed/frontend/model/Subscription.java

@@ -4,13 +4,17 @@ import com.commafeed.backend.feed.FeedUtils;
 import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.FeedCategory;
 import com.commafeed.backend.model.FeedSubscription;
+
 import io.quarkus.runtime.annotations.RegisterForReflection;
-import java.io.Serializable;
+
-import java.time.Instant;
 import lombok.Data;
+
 import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 
+import java.io.Serializable;
+import java.time.Instant;
+
 @SuppressWarnings("serial")
 @Schema(description = "User information")
 @Data

commafeed-server/src/main/java/com/commafeed/frontend/model/UnreadCount.java

@@ -1,12 +1,15 @@
 package com.commafeed.frontend.model;
 
 import io.quarkus.runtime.annotations.RegisterForReflection;
-import java.io.Serializable;
+
-import java.time.Instant;
 import lombok.Data;
+
 import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 
+import java.io.Serializable;
+import java.time.Instant;
+
 @SuppressWarnings("serial")
 @Schema(description = "Unread count")
 @Data

commafeed-server/src/main/java/com/commafeed/frontend/model/UserModel.java

@@ -1,12 +1,15 @@
 package com.commafeed.frontend.model;
 
 import io.quarkus.runtime.annotations.RegisterForReflection;
-import java.io.Serializable;
+
-import java.time.Instant;
 import lombok.Data;
+
 import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 
+import java.io.Serializable;
+import java.time.Instant;
+
 @SuppressWarnings("serial")
 @Schema(description = "User information")
 @Data

commafeed-server/src/main/java/com/commafeed/frontend/model/request/AddCategoryRequest.java

@@ -2,10 +2,13 @@ package com.commafeed.frontend.model.request;
 
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.Size;
-import java.io.Serializable;
+
 import lombok.Data;
+
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 
+import java.io.Serializable;
+
 @SuppressWarnings("serial")
 @Schema(description = "Add Category Request")
 @Data

commafeed-server/src/main/java/com/commafeed/frontend/model/request/AdminSaveUserRequest.java

@@ -1,10 +1,13 @@
 package com.commafeed.frontend.model.request;
 
 import com.commafeed.security.password.ValidPassword;
-import java.io.Serializable;
+
 import lombok.Data;
+
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 
+import java.io.Serializable;
+
 @SuppressWarnings("serial")
 @Schema(description = "Save User information")
 @Data

commafeed-server/src/main/java/com/commafeed/frontend/model/request/CategoryModificationRequest.java

@@ -1,10 +1,13 @@
 package com.commafeed.frontend.model.request;
 
 import jakarta.validation.constraints.Size;
-import java.io.Serializable;
+
 import lombok.Data;
+
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 
+import java.io.Serializable;
+
 @SuppressWarnings("serial")
 @Schema(description = "Category modification request")
 @Data

commafeed-server/src/main/java/com/commafeed/frontend/model/request/CollapseRequest.java

@@ -1,9 +1,11 @@
 package com.commafeed.frontend.model.request;
 
-import java.io.Serializable;
 import lombok.Data;
+
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 
+import java.io.Serializable;
+
 @SuppressWarnings("serial")
 @Schema(description = "Mark Request")
 @Data

commafeed-server/src/main/java/com/commafeed/frontend/model/request/FeedInfoRequest.java

@@ -2,10 +2,13 @@ package com.commafeed.frontend.model.request;
 
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.Size;
-import java.io.Serializable;
+
 import lombok.Data;
+
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 
+import java.io.Serializable;
+
 @SuppressWarnings("serial")
 @Schema(description = "Feed information request")
 @Data