diff --git a/commafeed-server/dev/checkstyle.xml b/commafeed-server/dev/checkstyle.xml index 1d018d99..e9315ac8 100644 --- a/commafeed-server/dev/checkstyle.xml +++ b/commafeed-server/dev/checkstyle.xml @@ -41,7 +41,7 @@ - + diff --git a/commafeed-server/dev/eclipse.importorder b/commafeed-server/dev/eclipse.importorder new file mode 100644 index 00000000..a4ee263e --- /dev/null +++ b/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 diff --git a/commafeed-server/pom.xml b/commafeed-server/pom.xml index b3395468..416a5c00 100644 --- a/commafeed-server/pom.xml +++ b/commafeed-server/pom.xml @@ -315,6 +315,9 @@ ${project.basedir}/dev/EclipseCodeFormatter.xml + + ${project.basedir}/dev/eclipse.importorder + diff --git a/commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java b/commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java index e404fb90..8ba64bb5 100644 --- a/commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java +++ b/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 diff --git a/commafeed-server/src/main/java/com/commafeed/CommaFeedConfiguration.java b/commafeed-server/src/main/java/com/commafeed/CommaFeedConfiguration.java index 99a01216..e68a04d5 100644 --- a/commafeed-server/src/main/java/com/commafeed/CommaFeedConfiguration.java +++ b/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 diff --git a/commafeed-server/src/main/java/com/commafeed/CommaFeedProducers.java b/commafeed-server/src/main/java/com/commafeed/CommaFeedProducers.java index 5fb10c10..372f760e 100644 --- a/commafeed-server/src/main/java/com/commafeed/CommaFeedProducers.java +++ b/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 { diff --git a/commafeed-server/src/main/java/com/commafeed/CommaFeedVersion.java b/commafeed-server/src/main/java/com/commafeed/CommaFeedVersion.java index 63188ed5..bd0afd4f 100644 --- a/commafeed-server/src/main/java/com/commafeed/CommaFeedVersion.java +++ b/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 diff --git a/commafeed-server/src/main/java/com/commafeed/ExceptionMappers.java b/commafeed-server/src/main/java/com/commafeed/ExceptionMappers.java index 4519743c..5e03c413 100644 --- a/commafeed-server/src/main/java/com/commafeed/ExceptionMappers.java +++ b/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 diff --git a/commafeed-server/src/main/java/com/commafeed/JacksonCustomizer.java b/commafeed-server/src/main/java/com/commafeed/JacksonCustomizer.java index 9e6c1a76..e0bdef39 100644 --- a/commafeed-server/src/main/java/com/commafeed/JacksonCustomizer.java +++ b/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 { diff --git a/commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java b/commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java index 5ac061de..914b8af4 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java +++ b/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; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java index a84449a0..3465a93f 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java +++ b/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 { diff --git a/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedDAO.java index 903cdf59..f53c9340 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedDAO.java +++ b/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 { diff --git a/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryContentDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryContentDAO.java index 7e4f180e..4eb350e5 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryContentDAO.java +++ b/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 { diff --git a/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java index 27d5de3f..7c9de5d3 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java +++ b/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; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java index dee56442..5ab6e6db 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java +++ b/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 { diff --git a/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryTagDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryTagDAO.java index bb00ad12..15b57f1c 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryTagDAO.java +++ b/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 { diff --git a/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedSubscriptionDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedSubscriptionDAO.java index 990ac21c..440b1d9b 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedSubscriptionDAO.java +++ b/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 { diff --git a/commafeed-server/src/main/java/com/commafeed/backend/dao/GenericDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/GenericDAO.java index 1b5306c6..5d3713c1 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/dao/GenericDAO.java +++ b/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 diff --git a/commafeed-server/src/main/java/com/commafeed/backend/dao/UnitOfWork.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/UnitOfWork.java index 5caa1ed2..d69ad10b 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/dao/UnitOfWork.java +++ b/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 { diff --git a/commafeed-server/src/main/java/com/commafeed/backend/dao/UserDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/UserDAO.java index ea7e475c..cda95d92 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/dao/UserDAO.java +++ b/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 { diff --git a/commafeed-server/src/main/java/com/commafeed/backend/dao/UserRoleDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/UserRoleDAO.java index 81d06301..e08be923 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/dao/UserRoleDAO.java +++ b/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 { diff --git a/commafeed-server/src/main/java/com/commafeed/backend/dao/UserSettingsDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/UserSettingsDAO.java index 89048624..a1a3e758 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/dao/UserSettingsDAO.java +++ b/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 { diff --git a/commafeed-server/src/main/java/com/commafeed/backend/favicon/DefaultFaviconFetcher.java b/commafeed-server/src/main/java/com/commafeed/backend/favicon/DefaultFaviconFetcher.java index 684b3e78..180bdc1c 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/favicon/DefaultFaviconFetcher.java +++ b/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; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/favicon/FacebookFaviconFetcher.java b/commafeed-server/src/main/java/com/commafeed/backend/favicon/FacebookFaviconFetcher.java index 0bf84c13..b0bc509d 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/favicon/FacebookFaviconFetcher.java +++ b/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; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/favicon/Favicon.java b/commafeed-server/src/main/java/com/commafeed/backend/favicon/Favicon.java index cd9a3419..e8d185c8 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/favicon/Favicon.java +++ b/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; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/favicon/YoutubeFaviconFetcher.java b/commafeed-server/src/main/java/com/commafeed/backend/favicon/YoutubeFaviconFetcher.java index caa2a1e5..97cafbb7 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/favicon/YoutubeFaviconFetcher.java +++ b/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; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedFetcher.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedFetcher.java index c63dbe2e..6db57c39 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedFetcher.java +++ b/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; /** diff --git a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshEngine.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshEngine.java index bd1ece18..661ce92f 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshEngine.java +++ b/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 diff --git a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshIntervalCalculator.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshIntervalCalculator.java index a0ec7dab..da1e43de 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshIntervalCalculator.java +++ b/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 { diff --git a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshUpdater.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshUpdater.java index 6bf9d009..ad565c2a 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshUpdater.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshUpdater.java @@ -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; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshWorker.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshWorker.java index c8c714c1..d375e918 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshWorker.java +++ b/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; /** diff --git a/commafeed-server/src/main/java/com/commafeed/backend/feed/parser/EncodingDetector.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/parser/EncodingDetector.java index 0dc092d7..133a7635 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/feed/parser/EncodingDetector.java +++ b/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 { diff --git a/commafeed-server/src/main/java/com/commafeed/backend/feed/parser/FeedCleaner.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/parser/FeedCleaner.java index e656121b..167f275c 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/feed/parser/FeedCleaner.java +++ b/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 { diff --git a/commafeed-server/src/main/java/com/commafeed/backend/feed/parser/FeedParser.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/parser/FeedParser.java index db886d4d..8359236d 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/feed/parser/FeedParser.java +++ b/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; /** diff --git a/commafeed-server/src/main/java/com/commafeed/backend/model/AbstractModel.java b/commafeed-server/src/main/java/com/commafeed/backend/model/AbstractModel.java index 8487f3c9..65198948 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/model/AbstractModel.java +++ b/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; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/model/Feed.java b/commafeed-server/src/main/java/com/commafeed/backend/model/Feed.java index 8e73549b..6b27bb0d 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/model/Feed.java +++ b/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; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/model/FeedCategory.java b/commafeed-server/src/main/java/com/commafeed/backend/model/FeedCategory.java index e3c7d056..ed61c962 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/model/FeedCategory.java +++ b/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; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntry.java b/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntry.java index c86c4992..bcd33300 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntry.java +++ b/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; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryContent.java b/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryContent.java index e28611c1..3f91bf5b 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryContent.java +++ b/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; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryStatus.java b/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryStatus.java index d708404d..0ccba2b3 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryStatus.java +++ b/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; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryTag.java b/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryTag.java index 38a6b4cd..fb7983cb 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/model/FeedEntryTag.java +++ b/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; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/model/FeedSubscription.java b/commafeed-server/src/main/java/com/commafeed/backend/model/FeedSubscription.java index 5a4ad91c..fafe0e0e 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/model/FeedSubscription.java +++ b/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; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/model/User.java b/commafeed-server/src/main/java/com/commafeed/backend/model/User.java index 73cc5313..ce4ef976 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/model/User.java +++ b/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; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/model/UserRole.java b/commafeed-server/src/main/java/com/commafeed/backend/model/UserRole.java index fdbe331a..89d34162 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/model/UserRole.java +++ b/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; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/model/UserSettings.java b/commafeed-server/src/main/java/com/commafeed/backend/model/UserSettings.java index a333c6e4..4ba7af63 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/model/UserSettings.java +++ b/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; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/opml/OPMLExporter.java b/commafeed-server/src/main/java/com/commafeed/backend/opml/OPMLExporter.java index f451ac93..f0d58d59 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/opml/OPMLExporter.java +++ b/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 diff --git a/commafeed-server/src/main/java/com/commafeed/backend/opml/OPMLImporter.java b/commafeed-server/src/main/java/com/commafeed/backend/opml/OPMLImporter.java index 4465025c..7ddb116f 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/opml/OPMLImporter.java +++ b/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; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryContentCleaningService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryContentCleaningService.java index a776c452..c9124309 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryContentCleaningService.java +++ b/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; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryContentService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryContentService.java index 94c1f11e..67a45feb 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryContentService.java +++ b/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 diff --git a/commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryFilteringService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryFilteringService.java index dd8857d6..f7e7014b 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryFilteringService.java +++ b/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 diff --git a/commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryService.java index 505245a6..c7715383 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryService.java +++ b/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; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryTagService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryTagService.java index 540956ab..e85f895c 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryTagService.java +++ b/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 diff --git a/commafeed-server/src/main/java/com/commafeed/backend/service/FeedService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/FeedService.java index 302c692c..8630ce5c 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/service/FeedService.java +++ b/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 { diff --git a/commafeed-server/src/main/java/com/commafeed/backend/service/FeedSubscriptionService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/FeedSubscriptionService.java index 06d58211..f1dfba65 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/service/FeedSubscriptionService.java +++ b/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 diff --git a/commafeed-server/src/main/java/com/commafeed/backend/service/MailService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/MailService.java index cef02d1f..c365535b 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/service/MailService.java +++ b/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 diff --git a/commafeed-server/src/main/java/com/commafeed/backend/service/PasswordEncryptionService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/PasswordEncryptionService.java index a6f7d5c6..f55d3f66 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/service/PasswordEncryptionService.java +++ b/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; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/service/UserService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/UserService.java index b56d4c47..c73e95f8 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/service/UserService.java +++ b/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 diff --git a/commafeed-server/src/main/java/com/commafeed/backend/service/db/DatabaseCleaningService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/db/DatabaseCleaningService.java index 0707d90c..5f2b79b9 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/service/db/DatabaseCleaningService.java +++ b/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; /** diff --git a/commafeed-server/src/main/java/com/commafeed/backend/service/db/DatabaseStartupService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/db/DatabaseStartupService.java index a5bbe584..674858e1 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/service/db/DatabaseStartupService.java +++ b/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; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/service/internal/PostLoginActivities.java b/commafeed-server/src/main/java/com/commafeed/backend/service/internal/PostLoginActivities.java index bd66f02b..97cd577e 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/service/internal/PostLoginActivities.java +++ b/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 diff --git a/commafeed-server/src/main/java/com/commafeed/backend/task/DemoAccountCleanupTask.java b/commafeed-server/src/main/java/com/commafeed/backend/task/DemoAccountCleanupTask.java index faa2757a..08154587 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/task/DemoAccountCleanupTask.java +++ b/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; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/task/EntriesExceedingFeedCapacityCleanupTask.java b/commafeed-server/src/main/java/com/commafeed/backend/task/EntriesExceedingFeedCapacityCleanupTask.java index 09351381..9c8f9061 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/task/EntriesExceedingFeedCapacityCleanupTask.java +++ b/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 diff --git a/commafeed-server/src/main/java/com/commafeed/backend/task/OldEntriesCleanupTask.java b/commafeed-server/src/main/java/com/commafeed/backend/task/OldEntriesCleanupTask.java index 4bc0cd32..ed11fe01 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/task/OldEntriesCleanupTask.java +++ b/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 diff --git a/commafeed-server/src/main/java/com/commafeed/backend/task/OldStatusesCleanupTask.java b/commafeed-server/src/main/java/com/commafeed/backend/task/OldStatusesCleanupTask.java index 62e87c90..f996c7b6 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/task/OldStatusesCleanupTask.java +++ b/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 diff --git a/commafeed-server/src/main/java/com/commafeed/backend/task/OrphanedContentsCleanupTask.java b/commafeed-server/src/main/java/com/commafeed/backend/task/OrphanedContentsCleanupTask.java index 786b7708..ee8f73b8 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/task/OrphanedContentsCleanupTask.java +++ b/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 diff --git a/commafeed-server/src/main/java/com/commafeed/backend/task/OrphanedFeedsCleanupTask.java b/commafeed-server/src/main/java/com/commafeed/backend/task/OrphanedFeedsCleanupTask.java index 81eb14ea..6df699ec 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/task/OrphanedFeedsCleanupTask.java +++ b/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 diff --git a/commafeed-server/src/main/java/com/commafeed/backend/task/TaskScheduler.java b/commafeed-server/src/main/java/com/commafeed/backend/task/TaskScheduler.java index 73a37bf0..5a536d8b 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/task/TaskScheduler.java +++ b/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 { diff --git a/commafeed-server/src/main/java/com/commafeed/backend/urlprovider/InPageReferenceFeedURLProvider.java b/commafeed-server/src/main/java/com/commafeed/backend/urlprovider/InPageReferenceFeedURLProvider.java index b2bf773c..f9ece22d 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/urlprovider/InPageReferenceFeedURLProvider.java +++ b/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 { diff --git a/commafeed-server/src/main/java/com/commafeed/backend/urlprovider/YoutubeFeedURLProvider.java b/commafeed-server/src/main/java/com/commafeed/backend/urlprovider/YoutubeFeedURLProvider.java index e7dfdb4b..7c6c38ec 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/urlprovider/YoutubeFeedURLProvider.java +++ b/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 * diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/model/request/AddCategoryRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/AddCategoryRequest.java index d6b00158..8a584b17 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/model/request/AddCategoryRequest.java +++ b/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") diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/model/request/CategoryModificationRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/CategoryModificationRequest.java index f3ee4af2..e38c55f0 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/model/request/CategoryModificationRequest.java +++ b/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") diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/model/request/FeedInfoRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/FeedInfoRequest.java index 5dd9b66a..f7d2e2b0 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/model/request/FeedInfoRequest.java +++ b/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") diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/model/request/FeedModificationRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/FeedModificationRequest.java index c98bd0f1..270ef488 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/model/request/FeedModificationRequest.java +++ b/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") diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/model/request/MarkRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/MarkRequest.java index d9cd6b6b..68d9a21f 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/model/request/MarkRequest.java +++ b/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") diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/model/request/MultipleMarkRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/MultipleMarkRequest.java index 3c1a312f..582ac0ca 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/model/request/MultipleMarkRequest.java +++ b/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") diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/model/request/PasswordResetRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/PasswordResetRequest.java index de6a5db6..f801e3eb 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/model/request/PasswordResetRequest.java +++ b/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") diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/model/request/ProfileModificationRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/ProfileModificationRequest.java index 1c2e1612..4f1ad0f5 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/model/request/ProfileModificationRequest.java +++ b/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") diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/model/request/RegistrationRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/RegistrationRequest.java index cc27052e..6e79b5e0 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/model/request/RegistrationRequest.java +++ b/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") diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/model/request/StarRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/StarRequest.java index 5e982894..5a6295b9 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/model/request/StarRequest.java +++ b/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") diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/model/request/SubscribeRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/SubscribeRequest.java index d5335ccd..993982cc 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/model/request/SubscribeRequest.java +++ b/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") diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/resource/AdminREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/AdminREST.java index 7f4f2c27..4d9d655f 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/resource/AdminREST.java +++ b/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") diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/resource/CategoryREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/CategoryREST.java index 0d83332d..7a8d6c1b 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/resource/CategoryREST.java +++ b/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; diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/resource/EntryREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/EntryREST.java index 1ebe6954..56d40a96 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/resource/EntryREST.java +++ b/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") diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java index f5ece902..2fc5271f 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java +++ b/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; diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/resource/ServerREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/ServerREST.java index 5a82f125..04190c2d 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/resource/ServerREST.java +++ b/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") diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/resource/UserREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/UserREST.java index 5d0f7b23..e6fe3350 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/resource/UserREST.java +++ b/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; diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/resource/fever/FeverREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/fever/FeverREST.java index 69b7ba1a..978dd871 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/resource/fever/FeverREST.java +++ b/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; /** diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/servlet/CustomCssServlet.java b/commafeed-server/src/main/java/com/commafeed/frontend/servlet/CustomCssServlet.java index 2d3353a4..473bda5c 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/servlet/CustomCssServlet.java +++ b/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") diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/servlet/CustomJsServlet.java b/commafeed-server/src/main/java/com/commafeed/frontend/servlet/CustomJsServlet.java index 7b2fea6b..99f92d5e 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/servlet/CustomJsServlet.java +++ b/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") diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/servlet/LogoutServlet.java b/commafeed-server/src/main/java/com/commafeed/frontend/servlet/LogoutServlet.java index 7114de35..1ff57563 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/servlet/LogoutServlet.java +++ b/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 diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java b/commafeed-server/src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java index 6f486180..f98b21b6 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java +++ b/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") diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/servlet/RobotsTxtDisallowAllServlet.java b/commafeed-server/src/main/java/com/commafeed/frontend/servlet/RobotsTxtDisallowAllServlet.java index 3e29cc6d..a558c448 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/servlet/RobotsTxtDisallowAllServlet.java +++ b/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") diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/ws/WebSocketEndpoint.java b/commafeed-server/src/main/java/com/commafeed/frontend/ws/WebSocketEndpoint.java index 93202ebf..20e590d3 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/ws/WebSocketEndpoint.java +++ b/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; diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/ws/WebSocketSessions.java b/commafeed-server/src/main/java/com/commafeed/frontend/ws/WebSocketSessions.java index 93caea5b..277cb9c8 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/ws/WebSocketSessions.java +++ b/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 diff --git a/commafeed-server/src/main/java/com/commafeed/security/AuthenticationContext.java b/commafeed-server/src/main/java/com/commafeed/security/AuthenticationContext.java index e0f5f794..39af33a2 100644 --- a/commafeed-server/src/main/java/com/commafeed/security/AuthenticationContext.java +++ b/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 diff --git a/commafeed-server/src/main/java/com/commafeed/security/identity/DatabaseApiKeyIdentityProvider.java b/commafeed-server/src/main/java/com/commafeed/security/identity/DatabaseApiKeyIdentityProvider.java index 5c1c95e7..664b6658 100644 --- a/commafeed-server/src/main/java/com/commafeed/security/identity/DatabaseApiKeyIdentityProvider.java +++ b/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 diff --git a/commafeed-server/src/main/java/com/commafeed/security/identity/DatabaseUsernamePasswordIdentityProvider.java b/commafeed-server/src/main/java/com/commafeed/security/identity/DatabaseUsernamePasswordIdentityProvider.java index dc3537da..3525b816 100644 --- a/commafeed-server/src/main/java/com/commafeed/security/identity/DatabaseUsernamePasswordIdentityProvider.java +++ b/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 diff --git a/commafeed-server/src/main/java/com/commafeed/security/identity/TrustedIdentityProvider.java b/commafeed-server/src/main/java/com/commafeed/security/identity/TrustedIdentityProvider.java index ecfffc57..77d5eb9a 100644 --- a/commafeed-server/src/main/java/com/commafeed/security/identity/TrustedIdentityProvider.java +++ b/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 diff --git a/commafeed-server/src/main/java/com/commafeed/security/mechanism/ApiKeyAuthenticationMecanism.java b/commafeed-server/src/main/java/com/commafeed/security/mechanism/ApiKeyAuthenticationMecanism.java index b611f827..44cf6159 100644 --- a/commafeed-server/src/main/java/com/commafeed/security/mechanism/ApiKeyAuthenticationMecanism.java +++ b/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 { diff --git a/commafeed-server/src/main/java/com/commafeed/security/password/PasswordConstraintValidator.java b/commafeed-server/src/main/java/com/commafeed/security/password/PasswordConstraintValidator.java index 4b842c77..bcc1b129 100644 --- a/commafeed-server/src/main/java/com/commafeed/security/password/PasswordConstraintValidator.java +++ b/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 { diff --git a/commafeed-server/src/test/java/com/commafeed/DatabaseReset.java b/commafeed-server/src/test/java/com/commafeed/DatabaseReset.java index fc83fb37..9f5ae03b 100644 --- a/commafeed-server/src/test/java/com/commafeed/DatabaseReset.java +++ b/commafeed-server/src/test/java/com/commafeed/DatabaseReset.java @@ -1,5 +1,7 @@ package com.commafeed; +import jakarta.enterprise.inject.spi.CDI; + import org.kohsuke.MetaInfServices; import com.commafeed.backend.service.db.DatabaseStartupService; @@ -7,7 +9,6 @@ import com.commafeed.backend.service.db.DatabaseStartupService; import io.quarkus.liquibase.runtime.LiquibaseSchemaProvider; import io.quarkus.test.junit.callback.QuarkusTestBeforeEachCallback; import io.quarkus.test.junit.callback.QuarkusTestMethodContext; -import jakarta.enterprise.inject.spi.CDI; /** * Resets database between tests diff --git a/commafeed-server/src/test/java/com/commafeed/frontend/ws/WebSocketSessionsTest.java b/commafeed-server/src/test/java/com/commafeed/frontend/ws/WebSocketSessionsTest.java index 201b240e..4461c473 100644 --- a/commafeed-server/src/test/java/com/commafeed/frontend/ws/WebSocketSessionsTest.java +++ b/commafeed-server/src/test/java/com/commafeed/frontend/ws/WebSocketSessionsTest.java @@ -1,5 +1,7 @@ package com.commafeed.frontend.ws; +import jakarta.websocket.Session; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -11,8 +13,6 @@ import org.mockito.junit.jupiter.MockitoExtension; import com.codahale.metrics.MetricRegistry; import com.commafeed.backend.model.User; -import jakarta.websocket.Session; - @ExtendWith(MockitoExtension.class) class WebSocketSessionsTest { diff --git a/commafeed-server/src/test/java/com/commafeed/integration/BaseIT.java b/commafeed-server/src/test/java/com/commafeed/integration/BaseIT.java index 592d8cce..19242bd6 100644 --- a/commafeed-server/src/test/java/com/commafeed/integration/BaseIT.java +++ b/commafeed-server/src/test/java/com/commafeed/integration/BaseIT.java @@ -8,6 +8,10 @@ import java.time.Duration; import java.util.List; import java.util.Objects; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; + import org.apache.commons.io.IOUtils; import org.apache.hc.core5.http.HttpStatus; import org.awaitility.Awaitility; @@ -24,9 +28,6 @@ import com.commafeed.frontend.model.request.SubscribeRequest; import io.restassured.RestAssured; import io.restassured.http.Header; -import jakarta.ws.rs.client.Client; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MediaType; import lombok.Getter; @Getter diff --git a/commafeed-server/src/test/java/com/commafeed/integration/SecurityIT.java b/commafeed-server/src/test/java/com/commafeed/integration/SecurityIT.java index 171672e5..77ad98d1 100644 --- a/commafeed-server/src/test/java/com/commafeed/integration/SecurityIT.java +++ b/commafeed-server/src/test/java/com/commafeed/integration/SecurityIT.java @@ -4,6 +4,9 @@ import java.net.HttpCookie; import java.util.List; import java.util.stream.Collectors; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; + import org.apache.hc.core5.http.HttpStatus; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -17,8 +20,6 @@ import com.commafeed.frontend.model.request.SubscribeRequest; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MediaType; @QuarkusTest class SecurityIT extends BaseIT { diff --git a/commafeed-server/src/test/java/com/commafeed/integration/WebSocketIT.java b/commafeed-server/src/test/java/com/commafeed/integration/WebSocketIT.java index 0e4b9397..104bcb18 100644 --- a/commafeed-server/src/test/java/com/commafeed/integration/WebSocketIT.java +++ b/commafeed-server/src/test/java/com/commafeed/integration/WebSocketIT.java @@ -11,6 +11,16 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; +import jakarta.websocket.ClientEndpointConfig; +import jakarta.websocket.CloseReason; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.DeploymentException; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.Session; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; + import org.apache.hc.core5.http.HttpStatus; import org.awaitility.Awaitility; import org.junit.jupiter.api.AfterEach; @@ -22,15 +32,6 @@ import com.commafeed.frontend.model.request.FeedModificationRequest; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; -import jakarta.websocket.ClientEndpointConfig; -import jakarta.websocket.CloseReason; -import jakarta.websocket.ContainerProvider; -import jakarta.websocket.DeploymentException; -import jakarta.websocket.Endpoint; -import jakarta.websocket.EndpointConfig; -import jakarta.websocket.Session; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MediaType; import lombok.extern.slf4j.Slf4j; @QuarkusTest diff --git a/commafeed-server/src/test/java/com/commafeed/integration/rest/AdminIT.java b/commafeed-server/src/test/java/com/commafeed/integration/rest/AdminIT.java index 403af391..2e46b1b7 100644 --- a/commafeed-server/src/test/java/com/commafeed/integration/rest/AdminIT.java +++ b/commafeed-server/src/test/java/com/commafeed/integration/rest/AdminIT.java @@ -2,6 +2,8 @@ package com.commafeed.integration.rest; import java.util.List; +import jakarta.ws.rs.core.MediaType; + import org.apache.hc.core5.http.HttpStatus; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; @@ -16,7 +18,6 @@ import com.commafeed.integration.BaseIT; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; -import jakarta.ws.rs.core.MediaType; @QuarkusTest class AdminIT extends BaseIT { diff --git a/commafeed-server/src/test/java/com/commafeed/integration/rest/FeedIT.java b/commafeed-server/src/test/java/com/commafeed/integration/rest/FeedIT.java index c17e6b0d..07595934 100644 --- a/commafeed-server/src/test/java/com/commafeed/integration/rest/FeedIT.java +++ b/commafeed-server/src/test/java/com/commafeed/integration/rest/FeedIT.java @@ -8,6 +8,9 @@ import java.time.LocalDate; import java.time.ZoneOffset; import java.util.Objects; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; + import org.apache.commons.io.IOUtils; import org.apache.hc.core5.http.HttpStatus; import org.awaitility.Awaitility; @@ -28,8 +31,6 @@ import com.commafeed.integration.BaseIT; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MediaType; @QuarkusTest class FeedIT extends BaseIT { diff --git a/commafeed-server/src/test/java/com/commafeed/integration/rest/FeverIT.java b/commafeed-server/src/test/java/com/commafeed/integration/rest/FeverIT.java index 595f70f5..62280b19 100644 --- a/commafeed-server/src/test/java/com/commafeed/integration/rest/FeverIT.java +++ b/commafeed-server/src/test/java/com/commafeed/integration/rest/FeverIT.java @@ -1,5 +1,7 @@ package com.commafeed.integration.rest; +import jakarta.ws.rs.core.MediaType; + import org.apache.hc.core5.http.HttpStatus; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; @@ -14,7 +16,6 @@ import com.commafeed.integration.BaseIT; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; -import jakarta.ws.rs.core.MediaType; @QuarkusTest class FeverIT extends BaseIT { diff --git a/commafeed-server/src/test/java/com/commafeed/integration/rest/UserIT.java b/commafeed-server/src/test/java/com/commafeed/integration/rest/UserIT.java index 13d09399..cf6a3e4e 100644 --- a/commafeed-server/src/test/java/com/commafeed/integration/rest/UserIT.java +++ b/commafeed-server/src/test/java/com/commafeed/integration/rest/UserIT.java @@ -2,6 +2,9 @@ package com.commafeed.integration.rest; import java.util.List; +import jakarta.inject.Inject; +import jakarta.ws.rs.core.MediaType; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -14,8 +17,6 @@ import io.quarkus.mailer.MockMailbox; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.vertx.ext.mail.MailMessage; -import jakarta.inject.Inject; -import jakarta.ws.rs.core.MediaType; @QuarkusTest class UserIT extends BaseIT { diff --git a/commafeed-server/src/test/java/com/commafeed/integration/servlet/CustomCodeIT.java b/commafeed-server/src/test/java/com/commafeed/integration/servlet/CustomCodeIT.java index 0d0484f9..b641d646 100644 --- a/commafeed-server/src/test/java/com/commafeed/integration/servlet/CustomCodeIT.java +++ b/commafeed-server/src/test/java/com/commafeed/integration/servlet/CustomCodeIT.java @@ -1,5 +1,7 @@ package com.commafeed.integration.servlet; +import jakarta.ws.rs.core.MediaType; + import org.apache.hc.core5.http.HttpStatus; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.AfterEach; @@ -11,7 +13,6 @@ import com.commafeed.integration.BaseIT; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; -import jakarta.ws.rs.core.MediaType; @QuarkusTest class CustomCodeIT extends BaseIT { diff --git a/commafeed-server/src/test/java/com/commafeed/integration/servlet/LogoutIT.java b/commafeed-server/src/test/java/com/commafeed/integration/servlet/LogoutIT.java index 9feb018c..1e6829ac 100644 --- a/commafeed-server/src/test/java/com/commafeed/integration/servlet/LogoutIT.java +++ b/commafeed-server/src/test/java/com/commafeed/integration/servlet/LogoutIT.java @@ -4,6 +4,8 @@ import java.net.HttpCookie; import java.util.List; import java.util.stream.Collectors; +import jakarta.ws.rs.core.HttpHeaders; + import org.apache.hc.core5.http.HttpStatus; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -13,7 +15,6 @@ import com.commafeed.integration.BaseIT; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.http.Headers; -import jakarta.ws.rs.core.HttpHeaders; @QuarkusTest class LogoutIT extends BaseIT { diff --git a/commafeed-server/src/test/java/com/commafeed/integration/servlet/NextUnreadIT.java b/commafeed-server/src/test/java/com/commafeed/integration/servlet/NextUnreadIT.java index 26437f0b..0d19a71f 100644 --- a/commafeed-server/src/test/java/com/commafeed/integration/servlet/NextUnreadIT.java +++ b/commafeed-server/src/test/java/com/commafeed/integration/servlet/NextUnreadIT.java @@ -1,5 +1,7 @@ package com.commafeed.integration.servlet; +import jakarta.ws.rs.core.HttpHeaders; + import org.apache.hc.core5.http.HttpStatus; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -9,7 +11,6 @@ import com.commafeed.integration.BaseIT; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; -import jakarta.ws.rs.core.HttpHeaders; @QuarkusTest class NextUnreadIT extends BaseIT {