insert jakarta imports where javax import were positioned

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

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

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

@@ -2,6 +2,8 @@ package com.commafeed.backend.service;
 
 import java.util.Optional;
 
+import jakarta.inject.Singleton;
+
 import org.apache.commons.lang3.StringUtils;
 
 import com.commafeed.backend.Digests;
@@ -12,7 +14,6 @@ import com.commafeed.backend.feed.parser.FeedParserResult.Enclosure;
 import com.commafeed.backend.feed.parser.FeedParserResult.Media;
 import com.commafeed.backend.model.FeedEntryContent;
 
-import jakarta.inject.Singleton;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor

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

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

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

@@ -3,6 +3,8 @@ package com.commafeed.backend.service;
 import java.time.Instant;
 import java.util.List;
 
+import jakarta.inject.Singleton;
+
 import com.commafeed.backend.Digests;
 import com.commafeed.backend.dao.FeedEntryDAO;
 import com.commafeed.backend.dao.FeedEntryStatusDAO;
@@ -17,7 +19,6 @@ import com.commafeed.backend.model.FeedSubscription;
 import com.commafeed.backend.model.User;
 import com.commafeed.backend.service.FeedEntryFilteringService.FeedEntryFilterException;
 
-import jakarta.inject.Singleton;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 

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

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

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

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

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

@@ -5,6 +5,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import jakarta.inject.Singleton;
+
 import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.dao.FeedDAO;
 import com.commafeed.backend.dao.FeedEntryStatusDAO;
@@ -17,7 +19,6 @@ import com.commafeed.backend.model.FeedSubscription;
 import com.commafeed.backend.model.User;
 import com.commafeed.frontend.model.UnreadCount;
 
-import jakarta.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j

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

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

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

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

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

@@ -8,6 +8,8 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 
+import jakarta.inject.Singleton;
+
 import org.apache.commons.lang3.StringUtils;
 
 import com.commafeed.CommaFeedApplication;
@@ -24,7 +26,6 @@ import com.commafeed.backend.model.UserRole.Role;
 import com.commafeed.backend.service.internal.PostLoginActivities;
 import com.google.common.base.Preconditions;
 
-import jakarta.inject.Singleton;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor

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

@@ -3,6 +3,8 @@ package com.commafeed.backend.service.db;
 import java.time.Instant;
 import java.util.List;
 
+import jakarta.inject.Singleton;
+
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.MetricRegistry;
 import com.commafeed.CommaFeedConfiguration;
@@ -15,7 +17,6 @@ import com.commafeed.backend.dao.UnitOfWork;
 import com.commafeed.backend.model.AbstractModel;
 import com.commafeed.backend.model.Feed;
 
-import jakarta.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 
 /**

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

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

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

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