insert jakarta imports where javax import were positioned

commafeed-server/dev/checkstyle.xml

@@ -41,7 +41,7 @@
 		<module name="AvoidStaticImport" />
 		<module name="IllegalImport" />
 		<module name="ImportOrder">
-			<property name="groups" value="/^java\./,javax,org,com" />
+			<property name="groups" value="/^java\./,javax,jakarta,org,com" />
 			<property name="ordered" value="true" />
 			<property name="separated" value="true" />
 		</module>

commafeed-server/dev/eclipse.importorder

@@ -0,0 +1,7 @@
+#Organize Import Order
+#Wed Jan 29 15:15:04 CET 2025
+0=java
+1=javax
+2=jakarta
+3=org
+4=com

commafeed-server/pom.xml

@@ -315,6 +315,9 @@
 						<eclipse>
 							<file>${project.basedir}/dev/EclipseCodeFormatter.xml</file>
 						</eclipse>
+						<importOrder>
+							<file>${project.basedir}/dev/eclipse.importorder</file>
+						</importOrder>
 					</java>
 				</configuration>
 			</plugin>

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

@@ -1,5 +1,8 @@
 package com.commafeed;
 
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Singleton;
+
 import com.commafeed.backend.feed.FeedRefreshEngine;
 import com.commafeed.backend.service.db.DatabaseStartupService;
 import com.commafeed.backend.task.TaskScheduler;
@@ -7,8 +10,6 @@ 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;
 
 @Singleton

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

@@ -4,6 +4,9 @@ import java.time.Duration;
 import java.time.Instant;
 import java.util.Optional;
 
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.Positive;
+
 import com.commafeed.backend.feed.FeedRefreshIntervalCalculator;
 
 import io.quarkus.runtime.annotations.ConfigDocSection;
@@ -12,8 +15,6 @@ 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;
 
 /**
  * CommaFeed configuration

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

@@ -2,11 +2,11 @@ package com.commafeed;
 
 import java.time.InstantSource;
 
-import com.codahale.metrics.MetricRegistry;
-
 import jakarta.enterprise.inject.Produces;
 import jakarta.inject.Singleton;
 
+import com.codahale.metrics.MetricRegistry;
+
 @Singleton
 public class CommaFeedProducers {
 

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

@@ -5,6 +5,7 @@ import java.io.InputStream;
 import java.util.Properties;
 
 import jakarta.inject.Singleton;
+
 import lombok.Getter;
 
 @Singleton

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

@@ -1,5 +1,9 @@
 package com.commafeed;
 
+import jakarta.annotation.Priority;
+import jakarta.validation.ValidationException;
+import jakarta.ws.rs.ext.Provider;
+
 import org.jboss.resteasy.reactive.RestResponse;
 import org.jboss.resteasy.reactive.RestResponse.Status;
 import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
@@ -7,9 +11,6 @@ import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
 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.ext.Provider;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor

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

@@ -2,6 +2,8 @@ package com.commafeed;
 
 import java.util.concurrent.TimeUnit;
 
+import jakarta.inject.Singleton;
+
 import com.codahale.metrics.json.MetricsModule;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -9,7 +11,6 @@ import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
 import io.quarkus.jackson.ObjectMapperCustomizer;
-import jakarta.inject.Singleton;
 
 @Singleton
 public class JacksonCustomizer implements ObjectMapperCustomizer {

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

@@ -14,6 +14,9 @@ import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Stream;
 
+import jakarta.inject.Singleton;
+import jakarta.ws.rs.core.CacheControl;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hc.client5.http.DnsResolver;
 import org.apache.hc.client5.http.SystemDefaultDnsResolver;
@@ -49,8 +52,6 @@ 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 lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

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

@@ -3,15 +3,15 @@ package com.commafeed.backend.dao;
 import java.util.List;
 import java.util.Objects;
 
+import jakarta.inject.Singleton;
+import jakarta.persistence.EntityManager;
+
 import com.commafeed.backend.model.FeedCategory;
 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;
-
 @Singleton
 public class FeedCategoryDAO extends GenericDAO<FeedCategory> {
 

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

@@ -3,6 +3,9 @@ package com.commafeed.backend.dao;
 import java.time.Instant;
 import java.util.List;
 
+import jakarta.inject.Singleton;
+import jakarta.persistence.EntityManager;
+
 import org.apache.commons.lang3.StringUtils;
 
 import com.commafeed.backend.model.Feed;
@@ -11,9 +14,6 @@ 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;
-
 @Singleton
 public class FeedDAO extends GenericDAO<Feed> {
 

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

@@ -2,13 +2,13 @@ package com.commafeed.backend.dao;
 
 import java.util.List;
 
+import jakarta.inject.Singleton;
+import jakarta.persistence.EntityManager;
+
 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;
-
 @Singleton
 public class FeedEntryContentDAO extends GenericDAO<FeedEntryContent> {
 

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

@@ -3,14 +3,15 @@ package com.commafeed.backend.dao;
 import java.time.Instant;
 import java.util.List;
 
+import jakarta.inject.Singleton;
+import jakarta.persistence.EntityManager;
+
 import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.FeedEntry;
 import com.commafeed.backend.model.QFeedEntry;
 import com.querydsl.core.Tuple;
 import com.querydsl.core.types.dsl.NumberExpression;
 
-import jakarta.inject.Singleton;
-import jakarta.persistence.EntityManager;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

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

@@ -6,6 +6,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import jakarta.inject.Singleton;
+import jakarta.persistence.EntityManager;
+
 import org.apache.commons.collections4.CollectionUtils;
 
 import com.commafeed.CommaFeedConfiguration;
@@ -27,9 +30,6 @@ import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.Tuple;
 import com.querydsl.jpa.impl.JPAQuery;
 
-import jakarta.inject.Singleton;
-import jakarta.persistence.EntityManager;
-
 @Singleton
 public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
 

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

@@ -4,14 +4,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import jakarta.inject.Singleton;
+import jakarta.persistence.EntityManager;
+
 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;
-
 @Singleton
 public class FeedEntryTagDAO extends GenericDAO<FeedEntryTag> {
 

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

@@ -5,6 +5,9 @@ import java.util.Set;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
+import jakarta.inject.Singleton;
+import jakarta.persistence.EntityManager;
+
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.event.service.spi.EventListenerRegistry;
 import org.hibernate.event.spi.EventType;
@@ -22,9 +25,6 @@ import com.commafeed.backend.model.User;
 import com.google.common.collect.Iterables;
 import com.querydsl.jpa.JPQLQuery;
 
-import jakarta.inject.Singleton;
-import jakarta.persistence.EntityManager;
-
 @Singleton
 public class FeedSubscriptionDAO extends GenericDAO<FeedSubscription> {
 

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

@@ -3,6 +3,8 @@ package com.commafeed.backend.dao;
 import java.time.Duration;
 import java.util.Collection;
 
+import jakarta.persistence.EntityManager;
+
 import org.hibernate.Session;
 import org.hibernate.jpa.SpecHints;
 
@@ -13,7 +15,6 @@ 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;
 
 @RequiredArgsConstructor

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

@@ -1,8 +1,9 @@
 package com.commafeed.backend.dao;
 
-import io.quarkus.narayana.jta.QuarkusTransaction;
 import jakarta.inject.Singleton;
 
+import io.quarkus.narayana.jta.QuarkusTransaction;
+
 @Singleton
 public class UnitOfWork {
 

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

@@ -1,11 +1,11 @@
 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;
 
+import com.commafeed.backend.model.QUser;
+import com.commafeed.backend.model.User;
+
 @Singleton
 public class UserDAO extends GenericDAO<User> {
 

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

@@ -4,14 +4,14 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import jakarta.inject.Singleton;
+import jakarta.persistence.EntityManager;
+
 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;
-
 @Singleton
 public class UserRoleDAO extends GenericDAO<UserRole> {
 

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

@@ -1,12 +1,12 @@
 package com.commafeed.backend.dao;
 
+import jakarta.inject.Singleton;
+import jakarta.persistence.EntityManager;
+
 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;
-
 @Singleton
 public class UserSettingsDAO extends GenericDAO<UserSettings> {
 

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

@@ -1,5 +1,8 @@
 package com.commafeed.backend.favicon;
 
+import jakarta.annotation.Priority;
+import jakarta.inject.Singleton;
+
 import org.apache.commons.lang3.StringUtils;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
@@ -10,8 +13,6 @@ import com.commafeed.backend.HttpGetter.HttpResult;
 import com.commafeed.backend.feed.FeedUtils;
 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/FacebookFaviconFetcher.java

@@ -4,6 +4,8 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.List;
 
+import jakarta.inject.Singleton;
+
 import org.apache.hc.core5.http.NameValuePair;
 import org.apache.hc.core5.net.URIBuilder;
 
@@ -11,7 +13,6 @@ import com.commafeed.backend.HttpGetter;
 import com.commafeed.backend.HttpGetter.HttpResult;
 import com.commafeed.backend.model.Feed;
 
-import jakarta.inject.Singleton;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 

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.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

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

@@ -5,6 +5,9 @@ import java.net.URI;
 import java.util.List;
 import java.util.Optional;
 
+import jakarta.inject.Singleton;
+import jakarta.ws.rs.core.UriBuilder;
+
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.hc.core5.http.NameValuePair;
 import org.apache.hc.core5.net.URIBuilder;
@@ -21,8 +24,6 @@ import com.fasterxml.jackson.core.JsonPointer;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.core.UriBuilder;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 

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

@@ -6,6 +6,8 @@ import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
 
+import jakarta.inject.Singleton;
+
 import org.apache.commons.lang3.StringUtils;
 
 import com.commafeed.backend.Digests;
@@ -22,7 +24,6 @@ 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;
 
 /**

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

@@ -11,6 +11,8 @@ import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+import jakarta.inject.Singleton;
+
 import com.codahale.metrics.Gauge;
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.MetricRegistry;
@@ -20,7 +22,6 @@ 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;
 
 @Slf4j

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

@@ -5,14 +5,14 @@ import java.time.Instant;
 import java.time.InstantSource;
 import java.time.temporal.ChronoUnit;
 
+import jakarta.inject.Singleton;
+
 import org.apache.commons.lang3.ObjectUtils;
 
 import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.CommaFeedConfiguration.FeedRefreshErrorHandling;
 import com.google.common.primitives.Longs;
 
-import jakarta.inject.Singleton;
-
 @Singleton
 public class FeedRefreshIntervalCalculator {
 

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

@@ -10,6 +10,8 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 
+import jakarta.inject.Singleton;
+
 import org.apache.commons.lang3.StringUtils;
 
 import com.codahale.metrics.Meter;
@@ -29,7 +31,6 @@ import com.commafeed.frontend.ws.WebSocketMessageBuilder;
 import com.commafeed.frontend.ws.WebSocketSessions;
 import com.google.common.util.concurrent.Striped;
 
-import jakarta.inject.Singleton;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 

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

@@ -6,6 +6,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
+import jakarta.inject.Singleton;
+
 import org.apache.commons.lang3.StringUtils;
 
 import com.codahale.metrics.Meter;
@@ -17,7 +19,6 @@ 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;
 
 /**

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

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

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

@@ -3,12 +3,12 @@ package com.commafeed.backend.feed.parser;
 import java.util.Collection;
 import java.util.regex.Pattern;
 
+import jakarta.inject.Singleton;
+
 import org.ahocorasick.trie.Emit;
 import org.ahocorasick.trie.Trie;
 import org.apache.commons.lang3.StringUtils;
 
-import jakarta.inject.Singleton;
-
 @Singleton
 class FeedCleaner {
 

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

@@ -10,6 +10,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import jakarta.inject.Singleton;
+
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
@@ -37,7 +39,6 @@ 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 lombok.RequiredArgsConstructor;
 
 /**

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

@@ -7,6 +7,7 @@ import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.MappedSuperclass;
 import jakarta.persistence.TableGenerator;
+
 import lombok.Getter;
 import lombok.Setter;
 

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

@@ -3,12 +3,13 @@ package com.commafeed.backend.model;
 import java.sql.Types;
 import java.time.Instant;
 
-import org.hibernate.annotations.JdbcTypeCode;
-
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Lob;
 import jakarta.persistence.Table;
+
+import org.hibernate.annotations.JdbcTypeCode;
+
 import lombok.Getter;
 import lombok.Setter;
 

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

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

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

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

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

@@ -3,11 +3,6 @@ package com.commafeed.backend.model;
 import java.sql.Types;
 import java.util.Set;
 
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.hibernate.annotations.JdbcTypeCode;
-
-import com.commafeed.backend.feed.FeedUtils;
-
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
@@ -15,6 +10,12 @@ import jakarta.persistence.Enumerated;
 import jakarta.persistence.Lob;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.hibernate.annotations.JdbcTypeCode;
+
+import com.commafeed.backend.feed.FeedUtils;
+
 import lombok.Getter;
 import lombok.Setter;
 

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

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

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

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

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

@@ -3,12 +3,13 @@ package com.commafeed.backend.model;
 import java.sql.Types;
 import java.time.Instant;
 
-import org.hibernate.annotations.JdbcTypeCode;
-
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Lob;
 import jakarta.persistence.Table;
+
+import org.hibernate.annotations.JdbcTypeCode;
+
 import lombok.Getter;
 import lombok.Setter;
 

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

@@ -2,8 +2,6 @@ package com.commafeed.backend.model;
 
 import java.sql.Types;
 
-import org.hibernate.annotations.JdbcTypeCode;
-
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
@@ -13,6 +11,9 @@ import jakarta.persistence.JoinColumn;
 import jakarta.persistence.Lob;
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
+
+import org.hibernate.annotations.JdbcTypeCode;
+
 import lombok.Getter;
 import lombok.Setter;
 

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

@@ -4,6 +4,8 @@ import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 
+import jakarta.inject.Singleton;
+
 import org.apache.commons.lang3.ObjectUtils;
 
 import com.commafeed.backend.dao.FeedCategoryDAO;
@@ -15,7 +17,6 @@ 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;
 
 @RequiredArgsConstructor

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

@@ -3,6 +3,8 @@ package com.commafeed.backend.opml;
 import java.io.StringReader;
 import java.util.List;
 
+import jakarta.inject.Singleton;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -16,7 +18,6 @@ import com.rometools.opml.feed.opml.Outline;
 import com.rometools.rome.io.FeedException;
 import com.rometools.rome.io.WireFeedInput;
 
-import jakarta.inject.Singleton;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 

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

@@ -5,6 +5,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import jakarta.inject.Singleton;
+
 import org.apache.commons.lang3.StringUtils;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
@@ -22,7 +24,6 @@ import org.w3c.dom.css.CSSStyleDeclaration;
 import com.steadystate.css.parser.CSSOMParser;
 import com.steadystate.css.parser.SACParserCSS21;
 
-import jakarta.inject.Singleton;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 

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

@@ -2,6 +2,8 @@ package com.commafeed.backend.service;
 
 import java.util.Optional;
 
+import jakarta.inject.Singleton;
+
 import org.apache.commons.lang3.StringUtils;
 
 import com.commafeed.backend.Digests;
@@ -12,7 +14,6 @@ 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 lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor

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

@@ -9,6 +9,8 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import jakarta.inject.Singleton;
+
 import org.apache.commons.jexl2.JexlContext;
 import org.apache.commons.jexl2.JexlEngine;
 import org.apache.commons.jexl2.JexlException;
@@ -26,7 +28,6 @@ import org.jsoup.Jsoup;
 import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.model.FeedEntry;
 
-import jakarta.inject.Singleton;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor

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

@@ -3,6 +3,8 @@ package com.commafeed.backend.service;
 import java.time.Instant;
 import java.util.List;
 
+import jakarta.inject.Singleton;
+
 import com.commafeed.backend.Digests;
 import com.commafeed.backend.dao.FeedEntryDAO;
 import com.commafeed.backend.dao.FeedEntryStatusDAO;
@@ -17,7 +19,6 @@ 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;
 

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

@@ -4,13 +4,14 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import jakarta.inject.Singleton;
+
 import com.commafeed.backend.dao.FeedEntryDAO;
 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;
 
 @RequiredArgsConstructor

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

@@ -5,6 +5,8 @@ import java.time.Instant;
 import java.util.List;
 import java.util.Objects;
 
+import jakarta.inject.Singleton;
+
 import com.commafeed.backend.Digests;
 import com.commafeed.backend.dao.FeedDAO;
 import com.commafeed.backend.favicon.AbstractFaviconFetcher;
@@ -15,7 +17,6 @@ import com.commafeed.backend.model.Models;
 import com.google.common.io.Resources;
 
 import io.quarkus.arc.All;
-import jakarta.inject.Singleton;
 
 @Singleton
 public class FeedService {

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

@@ -5,6 +5,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import jakarta.inject.Singleton;
+
 import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.dao.FeedDAO;
 import com.commafeed.backend.dao.FeedEntryStatusDAO;
@@ -17,7 +19,6 @@ 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;
 
 @Slf4j

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

@@ -1,10 +1,11 @@
 package com.commafeed.backend.service;
 
+import jakarta.inject.Singleton;
+
 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

@@ -10,9 +10,10 @@ import javax.crypto.SecretKey;
 import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.PBEKeySpec;
 
+import jakarta.inject.Singleton;
+
 import org.apache.commons.lang3.StringUtils;
 
-import jakarta.inject.Singleton;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 

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

@@ -8,6 +8,8 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 
+import jakarta.inject.Singleton;
+
 import org.apache.commons.lang3.StringUtils;
 
 import com.commafeed.CommaFeedApplication;
@@ -24,7 +26,6 @@ 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;
 
 @RequiredArgsConstructor

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

@@ -3,6 +3,8 @@ package com.commafeed.backend.service.db;
 import java.time.Instant;
 import java.util.List;
 
+import jakarta.inject.Singleton;
+
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.MetricRegistry;
 import com.commafeed.CommaFeedConfiguration;
@@ -15,7 +17,6 @@ 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;
 
 /**

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

@@ -1,5 +1,7 @@
 package com.commafeed.backend.service.db;
 
+import jakarta.inject.Singleton;
+
 import org.kohsuke.MetaInfServices;
 
 import com.commafeed.CommaFeedConfiguration;
@@ -7,7 +9,6 @@ import com.commafeed.backend.dao.UnitOfWork;
 import com.commafeed.backend.dao.UserDAO;
 import com.commafeed.backend.service.UserService;
 
-import jakarta.inject.Singleton;
 import liquibase.database.Database;
 import liquibase.database.core.PostgresDatabase;
 import liquibase.structure.DatabaseObject;

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

@@ -3,11 +3,12 @@ package com.commafeed.backend.service.internal;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 
+import jakarta.inject.Singleton;
+
 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;
 
 @RequiredArgsConstructor

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

@@ -2,6 +2,8 @@ package com.commafeed.backend.task;
 
 import java.util.concurrent.TimeUnit;
 
+import jakarta.inject.Singleton;
+
 import com.commafeed.CommaFeedApplication;
 import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.dao.UnitOfWork;
@@ -9,7 +11,6 @@ import com.commafeed.backend.dao.UserDAO;
 import com.commafeed.backend.model.User;
 import com.commafeed.backend.service.UserService;
 
-import jakarta.inject.Singleton;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 

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

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

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

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

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

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

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

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

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

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

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

@@ -4,9 +4,10 @@ import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 
-import io.quarkus.arc.All;
 import jakarta.inject.Singleton;
 
+import io.quarkus.arc.All;
+
 @Singleton
 public class TaskScheduler {
 

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

@@ -1,11 +1,11 @@
 package com.commafeed.backend.urlprovider;
 
+import jakarta.inject.Singleton;
+
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.select.Elements;
 
-import jakarta.inject.Singleton;
-
 @Singleton
 public class InPageReferenceFeedURLProvider implements FeedURLProvider {
 

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

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

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

@@ -2,10 +2,11 @@ package com.commafeed.frontend.model.request;
 
 import java.io.Serializable;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.Size;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import lombok.Data;
 
 @SuppressWarnings("serial")

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

@@ -2,9 +2,10 @@ package com.commafeed.frontend.model.request;
 
 import java.io.Serializable;
 
+import jakarta.validation.constraints.Size;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
-import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 @SuppressWarnings("serial")

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

@@ -2,10 +2,11 @@ package com.commafeed.frontend.model.request;
 
 import java.io.Serializable;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.Size;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import lombok.Data;
 
 @SuppressWarnings("serial")

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

@@ -2,9 +2,10 @@ package com.commafeed.frontend.model.request;
 
 import java.io.Serializable;
 
+import jakarta.validation.constraints.Size;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
-import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 @SuppressWarnings("serial")

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

@@ -3,10 +3,11 @@ package com.commafeed.frontend.model.request;
 import java.io.Serializable;
 import java.util.List;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.Size;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import lombok.Data;
 
 @SuppressWarnings("serial")

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

@@ -3,9 +3,10 @@ package com.commafeed.frontend.model.request;
 import java.io.Serializable;
 import java.util.List;
 
+import jakarta.validation.Valid;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
-import jakarta.validation.Valid;
 import lombok.Data;
 
 @SuppressWarnings("serial")

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

@@ -2,11 +2,12 @@ package com.commafeed.frontend.model.request;
 
 import java.io.Serializable;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.Size;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import lombok.Data;
 
 @SuppressWarnings("serial")

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

@@ -2,12 +2,13 @@ package com.commafeed.frontend.model.request;
 
 import java.io.Serializable;
 
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.Size;
+
 import com.commafeed.security.password.ValidPassword;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 @SuppressWarnings("serial")

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

@@ -2,13 +2,14 @@ package com.commafeed.frontend.model.request;
 
 import java.io.Serializable;
 
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.Size;
+
 import com.commafeed.security.password.ValidPassword;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 @SuppressWarnings("serial")

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

@@ -2,10 +2,11 @@ package com.commafeed.frontend.model.request;
 
 import java.io.Serializable;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.Size;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import lombok.Data;
 
 @SuppressWarnings("serial")

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

@@ -2,10 +2,11 @@ package com.commafeed.frontend.model.request;
 
 import java.io.Serializable;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.Size;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import lombok.Data;
 
 @SuppressWarnings("serial")

commafeed-server/src/main/java/com/commafeed/frontend/resource/AdminREST.java

@@ -4,6 +4,19 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.inject.Singleton;
+import jakarta.transaction.Transactional;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+
 import org.apache.commons.lang3.StringUtils;
 
 import com.codahale.metrics.MetricRegistry;
@@ -30,18 +43,6 @@ import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.security.RolesAllowed;
-import jakarta.inject.Singleton;
-import jakarta.transaction.Transactional;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
 import lombok.RequiredArgsConstructor;
 
 @Path("/rest/admin")

commafeed-server/src/main/java/com/commafeed/frontend/resource/CategoryREST.java

@@ -9,6 +9,22 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.inject.Singleton;
+import jakarta.transaction.Transactional;
+import jakarta.validation.Valid;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -52,21 +68,6 @@ import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.security.RolesAllowed;
-import jakarta.inject.Singleton;
-import jakarta.transaction.Transactional;
-import jakarta.validation.Valid;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DefaultValue;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 

commafeed-server/src/main/java/com/commafeed/frontend/resource/EntryREST.java

@@ -2,6 +2,18 @@ package com.commafeed.frontend.resource;
 
 import java.util.List;
 
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.inject.Singleton;
+import jakarta.transaction.Transactional;
+import jakarta.validation.Valid;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+
 import com.commafeed.backend.dao.FeedEntryTagDAO;
 import com.commafeed.backend.model.User;
 import com.commafeed.backend.service.FeedEntryService;
@@ -17,17 +29,6 @@ import com.google.common.base.Preconditions;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.security.RolesAllowed;
-import jakarta.inject.Singleton;
-import jakarta.transaction.Transactional;
-import jakarta.validation.Valid;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
 import lombok.RequiredArgsConstructor;
 
 @Path("/rest/entry")

commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java

@@ -7,6 +7,24 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.inject.Singleton;
+import jakarta.transaction.Transactional;
+import jakarta.validation.Valid;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.SystemUtils;
@@ -68,23 +86,6 @@ import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.security.RolesAllowed;
-import jakarta.inject.Singleton;
-import jakarta.transaction.Transactional;
-import jakarta.validation.Valid;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DefaultValue;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 

commafeed-server/src/main/java/com/commafeed/frontend/resource/ServerREST.java

@@ -1,5 +1,18 @@
 package com.commafeed.frontend.resource;
 
+import jakarta.annotation.security.PermitAll;
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.inject.Singleton;
+import jakarta.transaction.Transactional;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+
 import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.CommaFeedVersion;
 import com.commafeed.backend.HttpGetter;
@@ -14,18 +27,6 @@ import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.security.PermitAll;
-import jakarta.annotation.security.RolesAllowed;
-import jakarta.inject.Singleton;
-import jakarta.transaction.Transactional;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
 import lombok.RequiredArgsConstructor;
 
 @Path("/rest/server")

commafeed-server/src/main/java/com/commafeed/frontend/resource/UserREST.java

@@ -6,6 +6,23 @@ import java.util.Collections;
 import java.util.Optional;
 import java.util.UUID;
 
+import jakarta.annotation.security.PermitAll;
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.inject.Singleton;
+import jakarta.transaction.Transactional;
+import jakarta.validation.Valid;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hc.core5.net.URIBuilder;
@@ -43,22 +60,6 @@ import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.security.PermitAll;
-import jakarta.annotation.security.RolesAllowed;
-import jakarta.inject.Singleton;
-import jakarta.transaction.Transactional;
-import jakarta.validation.Valid;
-import jakarta.ws.rs.BadRequestException;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriInfo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 

commafeed-server/src/main/java/com/commafeed/frontend/resource/fever/FeverREST.java

@@ -13,6 +13,20 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import jakarta.annotation.security.PermitAll;
+import jakarta.inject.Singleton;
+import jakarta.transaction.Transactional;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.UriInfo;
+
 import org.jboss.resteasy.reactive.server.multipart.FormValue;
 import org.jboss.resteasy.reactive.server.multipart.MultipartFormDataInput;
 
@@ -38,19 +52,6 @@ import com.commafeed.frontend.resource.fever.FeverResponse.FeverGroup;
 import com.commafeed.frontend.resource.fever.FeverResponse.FeverItem;
 
 import io.swagger.v3.oas.annotations.Hidden;
-import jakarta.annotation.security.PermitAll;
-import jakarta.inject.Singleton;
-import jakarta.transaction.Transactional;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.core.UriInfo;
 import lombok.RequiredArgsConstructor;
 
 /**

commafeed-server/src/main/java/com/commafeed/frontend/servlet/CustomCssServlet.java

@@ -1,15 +1,16 @@
 package com.commafeed.frontend.servlet;
 
-import com.commafeed.backend.dao.UserSettingsDAO;
-import com.commafeed.backend.model.User;
-import com.commafeed.backend.model.UserSettings;
-import com.commafeed.security.AuthenticationContext;
-
 import jakarta.inject.Singleton;
 import jakarta.transaction.Transactional;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
+
+import com.commafeed.backend.dao.UserSettingsDAO;
+import com.commafeed.backend.model.User;
+import com.commafeed.backend.model.UserSettings;
+import com.commafeed.security.AuthenticationContext;
+
 import lombok.RequiredArgsConstructor;
 
 @Path("/custom_css.css")

commafeed-server/src/main/java/com/commafeed/frontend/servlet/CustomJsServlet.java

@@ -1,15 +1,16 @@
 package com.commafeed.frontend.servlet;
 
-import com.commafeed.backend.dao.UserSettingsDAO;
-import com.commafeed.backend.model.User;
-import com.commafeed.backend.model.UserSettings;
-import com.commafeed.security.AuthenticationContext;
-
 import jakarta.inject.Singleton;
 import jakarta.transaction.Transactional;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
+
+import com.commafeed.backend.dao.UserSettingsDAO;
+import com.commafeed.backend.model.User;
+import com.commafeed.backend.model.UserSettings;
+import com.commafeed.security.AuthenticationContext;
+
 import lombok.RequiredArgsConstructor;
 
 @Path("/custom_js.js")

commafeed-server/src/main/java/com/commafeed/frontend/servlet/LogoutServlet.java

@@ -3,8 +3,6 @@ package com.commafeed.frontend.servlet;
 import java.time.Instant;
 import java.util.Date;
 
-import org.eclipse.microprofile.config.inject.ConfigProperty;
-
 import jakarta.annotation.security.PermitAll;
 import jakarta.inject.Singleton;
 import jakarta.ws.rs.GET;
@@ -13,6 +11,8 @@ import jakarta.ws.rs.core.NewCookie;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.UriInfo;
 
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
 @Path("/logout")
 @PermitAll
 @Singleton

commafeed-server/src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java

@@ -3,6 +3,15 @@ package com.commafeed.frontend.servlet;
 import java.net.URI;
 import java.util.List;
 
+import jakarta.inject.Singleton;
+import jakarta.transaction.Transactional;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
 import org.apache.commons.lang3.StringUtils;
 
 import com.commafeed.backend.dao.FeedCategoryDAO;
@@ -18,14 +27,6 @@ import com.commafeed.frontend.resource.CategoryREST;
 import com.commafeed.security.AuthenticationContext;
 import com.google.common.collect.Iterables;
 
-import jakarta.inject.Singleton;
-import jakarta.transaction.Transactional;
-import jakarta.ws.rs.DefaultValue;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.UriInfo;
 import lombok.RequiredArgsConstructor;
 
 @Path("/next")

commafeed-server/src/main/java/com/commafeed/frontend/servlet/RobotsTxtDisallowAllServlet.java

@@ -1,9 +1,5 @@
 package com.commafeed.frontend.servlet;
 
-import org.apache.hc.core5.http.HttpStatus;
-
-import com.commafeed.CommaFeedConfiguration;
-
 import jakarta.annotation.security.PermitAll;
 import jakarta.inject.Singleton;
 import jakarta.ws.rs.GET;
@@ -11,6 +7,11 @@ import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
+
+import org.apache.hc.core5.http.HttpStatus;
+
+import com.commafeed.CommaFeedConfiguration;
+
 import lombok.RequiredArgsConstructor;
 
 @Path("/robots.txt")

commafeed-server/src/main/java/com/commafeed/frontend/ws/WebSocketEndpoint.java

@@ -2,10 +2,6 @@ package com.commafeed.frontend.ws;
 
 import java.io.IOException;
 
-import com.commafeed.CommaFeedConfiguration;
-import com.commafeed.backend.model.User;
-import com.commafeed.security.AuthenticationContext;
-
 import jakarta.inject.Singleton;
 import jakarta.websocket.CloseReason;
 import jakarta.websocket.CloseReason.CloseCodes;
@@ -14,6 +10,11 @@ import jakarta.websocket.OnMessage;
 import jakarta.websocket.OnOpen;
 import jakarta.websocket.Session;
 import jakarta.websocket.server.ServerEndpoint;
+
+import com.commafeed.CommaFeedConfiguration;
+import com.commafeed.backend.model.User;
+import com.commafeed.security.AuthenticationContext;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 

commafeed-server/src/main/java/com/commafeed/frontend/ws/WebSocketSessions.java

@@ -4,12 +4,13 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+import jakarta.inject.Singleton;
+import jakarta.websocket.Session;
+
 import com.codahale.metrics.Gauge;
 import com.codahale.metrics.MetricRegistry;
 import com.commafeed.backend.model.User;
 
-import jakarta.inject.Singleton;
-import jakarta.websocket.Session;
 import lombok.extern.slf4j.Slf4j;
 
 @Singleton

commafeed-server/src/main/java/com/commafeed/security/AuthenticationContext.java

@@ -1,10 +1,11 @@
 package com.commafeed.security;
 
+import jakarta.inject.Singleton;
+
 import com.commafeed.backend.dao.UserDAO;
 import com.commafeed.backend.model.User;
 
 import io.quarkus.security.identity.SecurityIdentity;
-import jakarta.inject.Singleton;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor

commafeed-server/src/main/java/com/commafeed/security/identity/DatabaseApiKeyIdentityProvider.java

@@ -4,6 +4,8 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import jakarta.inject.Singleton;
+
 import com.commafeed.backend.dao.UnitOfWork;
 import com.commafeed.backend.model.User;
 import com.commafeed.backend.model.UserRole.Role;
@@ -17,7 +19,6 @@ import io.quarkus.security.identity.request.TokenAuthenticationRequest;
 import io.quarkus.security.runtime.QuarkusPrincipal;
 import io.quarkus.security.runtime.QuarkusSecurityIdentity;
 import io.smallrye.mutiny.Uni;
-import jakarta.inject.Singleton;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor

commafeed-server/src/main/java/com/commafeed/security/identity/DatabaseUsernamePasswordIdentityProvider.java

@@ -4,6 +4,8 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import jakarta.inject.Singleton;
+
 import com.commafeed.backend.dao.UnitOfWork;
 import com.commafeed.backend.model.User;
 import com.commafeed.backend.model.UserRole.Role;
@@ -17,7 +19,6 @@ import io.quarkus.security.identity.request.UsernamePasswordAuthenticationReques
 import io.quarkus.security.runtime.QuarkusPrincipal;
 import io.quarkus.security.runtime.QuarkusSecurityIdentity;
 import io.smallrye.mutiny.Uni;
-import jakarta.inject.Singleton;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor

commafeed-server/src/main/java/com/commafeed/security/identity/TrustedIdentityProvider.java

@@ -3,6 +3,8 @@ package com.commafeed.security.identity;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import jakarta.inject.Singleton;
+
 import com.commafeed.backend.dao.UnitOfWork;
 import com.commafeed.backend.dao.UserDAO;
 import com.commafeed.backend.model.User;
@@ -18,7 +20,6 @@ import io.quarkus.security.identity.request.TrustedAuthenticationRequest;
 import io.quarkus.security.runtime.QuarkusPrincipal;
 import io.quarkus.security.runtime.QuarkusSecurityIdentity;
 import io.smallrye.mutiny.Uni;
-import jakarta.inject.Singleton;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor

commafeed-server/src/main/java/com/commafeed/security/mechanism/ApiKeyAuthenticationMecanism.java

@@ -3,6 +3,8 @@ package com.commafeed.security.mechanism;
 import java.util.Optional;
 import java.util.Set;
 
+import jakarta.inject.Singleton;
+
 import io.quarkus.security.credential.TokenCredential;
 import io.quarkus.security.identity.IdentityProviderManager;
 import io.quarkus.security.identity.SecurityIdentity;
@@ -12,7 +14,6 @@ import io.quarkus.vertx.http.runtime.security.ChallengeData;
 import io.quarkus.vertx.http.runtime.security.HttpAuthenticationMechanism;
 import io.smallrye.mutiny.Uni;
 import io.vertx.ext.web.RoutingContext;
-import jakarta.inject.Singleton;
 
 @Singleton
 public class ApiKeyAuthenticationMecanism implements HttpAuthenticationMechanism {

commafeed-server/src/main/java/com/commafeed/security/password/PasswordConstraintValidator.java

@@ -2,6 +2,9 @@ package com.commafeed.security.password;
 
 import java.util.List;
 
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+
 import org.apache.commons.lang3.StringUtils;
 import org.passay.CharacterRule;
 import org.passay.EnglishCharacterData;
@@ -11,8 +14,6 @@ import org.passay.PasswordValidator;
 import org.passay.RuleResult;
 import org.passay.WhitespaceRule;
 
-import jakarta.validation.ConstraintValidator;
-import jakarta.validation.ConstraintValidatorContext;
 import lombok.Setter;
 
 public class PasswordConstraintValidator implements ConstraintValidator<ValidPassword, String> {