diff --git a/commafeed-server/pom.xml b/commafeed-server/pom.xml index b63792f7..dc06dac5 100644 --- a/commafeed-server/pom.xml +++ b/commafeed-server/pom.xml @@ -12,8 +12,8 @@ CommaFeed Server - 5.1.0 - 4.4.0 + 7.0.0 + 5.0.0 2.1.0 @@ -22,7 +22,7 @@ io.dropwizard dropwizard-dependencies - 2.1.6 + 4.0.4 pom import @@ -125,7 +125,7 @@ io.swagger.core.v3 - swagger-maven-plugin + swagger-maven-plugin-jakarta 2.2.19 @@ -270,8 +270,8 @@ be.tomcools - dropwizard-websocket-jee7-bundle - 2.1.6 + dropwizard-websocket-jsr356-bundle + 4.0.0 io.whitfin @@ -288,6 +288,7 @@ commons-logging + 4.5.14 @@ -301,12 +302,13 @@ querydsl-apt ${querydsl.version} provided - hibernate + jakarta com.querydsl querydsl-jpa ${querydsl.version} + jakarta @@ -352,8 +354,8 @@ com.sun.mail - javax.mail - 1.5.3 + jakarta.mail + 2.0.1 diff --git a/commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java b/commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java index da6e8c92..c15227b4 100644 --- a/commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java +++ b/commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java @@ -7,14 +7,6 @@ import java.util.Set; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.servlet.DispatcherType; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.websocket.server.ServerEndpointConfig; - import org.hibernate.cfg.AvailableSettings; import com.codahale.metrics.json.MetricsModule; @@ -59,19 +51,26 @@ import com.google.inject.Key; import com.google.inject.TypeLiteral; import be.tomcools.dropwizard.websocket.WebsocketBundle; -import io.dropwizard.Application; import io.dropwizard.assets.AssetsBundle; import io.dropwizard.configuration.DefaultConfigurationFactoryFactory; import io.dropwizard.configuration.EnvironmentVariableSubstitutor; import io.dropwizard.configuration.SubstitutingSourceProvider; +import io.dropwizard.core.Application; +import io.dropwizard.core.setup.Bootstrap; +import io.dropwizard.core.setup.Environment; import io.dropwizard.db.DataSourceFactory; import io.dropwizard.forms.MultiPartBundle; import io.dropwizard.hibernate.HibernateBundle; import io.dropwizard.migrations.MigrationsBundle; import io.dropwizard.servlets.CacheBustingFilter; -import io.dropwizard.setup.Bootstrap; -import io.dropwizard.setup.Environment; import io.whitfin.dropwizard.configuration.EnvironmentSubstitutor; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.websocket.server.ServerEndpointConfig; public class CommaFeedApplication extends Application { diff --git a/commafeed-server/src/main/java/com/commafeed/CommaFeedConfiguration.java b/commafeed-server/src/main/java/com/commafeed/CommaFeedConfiguration.java index bbab016f..71b836a6 100644 --- a/commafeed-server/src/main/java/com/commafeed/CommaFeedConfiguration.java +++ b/commafeed-server/src/main/java/com/commafeed/CommaFeedConfiguration.java @@ -3,20 +3,19 @@ package com.commafeed; import java.util.Date; import java.util.ResourceBundle; -import javax.validation.Valid; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Positive; - import org.apache.commons.lang3.time.DateUtils; import com.commafeed.backend.cache.RedisPoolFactory; import com.commafeed.frontend.session.SessionHandlerFactory; import com.fasterxml.jackson.annotation.JsonProperty; -import io.dropwizard.Configuration; +import io.dropwizard.core.Configuration; import io.dropwizard.db.DataSourceFactory; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; import lombok.Getter; import lombok.Setter; 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 b453bd81..77fa366e 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java @@ -2,9 +2,6 @@ package com.commafeed.backend; import java.io.IOException; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.http.Consts; @@ -29,6 +26,8 @@ import org.apache.http.util.EntityUtils; import com.commafeed.CommaFeedConfiguration; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import lombok.Getter; import lombok.RequiredArgsConstructor; import nl.altindag.ssl.SSLFactory; 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 1eedbe4e..6aa4fc01 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 @@ -4,9 +4,6 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.hibernate.SessionFactory; import com.commafeed.backend.model.FeedCategory; @@ -15,6 +12,9 @@ import com.commafeed.backend.model.QUser; import com.commafeed.backend.model.User; import com.querydsl.core.types.Predicate; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + @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 bd32824d..09aea725 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,9 +3,6 @@ package com.commafeed.backend.dao; import java.util.Date; import java.util.List; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang3.StringUtils; import org.hibernate.SessionFactory; @@ -17,6 +14,9 @@ import com.google.common.collect.Iterables; import com.querydsl.jpa.JPAExpressions; import com.querydsl.jpa.impl.JPAQuery; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + @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 535eb0d3..9f53739d 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,9 +2,6 @@ package com.commafeed.backend.dao; import java.util.List; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.hibernate.SessionFactory; import com.commafeed.backend.model.FeedEntryContent; @@ -13,6 +10,9 @@ import com.commafeed.backend.model.QFeedEntryContent; import com.querydsl.jpa.JPAExpressions; import com.querydsl.jpa.JPQLQuery; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + @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 3c7af8c0..86197c9f 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,9 +3,6 @@ package com.commafeed.backend.dao; import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.apache.commons.codec.digest.DigestUtils; import org.hibernate.SessionFactory; @@ -15,6 +12,8 @@ import com.commafeed.backend.model.QFeedEntry; import com.querydsl.core.Tuple; import com.querydsl.core.types.dsl.NumberExpression; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; 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 7bf8045f..c99be768 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 @@ -5,9 +5,6 @@ import java.util.Comparator; import java.util.Date; import java.util.List; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.builder.CompareToBuilder; import org.hibernate.SessionFactory; @@ -35,6 +32,9 @@ import com.querydsl.core.BooleanBuilder; import com.querydsl.core.Tuple; import com.querydsl.jpa.impl.JPAQuery; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + @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 1f7adf08..74cb093b 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 @@ -2,9 +2,6 @@ package com.commafeed.backend.dao; import java.util.List; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.hibernate.SessionFactory; import com.commafeed.backend.model.FeedEntry; @@ -12,6 +9,9 @@ import com.commafeed.backend.model.FeedEntryTag; import com.commafeed.backend.model.QFeedEntryTag; import com.commafeed.backend.model.User; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + @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 3f32c95a..af24490f 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 @@ -4,9 +4,6 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.hibernate.SessionFactory; import com.commafeed.backend.model.Feed; @@ -18,6 +15,9 @@ import com.commafeed.backend.model.User; import com.google.common.collect.Iterables; import com.querydsl.jpa.JPQLQuery; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + @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 d1931546..bba1c3c9 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,7 +3,7 @@ package com.commafeed.backend.dao; import java.util.Collection; import org.hibernate.SessionFactory; -import org.hibernate.annotations.QueryHints; +import org.hibernate.jpa.SpecHints; import com.commafeed.backend.model.AbstractModel; import com.querydsl.core.types.EntityPath; @@ -20,7 +20,7 @@ public abstract class GenericDAO extends AbstractDAO protected GenericDAO(SessionFactory sessionFactory) { super(sessionFactory); - this.factory = new JPAQueryFactory(() -> currentSession()); + this.factory = new JPAQueryFactory(this::currentSession); } protected JPAQueryFactory query() { @@ -40,7 +40,7 @@ public abstract class GenericDAO extends AbstractDAO } public void saveOrUpdate(Collection models) { - models.forEach(m -> persist(m)); + models.forEach(this::persist); } public void update(T model) { @@ -53,7 +53,7 @@ public abstract class GenericDAO extends AbstractDAO public void delete(T object) { if (object != null) { - currentSession().delete(object); + currentSession().remove(object); } } @@ -64,7 +64,7 @@ public abstract class GenericDAO extends AbstractDAO protected void setTimeout(JPAQuery query, int timeoutMs) { if (timeoutMs > 0) { - query.setHint(QueryHints.TIMEOUT_JPA, timeoutMs); + query.setHint(SpecHints.HINT_SPEC_QUERY_TIMEOUT, timeoutMs); } } 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 fd6d1657..87be4676 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,13 +1,12 @@ package com.commafeed.backend.dao; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.Transaction; import org.hibernate.context.internal.ManagedSessionContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor(onConstructor = @__({ @Inject })) 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 23114dc2..679559b1 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,13 +1,13 @@ package com.commafeed.backend.dao; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.hibernate.SessionFactory; import com.commafeed.backend.model.QUser; import com.commafeed.backend.model.User; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + @Singleton public class UserDAO extends GenericDAO { @@ -31,6 +31,6 @@ public class UserDAO extends GenericDAO { } public long count() { - return query().selectFrom(user).fetchCount(); + return query().select(user.count()).from(user).fetchOne(); } } 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 ea4a682a..b882a58b 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,9 +4,6 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.hibernate.SessionFactory; import com.commafeed.backend.model.QUserRole; @@ -14,6 +11,9 @@ import com.commafeed.backend.model.User; import com.commafeed.backend.model.UserRole; import com.commafeed.backend.model.UserRole.Role; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + @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 0e68dc2e..31c4d3d2 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,14 +1,14 @@ package com.commafeed.backend.dao; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.hibernate.SessionFactory; import com.commafeed.backend.model.QUserSettings; import com.commafeed.backend.model.User; import com.commafeed.backend.model.UserSettings; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + @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 546af62e..69e64818 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,8 +1,5 @@ package com.commafeed.backend.favicon; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.apache.commons.lang3.StringUtils; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; @@ -13,6 +10,8 @@ import com.commafeed.backend.HttpGetter.HttpResult; import com.commafeed.backend.feed.FeedUtils; import com.commafeed.backend.model.Feed; +import jakarta.inject.Inject; +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 9b5511ef..8eaefdbe 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 @@ -5,9 +5,6 @@ import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; import java.util.List; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.apache.http.NameValuePair; import org.apache.http.client.utils.URLEncodedUtils; @@ -15,6 +12,8 @@ import com.commafeed.backend.HttpGetter; import com.commafeed.backend.HttpGetter.HttpResult; import com.commafeed.backend.model.Feed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; 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 39552235..9e1c1fc3 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,9 +5,6 @@ import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.apache.http.NameValuePair; import org.apache.http.client.utils.URLEncodedUtils; @@ -24,6 +21,8 @@ import com.google.api.services.youtube.model.Channel; import com.google.api.services.youtube.model.ChannelListResponse; import com.google.api.services.youtube.model.Thumbnail; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; 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 0380433c..2955d09e 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 @@ -5,9 +5,6 @@ import java.util.Date; import java.util.List; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.apache.commons.codec.binary.StringUtils; import org.apache.commons.codec.digest.DigestUtils; @@ -20,6 +17,8 @@ import com.commafeed.backend.model.FeedEntry; import com.commafeed.backend.urlprovider.FeedURLProvider; import com.rometools.rome.io.FeedException; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import lombok.RequiredArgsConstructor; import lombok.Value; import lombok.extern.slf4j.Slf4j; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedParser.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedParser.java index 4b2b0456..1919ac1a 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedParser.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedParser.java @@ -8,9 +8,6 @@ import java.util.Date; import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.jdom2.Element; @@ -36,6 +33,8 @@ import com.rometools.rome.feed.synd.SyndLinkImpl; import com.rometools.rome.io.FeedException; import com.rometools.rome.io.SyndFeedInput; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.Value; 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 65a86746..1aff7707 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 @@ -12,9 +12,6 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.apache.commons.lang3.time.DateUtils; import com.codahale.metrics.Gauge; @@ -27,6 +24,8 @@ import com.commafeed.backend.model.AbstractModel; import com.commafeed.backend.model.Feed; import io.dropwizard.lifecycle.Managed; +import jakarta.inject.Inject; +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 58be2db3..3db7abff 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 @@ -2,14 +2,14 @@ package com.commafeed.backend.feed; import java.util.Date; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.apache.commons.lang3.time.DateUtils; import com.commafeed.CommaFeedConfiguration; import com.commafeed.backend.model.Feed; +import jakarta.inject.Inject; +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 437c5570..be862467 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 @@ -9,9 +9,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; @@ -35,6 +32,8 @@ import com.commafeed.frontend.ws.WebSocketSessions; import com.google.common.util.concurrent.Striped; import io.dropwizard.lifecycle.Managed; +import jakarta.inject.Inject; +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 16f79859..b5bf3699 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 @@ -5,9 +5,6 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang3.StringUtils; @@ -19,6 +16,8 @@ import com.commafeed.backend.feed.FeedFetcher.FeedFetcherResult; import com.commafeed.backend.model.Feed; import com.commafeed.backend.model.FeedEntry; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import lombok.Value; import lombok.extern.slf4j.Slf4j; 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 292be748..8487f3c9 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 @@ -2,12 +2,11 @@ package com.commafeed.backend.model; import java.io.Serializable; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.TableGenerator; - +import jakarta.persistence.GeneratedValue; +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 9ac4e736..6ac34072 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 @@ -2,12 +2,11 @@ package com.commafeed.backend.model; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; 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 d3be1aee..e3c7d056 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 @@ -2,14 +2,13 @@ package com.commafeed.backend.model; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; - +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +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 68061118..b834293c 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 @@ -3,18 +3,17 @@ package com.commafeed.backend.model; import java.util.Date; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; 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 33a4246b..dbe953a1 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 @@ -1,16 +1,16 @@ package com.commafeed.backend.model; +import java.sql.Types; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.OneToMany; -import javax.persistence.Table; - import org.apache.commons.lang3.builder.EqualsBuilder; -import org.hibernate.annotations.Type; +import org.hibernate.annotations.JdbcTypeCode; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Lob; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import lombok.Getter; import lombok.Setter; @@ -29,7 +29,7 @@ public class FeedEntryContent extends AbstractModel { @Lob @Column(length = Integer.MAX_VALUE) - @Type(type = "org.hibernate.type.TextType") + @JdbcTypeCode(Types.LONGVARCHAR) private String content; @Column(length = 40) @@ -46,7 +46,7 @@ public class FeedEntryContent extends AbstractModel { @Lob @Column(length = Integer.MAX_VALUE) - @Type(type = "org.hibernate.type.TextType") + @JdbcTypeCode(Types.LONGVARCHAR) private String mediaDescription; @Column(length = 2048) 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 a891d4a1..7f6fb0ef 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 @@ -4,16 +4,15 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +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 ddf33ac7..38a6b4cd 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 @@ -1,12 +1,11 @@ package com.commafeed.backend.model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; - +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +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 3b4a8de4..5a4ad91c 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 @@ -2,15 +2,14 @@ package com.commafeed.backend.model; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; - +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +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 ce0eb075..8f517591 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 @@ -2,12 +2,11 @@ package com.commafeed.backend.model; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; 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 83f621ff..fdbe331a 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 @@ -1,14 +1,13 @@ package com.commafeed.backend.model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; - +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +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 04eb1fd3..124986d8 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 @@ -1,17 +1,18 @@ package com.commafeed.backend.model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import java.sql.Types; -import org.hibernate.annotations.Type; +import org.hibernate.annotations.JdbcTypeCode; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import lombok.Getter; import lombok.Setter; @@ -54,12 +55,12 @@ public class UserSettings extends AbstractModel { @Lob @Column(length = Integer.MAX_VALUE) - @Type(type = "org.hibernate.type.TextType") + @JdbcTypeCode(Types.LONGVARCHAR) private String customCss; @Lob @Column(length = Integer.MAX_VALUE) - @Type(type = "org.hibernate.type.TextType") + @JdbcTypeCode(Types.LONGVARCHAR) private String customJs; @Column(name = "scroll_speed") 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 6360308b..6690758f 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 @@ -5,9 +5,6 @@ import java.util.Date; import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.apache.commons.lang3.ObjectUtils; import com.commafeed.backend.dao.FeedCategoryDAO; @@ -19,6 +16,8 @@ import com.rometools.opml.feed.opml.Attribute; import com.rometools.opml.feed.opml.Opml; import com.rometools.opml.feed.opml.Outline; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor(onConstructor = @__({ @Inject })) 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 2f5f0199..a4a00480 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,9 +3,6 @@ package com.commafeed.backend.opml; import java.io.StringReader; import java.util.List; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -20,6 +17,8 @@ import com.rometools.opml.feed.opml.Outline; import com.rometools.rome.io.FeedException; import com.rometools.rome.io.WireFeedInput; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/service/DatabaseCleaningService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/DatabaseCleaningService.java index 8a3da161..c1f90e3b 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/service/DatabaseCleaningService.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/service/DatabaseCleaningService.java @@ -3,9 +3,6 @@ package com.commafeed.backend.service; import java.util.Date; import java.util.List; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.codahale.metrics.Meter; import com.codahale.metrics.MetricRegistry; import com.commafeed.CommaFeedConfiguration; @@ -17,6 +14,8 @@ import com.commafeed.backend.dao.FeedEntryStatusDAO; import com.commafeed.backend.dao.UnitOfWork; import com.commafeed.backend.model.Feed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import lombok.extern.slf4j.Slf4j; /** diff --git a/commafeed-server/src/main/java/com/commafeed/backend/service/DatabaseStartupService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/DatabaseStartupService.java index 9d906e1f..4d50c2a1 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/service/DatabaseStartupService.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/service/DatabaseStartupService.java @@ -1,7 +1,7 @@ package com.commafeed.backend.service; -import javax.inject.Inject; -import javax.inject.Singleton; +import java.util.HashMap; +import java.util.Map; import org.hibernate.Session; import org.hibernate.SessionFactory; @@ -11,13 +11,22 @@ import com.commafeed.backend.dao.UnitOfWork; import com.commafeed.backend.dao.UserDAO; import io.dropwizard.lifecycle.Managed; -import liquibase.Liquibase; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import liquibase.Scope; +import liquibase.UpdateSummaryEnum; +import liquibase.changelog.ChangeLogParameters; +import liquibase.command.CommandScope; +import liquibase.command.core.UpdateCommandStep; +import liquibase.command.core.helpers.DatabaseChangelogCommandStep; +import liquibase.command.core.helpers.DbUrlConnectionCommandStep; +import liquibase.command.core.helpers.ShowSummaryArgument; import liquibase.database.Database; import liquibase.database.DatabaseFactory; import liquibase.database.core.PostgresDatabase; import liquibase.database.jvm.JdbcConnection; +import liquibase.exception.DatabaseException; import liquibase.resource.ClassLoaderResourceAccessor; -import liquibase.resource.ResourceAccessor; import liquibase.structure.DatabaseObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -45,36 +54,50 @@ public class DatabaseStartupService implements Managed { private void updateSchema() { log.info("checking if database schema needs updating"); - Session session = sessionFactory.openSession(); - session.doWork(connection -> { - try { - JdbcConnection jdbcConnection = new JdbcConnection(connection); - Database database = DatabaseFactory.getInstance().findCorrectDatabaseImplementation(jdbcConnection); + try (Session session = sessionFactory.openSession()) { + session.doWork(connection -> { + try { + JdbcConnection jdbcConnection = new JdbcConnection(connection); + Database database = getDatabase(jdbcConnection); - if (database instanceof PostgresDatabase) { - database = new PostgresDatabase() { - @Override - public String escapeObjectName(String objectName, Class objectType) { - return objectName; - } - }; - database.setConnection(jdbcConnection); + Map scopeObjects = new HashMap<>(); + scopeObjects.put(Scope.Attr.database.name(), database); + scopeObjects.put(Scope.Attr.resourceAccessor.name(), + new ClassLoaderResourceAccessor(Thread.currentThread().getContextClassLoader())); + + Scope.child(scopeObjects, () -> { + CommandScope command = new CommandScope(UpdateCommandStep.COMMAND_NAME); + command.addArgumentValue(DbUrlConnectionCommandStep.DATABASE_ARG, database); + command.addArgumentValue(UpdateCommandStep.CHANGELOG_FILE_ARG, "migrations.xml"); + command.addArgumentValue(DatabaseChangelogCommandStep.CHANGELOG_PARAMETERS, new ChangeLogParameters(database)); + command.addArgumentValue(ShowSummaryArgument.SHOW_SUMMARY, UpdateSummaryEnum.OFF); + command.execute(); + }); + + } catch (Exception e) { + throw new RuntimeException(e); } - - ResourceAccessor accessor = new ClassLoaderResourceAccessor(Thread.currentThread().getContextClassLoader()); - try (Liquibase liq = new Liquibase("migrations.xml", accessor, database)) { - liq.update("prod"); - } - - } catch (Exception e) { - throw new RuntimeException(e); - } - }); - session.close(); + }); + } log.info("database schema is up to date"); } + private Database getDatabase(JdbcConnection connection) throws DatabaseException { + Database database = DatabaseFactory.getInstance().findCorrectDatabaseImplementation(connection); + if (database instanceof PostgresDatabase) { + database = new PostgresDatabase() { + @Override + public String escapeObjectName(String objectName, Class objectType) { + return objectName; + } + }; + database.setConnection(connection); + } + + return database; + } + private void initialData() { log.info("populating database with default values"); try { 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 17cb7955..85eb1809 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 @@ -6,9 +6,6 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang3.StringUtils; import org.jsoup.Jsoup; @@ -29,6 +26,8 @@ import com.commafeed.backend.feed.FeedUtils; import com.commafeed.backend.model.FeedEntryContent; import com.steadystate.css.parser.CSSOMParser; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; 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 9df917ad..ea5bc479 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,9 +9,6 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.apache.commons.jexl2.JexlContext; import org.apache.commons.jexl2.JexlEngine; import org.apache.commons.jexl2.JexlException; @@ -28,6 +25,8 @@ import org.jsoup.Jsoup; import com.commafeed.backend.model.FeedEntry; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor(onConstructor = @__({ @Inject })) 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 66431830..9db9f9f8 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 @@ -4,9 +4,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.apache.commons.codec.digest.DigestUtils; import com.commafeed.backend.cache.CacheService; @@ -21,6 +18,8 @@ import com.commafeed.backend.model.FeedEntryStatus; import com.commafeed.backend.model.FeedSubscription; import com.commafeed.backend.model.User; +import jakarta.inject.Inject; +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 20363fa4..512c07d8 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,15 +4,14 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.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.Inject; +import jakarta.inject.Singleton; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor(onConstructor = @__({ @Inject })) 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 c3bd9b67..d989b6b9 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 @@ -4,9 +4,6 @@ import java.io.IOException; import java.util.Date; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.io.IOUtils; @@ -16,6 +13,9 @@ import com.commafeed.backend.favicon.AbstractFaviconFetcher.Favicon; import com.commafeed.backend.feed.FeedUtils; import com.commafeed.backend.model.Feed; +import jakarta.inject.Inject; +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 1fa47b23..beb49643 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,9 +5,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.apache.commons.lang3.StringUtils; import com.commafeed.CommaFeedConfiguration; @@ -24,6 +21,8 @@ import com.commafeed.backend.model.Models; import com.commafeed.backend.model.User; import com.commafeed.frontend.model.UnreadCount; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import lombok.RequiredArgsConstructor; import lombok.extern.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 5b3d6000..e50556f0 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 @@ -3,20 +3,19 @@ package com.commafeed.backend.service; import java.util.Optional; import java.util.Properties; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.mail.Authenticator; -import javax.mail.Message; -import javax.mail.PasswordAuthentication; -import javax.mail.Session; -import javax.mail.Transport; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; - import com.commafeed.CommaFeedConfiguration; import com.commafeed.CommaFeedConfiguration.ApplicationSettings; import com.commafeed.backend.model.User; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.mail.Authenticator; +import jakarta.mail.Message; +import jakarta.mail.PasswordAuthentication; +import jakarta.mail.Session; +import jakarta.mail.Transport; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; import lombok.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 8460eeea..26aa70b9 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 @@ -9,11 +9,11 @@ import java.security.spec.KeySpec; import javax.crypto.SecretKey; import javax.crypto.SecretKeyFactory; import javax.crypto.spec.PBEKeySpec; -import javax.inject.Inject; -import javax.inject.Singleton; import org.apache.commons.lang3.StringUtils; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/commafeed-server/src/main/java/com/commafeed/backend/service/PubSubService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/PubSubService.java index 8e30b15c..fab42a41 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/service/PubSubService.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/service/PubSubService.java @@ -3,10 +3,6 @@ package com.commafeed.backend.service; import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.ws.rs.core.MediaType; - import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpHeaders; @@ -25,6 +21,9 @@ import com.commafeed.backend.feed.FeedUtils; import com.commafeed.backend.model.Feed; import com.commafeed.frontend.resource.PubSubHubbubCallbackREST; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.ws.rs.core.MediaType; 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 54432691..f4e1d04a 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,9 +8,6 @@ import java.util.Optional; import java.util.Set; import java.util.UUID; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang3.StringUtils; @@ -27,6 +24,8 @@ import com.commafeed.backend.model.UserRole.Role; import com.commafeed.backend.service.internal.PostLoginActivities; import com.google.common.base.Preconditions; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor(onConstructor = @__({ @Inject })) 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 8e1cb3e7..5f554a89 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 @@ -2,9 +2,6 @@ package com.commafeed.backend.service.internal; import java.util.Date; -import javax.inject.Inject; -import javax.inject.Singleton; - import org.apache.commons.lang3.time.DateUtils; import com.commafeed.CommaFeedConfiguration; @@ -13,6 +10,8 @@ import com.commafeed.backend.dao.UserDAO; import com.commafeed.backend.model.User; import com.commafeed.backend.service.FeedSubscriptionService; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor(onConstructor = @__({ @Inject })) 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 26f18b8d..ccd2a5d2 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,9 +2,6 @@ package com.commafeed.backend.task; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.commafeed.CommaFeedApplication; import com.commafeed.CommaFeedConfiguration; import com.commafeed.backend.dao.UnitOfWork; @@ -12,6 +9,8 @@ import com.commafeed.backend.dao.UserDAO; import com.commafeed.backend.model.User; import com.commafeed.backend.service.UserService; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; 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 5b810c53..e3131722 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 @@ -2,12 +2,11 @@ package com.commafeed.backend.task; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.commafeed.CommaFeedConfiguration; import com.commafeed.backend.service.DatabaseCleaningService; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor(onConstructor = @__({ @Inject })) 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 142a07c1..ba843822 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,12 +3,11 @@ package com.commafeed.backend.task; import java.util.Date; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.commafeed.CommaFeedConfiguration; import com.commafeed.backend.service.DatabaseCleaningService; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor(onConstructor = @__({ @Inject })) 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 a4f67394..4dacc185 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,11 +2,10 @@ package com.commafeed.backend.task; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.commafeed.backend.service.DatabaseCleaningService; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor(onConstructor = @__({ @Inject })) 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 f0fa68aa..08912113 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,11 +2,10 @@ package com.commafeed.backend.task; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.commafeed.backend.service.DatabaseCleaningService; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor(onConstructor = @__({ @Inject })) diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/auth/PasswordConstraintValidator.java b/commafeed-server/src/main/java/com/commafeed/frontend/auth/PasswordConstraintValidator.java index afd2a17d..5063770f 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/auth/PasswordConstraintValidator.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/auth/PasswordConstraintValidator.java @@ -2,9 +2,6 @@ package com.commafeed.frontend.auth; import java.util.List; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; - import org.apache.commons.lang3.StringUtils; import org.passay.CharacterRule; import org.passay.EnglishCharacterData; @@ -14,6 +11,8 @@ 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/main/java/com/commafeed/frontend/auth/SecurityCheckFactory.java b/commafeed-server/src/main/java/com/commafeed/frontend/auth/SecurityCheckFactory.java index 00ba1781..0a89f744 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/auth/SecurityCheckFactory.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/auth/SecurityCheckFactory.java @@ -6,12 +6,6 @@ import java.util.Optional; import java.util.Set; import java.util.function.Function; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - import org.glassfish.jersey.server.ContainerRequest; import com.commafeed.backend.model.User; @@ -19,6 +13,11 @@ import com.commafeed.backend.model.UserRole.Role; import com.commafeed.backend.service.UserService; import com.commafeed.frontend.session.SessionHelper; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/auth/SecurityCheckFactoryProvider.java b/commafeed-server/src/main/java/com/commafeed/frontend/auth/SecurityCheckFactoryProvider.java index 8d0079bc..7ccfbc64 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/auth/SecurityCheckFactoryProvider.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/auth/SecurityCheckFactoryProvider.java @@ -2,10 +2,6 @@ package com.commafeed.frontend.auth; import java.util.function.Function; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.servlet.http.HttpServletRequest; - import org.glassfish.hk2.utilities.binding.AbstractBinder; import org.glassfish.jersey.server.ContainerRequest; import org.glassfish.jersey.server.internal.inject.AbstractValueParamProvider; @@ -16,6 +12,9 @@ import org.glassfish.jersey.server.spi.internal.ValueParamProvider; import com.commafeed.backend.model.User; import com.commafeed.backend.service.UserService; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; @Singleton diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/auth/ValidPassword.java b/commafeed-server/src/main/java/com/commafeed/frontend/auth/ValidPassword.java index 8123dac3..63efdb4d 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/auth/ValidPassword.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/auth/ValidPassword.java @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Documented @Constraint(validatedBy = PasswordConstraintValidator.class) 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 a1815d49..d6b00158 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,11 +2,10 @@ package com.commafeed.frontend.model.request; import java.io.Serializable; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Size; - 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/CategoryModificationRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/CategoryModificationRequest.java index 99d02c95..f3ee4af2 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,10 +2,9 @@ package com.commafeed.frontend.model.request; import java.io.Serializable; -import javax.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 8507f5b2..5dd9b66a 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,11 +2,10 @@ package com.commafeed.frontend.model.request; import java.io.Serializable; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Size; - 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/FeedModificationRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/FeedModificationRequest.java index 1841fe99..c98bd0f1 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,10 +2,9 @@ package com.commafeed.frontend.model.request; import java.io.Serializable; -import javax.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/LoginRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/LoginRequest.java index 7b2c4e2e..c5dc4c98 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/model/request/LoginRequest.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/LoginRequest.java @@ -2,11 +2,10 @@ package com.commafeed.frontend.model.request; import java.io.Serializable; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Size; - 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/MarkRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/MarkRequest.java index 7dddfb51..e5ed7317 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,11 +3,10 @@ package com.commafeed.frontend.model.request; import java.io.Serializable; import java.util.List; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Size; - 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/MultipleMarkRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/MultipleMarkRequest.java index 22ead95b..3c1a312f 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,10 +3,9 @@ package com.commafeed.frontend.model.request; import java.io.Serializable; import java.util.List; -import javax.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 c098e8f3..de6a5db6 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,12 +2,11 @@ package com.commafeed.frontend.model.request; import java.io.Serializable; -import javax.validation.constraints.Email; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Size; - 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/ProfileModificationRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/ProfileModificationRequest.java index 9e508d28..c066a44d 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,13 +2,12 @@ package com.commafeed.frontend.model.request; import java.io.Serializable; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Size; - import com.commafeed.frontend.auth.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 3133a23d..bdf84ec9 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,14 +2,13 @@ package com.commafeed.frontend.model.request; import java.io.Serializable; -import javax.validation.constraints.Email; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Size; - import com.commafeed.frontend.auth.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 715a85a4..5e982894 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,11 +2,10 @@ package com.commafeed.frontend.model.request; import java.io.Serializable; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Size; - 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/SubscribeRequest.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/request/SubscribeRequest.java index 2045fdf3..d5335ccd 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,11 +2,10 @@ package com.commafeed.frontend.model.request; import java.io.Serializable; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Size; - 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/resource/AdminREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/AdminREST.java index 674d13cf..97566fd9 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,18 +4,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; - import org.apache.commons.lang3.StringUtils; import com.codahale.metrics.MetricRegistry; @@ -43,6 +31,17 @@ import io.swagger.v3.oas.annotations.media.ArraySchema; 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 jakarta.inject.Inject; +import jakarta.inject.Singleton; +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("/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 546d8635..d470e928 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 @@ -12,20 +12,6 @@ import java.util.Objects; import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.validation.Valid; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; - import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -70,6 +56,19 @@ import io.swagger.v3.oas.annotations.media.ArraySchema; 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 jakarta.inject.Inject; +import jakarta.inject.Singleton; +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 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 92dcd718..45547d5c 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,17 +2,6 @@ package com.commafeed.frontend.resource; import java.util.List; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.validation.Valid; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - import com.codahale.metrics.annotation.Timed; import com.commafeed.backend.dao.FeedEntryTagDAO; import com.commafeed.backend.model.User; @@ -28,6 +17,16 @@ import com.google.common.base.Preconditions; import io.dropwizard.hibernate.UnitOfWork; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +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("/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 1b68ddb8..df18483e 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 @@ -12,24 +12,6 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.validation.Valid; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.CacheControl; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.Response.Status; - import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -89,6 +71,23 @@ import io.swagger.v3.oas.annotations.Parameter; 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 jakarta.inject.Inject; +import jakarta.inject.Singleton; +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.CacheControl; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.Response.Status; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/resource/PubSubHubbubCallbackREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/PubSubHubbubCallbackREST.java index 2e28dd68..969c0cda 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/resource/PubSubHubbubCallbackREST.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/resource/PubSubHubbubCallbackREST.java @@ -3,20 +3,6 @@ package com.commafeed.frontend.resource; import java.util.Date; import java.util.List; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; - import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; @@ -32,6 +18,19 @@ import com.commafeed.backend.model.Feed; import com.google.common.base.Preconditions; import io.dropwizard.hibernate.UnitOfWork; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.servlet.http.HttpServletRequest; +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.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; 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 6e6d043c..0307a3bc 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,16 +1,5 @@ package com.commafeed.frontend.resource; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; - import org.apache.commons.lang3.StringUtils; import com.codahale.metrics.annotation.Timed; @@ -28,6 +17,16 @@ import io.swagger.v3.oas.annotations.Parameter; 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 jakarta.inject.Inject; +import jakarta.inject.Singleton; +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("/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 80549a7f..f6094ad4 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 @@ -5,21 +5,6 @@ import java.util.Date; import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.validation.Valid; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; - import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; @@ -58,6 +43,20 @@ import io.swagger.v3.oas.annotations.Parameter; 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 jakarta.inject.Inject; +import jakarta.inject.Singleton; +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.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; 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 e6524b52..b957a792 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 @@ -14,19 +14,6 @@ import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriInfo; - import org.glassfish.jersey.media.multipart.FormDataMultiPart; import com.codahale.metrics.annotation.Timed; @@ -52,6 +39,18 @@ import com.commafeed.frontend.resource.fever.FeverResponse.FeverGroup; import com.commafeed.frontend.resource.fever.FeverResponse.FeverItem; import io.dropwizard.hibernate.UnitOfWork; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +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/AbstractCustomCodeServlet.java b/commafeed-server/src/main/java/com/commafeed/frontend/servlet/AbstractCustomCodeServlet.java index aeeb591c..0399004f 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/servlet/AbstractCustomCodeServlet.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/servlet/AbstractCustomCodeServlet.java @@ -3,16 +3,15 @@ package com.commafeed.frontend.servlet; import java.io.IOException; import java.util.Optional; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.commafeed.backend.dao.UnitOfWork; import com.commafeed.backend.dao.UserSettingsDAO; import com.commafeed.backend.model.User; import com.commafeed.backend.model.UserSettings; import com.commafeed.frontend.session.SessionHelper; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; @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 7f572fce..2cc74fe2 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,11 +1,11 @@ package com.commafeed.frontend.servlet; -import javax.inject.Inject; - import com.commafeed.backend.dao.UnitOfWork; import com.commafeed.backend.dao.UserSettingsDAO; import com.commafeed.backend.model.UserSettings; +import jakarta.inject.Inject; + public class CustomCssServlet extends AbstractCustomCodeServlet { private static final long serialVersionUID = 1L; 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 73d37d40..e0b86468 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,12 +1,12 @@ package com.commafeed.frontend.servlet; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.commafeed.backend.dao.UnitOfWork; import com.commafeed.backend.dao.UserSettingsDAO; import com.commafeed.backend.model.UserSettings; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + @Singleton public class CustomJsServlet extends AbstractCustomCodeServlet { 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 78647fa4..760b0e07 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 @@ -2,15 +2,14 @@ package com.commafeed.frontend.servlet; import java.io.IOException; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.commafeed.CommaFeedConfiguration; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; @SuppressWarnings("serial") 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 bcf47bea..51c47329 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 @@ -4,13 +4,6 @@ import java.io.IOException; import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.apache.commons.lang3.StringUtils; import com.commafeed.CommaFeedConfiguration; @@ -29,6 +22,12 @@ import com.commafeed.frontend.resource.CategoryREST; import com.commafeed.frontend.session.SessionHelper; import com.google.common.collect.Iterables; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; @SuppressWarnings("serial") 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 7377a5e0..b9873ffe 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 @@ -2,10 +2,10 @@ package com.commafeed.frontend.servlet; import java.io.IOException; -import javax.inject.Singleton; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Singleton; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @Singleton public class RobotsTxtDisallowAllServlet extends HttpServlet { diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/session/SessionHandlerFactory.java b/commafeed-server/src/main/java/com/commafeed/frontend/session/SessionHandlerFactory.java index cc970c5e..a3388db4 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/session/SessionHandlerFactory.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/session/SessionHandlerFactory.java @@ -1,7 +1,5 @@ package com.commafeed.frontend.session; -import javax.servlet.SessionTrackingMode; - import org.eclipse.jetty.server.session.DatabaseAdaptor; import org.eclipse.jetty.server.session.DefaultSessionCache; import org.eclipse.jetty.server.session.JDBCSessionDataStore; @@ -14,6 +12,7 @@ import com.google.common.collect.ImmutableSet; import io.dropwizard.db.DataSourceFactory; import io.dropwizard.util.Duration; +import jakarta.servlet.SessionTrackingMode; public class SessionHandlerFactory { diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/session/SessionHelper.java b/commafeed-server/src/main/java/com/commafeed/frontend/session/SessionHelper.java index 3c385f0c..3d2c1353 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/session/SessionHelper.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/session/SessionHelper.java @@ -2,11 +2,10 @@ package com.commafeed.frontend.session; import java.util.Optional; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - import com.commafeed.backend.model.User; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/session/SessionHelperFactoryProvider.java b/commafeed-server/src/main/java/com/commafeed/frontend/session/SessionHelperFactoryProvider.java index d36595dc..4ff25de6 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/session/SessionHelperFactoryProvider.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/session/SessionHelperFactoryProvider.java @@ -2,11 +2,6 @@ package com.commafeed.frontend.session; import java.util.function.Function; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Context; - import org.glassfish.hk2.utilities.binding.AbstractBinder; import org.glassfish.jersey.server.ContainerRequest; import org.glassfish.jersey.server.internal.inject.AbstractValueParamProvider; @@ -14,6 +9,11 @@ import org.glassfish.jersey.server.internal.inject.MultivaluedParameterExtractor import org.glassfish.jersey.server.model.Parameter; import org.glassfish.jersey.server.spi.internal.ValueParamProvider; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.Context; + @Singleton public class SessionHelperFactoryProvider extends AbstractValueParamProvider { diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/ws/WebSocketConfigurator.java b/commafeed-server/src/main/java/com/commafeed/frontend/ws/WebSocketConfigurator.java index 38aafcc9..94785ae2 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/ws/WebSocketConfigurator.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/ws/WebSocketConfigurator.java @@ -2,17 +2,16 @@ package com.commafeed.frontend.ws; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.servlet.http.HttpSession; -import javax.websocket.HandshakeResponse; -import javax.websocket.server.HandshakeRequest; -import javax.websocket.server.ServerEndpointConfig; -import javax.websocket.server.ServerEndpointConfig.Configurator; - import com.commafeed.backend.model.User; import com.commafeed.frontend.session.SessionHelper; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.servlet.http.HttpSession; +import jakarta.websocket.HandshakeResponse; +import jakarta.websocket.server.HandshakeRequest; +import jakarta.websocket.server.ServerEndpointConfig; +import jakarta.websocket.server.ServerEndpointConfig.Configurator; import lombok.RequiredArgsConstructor; @Singleton 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 67fd3c9f..9bd19b94 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,15 +2,14 @@ package com.commafeed.frontend.ws; import java.io.IOException; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.websocket.CloseReason; -import javax.websocket.CloseReason.CloseCodes; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.MessageHandler; -import javax.websocket.Session; - +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.websocket.CloseReason; +import jakarta.websocket.CloseReason.CloseCodes; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.Session; 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 2ccb405d..1f1d5fd1 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 @@ -5,14 +5,13 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.websocket.Session; - import com.codahale.metrics.Gauge; import com.codahale.metrics.MetricRegistry; import com.commafeed.backend.model.User; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.websocket.Session; import lombok.extern.slf4j.Slf4j; @Singleton diff --git a/commafeed-server/src/test/java/com/commafeed/frontend/session/SessionHelperTest.java b/commafeed-server/src/test/java/com/commafeed/frontend/session/SessionHelperTest.java index 237f31ef..54a1d6d3 100644 --- a/commafeed-server/src/test/java/com/commafeed/frontend/session/SessionHelperTest.java +++ b/commafeed-server/src/test/java/com/commafeed/frontend/session/SessionHelperTest.java @@ -2,15 +2,15 @@ package com.commafeed.frontend.session; import java.util.Optional; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.commafeed.backend.model.User; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; + class SessionHelperTest { private static final String SESSION_KEY_USER = "user"; 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 f6676bf3..95a10417 100644 --- a/commafeed-server/src/test/java/com/commafeed/integration/BaseIT.java +++ b/commafeed-server/src/test/java/com/commafeed/integration/BaseIT.java @@ -6,10 +6,6 @@ import java.nio.charset.StandardCharsets; import java.time.Duration; import java.util.Objects; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.Response; - import org.apache.commons.io.IOUtils; import org.awaitility.Awaitility; import org.eclipse.jetty.http.HttpStatus; @@ -31,6 +27,9 @@ import com.commafeed.frontend.model.request.LoginRequest; import com.commafeed.frontend.model.request.SubscribeRequest; import io.dropwizard.testing.junit5.DropwizardExtensionsSupport; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.Response; 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 70bd4232..9e4aa788 100644 --- a/commafeed-server/src/test/java/com/commafeed/integration/SecurityIT.java +++ b/commafeed-server/src/test/java/com/commafeed/integration/SecurityIT.java @@ -2,10 +2,6 @@ package com.commafeed.integration; import java.util.Base64; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; - import org.eclipse.jetty.http.HttpStatus; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -16,6 +12,10 @@ import com.commafeed.frontend.model.UserModel; import com.commafeed.frontend.model.request.ProfileModificationRequest; import com.commafeed.frontend.model.request.SubscribeRequest; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; + class SecurityIT extends BaseIT { @Override 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 c0613814..9e908d29 100644 --- a/commafeed-server/src/test/java/com/commafeed/integration/WebSocketIT.java +++ b/commafeed-server/src/test/java/com/commafeed/integration/WebSocketIT.java @@ -9,18 +9,18 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -import javax.websocket.ClientEndpointConfig; -import javax.websocket.ContainerProvider; -import javax.websocket.DeploymentException; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.MessageHandler; -import javax.websocket.Session; - import org.awaitility.Awaitility; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import jakarta.websocket.ClientEndpointConfig; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.DeploymentException; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.Session; + class WebSocketIT extends BaseIT { @Test 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 c3904e82..aedb8f21 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 @@ -3,8 +3,6 @@ package com.commafeed.integration.rest; import java.util.Arrays; import java.util.List; -import javax.ws.rs.client.Entity; - import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -15,6 +13,8 @@ import com.commafeed.frontend.model.UserModel; import com.commafeed.frontend.model.request.IDRequest; import com.commafeed.integration.BaseIT; +import jakarta.ws.rs.client.Entity; + class AdminIT extends BaseIT { @Test 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 ca74a180..659baada 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 @@ -6,10 +6,6 @@ import java.time.Duration; import java.util.Date; import java.util.Objects; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.awaitility.Awaitility; @@ -31,6 +27,10 @@ import com.commafeed.frontend.model.request.IDRequest; import com.commafeed.frontend.model.request.MarkRequest; import com.commafeed.integration.BaseIT; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + class FeedIT extends BaseIT { @Nested @@ -175,7 +175,7 @@ class FeedIT extends BaseIT { @Nested class Opml { @Test - void importExportOpml() { + void importExportOpml() throws IOException { importOpml(); String opml = getClient().target(getApiBaseUrl() + "feed/export").request().get(String.class); String expextedOpml = "\n" + "\n" + " \n" @@ -186,14 +186,16 @@ class FeedIT extends BaseIT { Assertions.assertEquals(StringUtils.normalizeSpace(expextedOpml), StringUtils.normalizeSpace(opml)); } - void importOpml() { + void importOpml() throws IOException { InputStream stream = Objects.requireNonNull(getClass().getResourceAsStream("/opml/opml_v2.0.xml")); - MultiPart multiPart = new MultiPart().bodyPart(new StreamDataBodyPart("file", stream)); - multiPart.setMediaType(MediaType.MULTIPART_FORM_DATA_TYPE); + try (MultiPart multiPart = new MultiPart()) { + multiPart.bodyPart(new StreamDataBodyPart("file", stream)); + multiPart.setMediaType(MediaType.MULTIPART_FORM_DATA_TYPE); - getClient().target(getApiBaseUrl() + "feed/import") - .request() - .post(Entity.entity(multiPart, multiPart.getMediaType()), Void.TYPE); + getClient().target(getApiBaseUrl() + "feed/import") + .request() + .post(Entity.entity(multiPart, multiPart.getMediaType()), Void.TYPE); + } } } 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 ea7189df..9bf84fbd 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,8 +1,5 @@ package com.commafeed.integration.rest; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.Form; - import org.apache.commons.codec.digest.DigestUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -13,6 +10,9 @@ import com.commafeed.frontend.model.request.ProfileModificationRequest; import com.commafeed.frontend.resource.fever.FeverResponse; import com.commafeed.integration.BaseIT; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.Form; + class FeverIT extends BaseIT { private Long userId; 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 e8078a74..4e10db9a 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,15 +1,15 @@ package com.commafeed.integration.servlet; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; - import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import com.commafeed.frontend.model.Settings; import com.commafeed.integration.BaseIT; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; + class CustomCodeIT extends BaseIT { @Test 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 96298620..5dda094d 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 @@ -1,8 +1,5 @@ package com.commafeed.integration.servlet; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; - import org.eclipse.jetty.http.HttpStatus; import org.glassfish.jersey.client.ClientProperties; import org.junit.jupiter.api.Assertions; @@ -10,6 +7,9 @@ import org.junit.jupiter.api.Test; import com.commafeed.integration.BaseIT; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; + class LogoutIT extends BaseIT { @Test 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 da67f8be..8c1b0b4f 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,8 +1,5 @@ package com.commafeed.integration.servlet; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; - import org.eclipse.jetty.http.HttpStatus; import org.glassfish.jersey.client.ClientProperties; import org.junit.jupiter.api.Assertions; @@ -10,6 +7,9 @@ import org.junit.jupiter.api.Test; import com.commafeed.integration.BaseIT; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; + class NextUnreadIT extends BaseIT { @Test diff --git a/commafeed-server/src/test/java/com/commafeed/integration/servlet/RobotsTxtIT.java b/commafeed-server/src/test/java/com/commafeed/integration/servlet/RobotsTxtIT.java index 3ca95cfd..142b0c27 100644 --- a/commafeed-server/src/test/java/com/commafeed/integration/servlet/RobotsTxtIT.java +++ b/commafeed-server/src/test/java/com/commafeed/integration/servlet/RobotsTxtIT.java @@ -1,12 +1,12 @@ package com.commafeed.integration.servlet; -import javax.ws.rs.core.Response; - import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import com.commafeed.integration.BaseIT; +import jakarta.ws.rs.core.Response; + class RobotsTxtIT extends BaseIT { @Test void test() {