From bb25e0ede6976c66f1ca58eeed5708454221bc7e Mon Sep 17 00:00:00 2001 From: Athou Date: Wed, 31 May 2023 07:27:24 +0200 Subject: [PATCH] intellij autofixes --- .../java/com/commafeed/backend/FixedSizeSortedSet.java | 2 +- .../java/com/commafeed/backend/dao/FeedCategoryDAO.java | 2 +- .../main/java/com/commafeed/backend/dao/FeedEntryDAO.java | 2 +- .../com/commafeed/backend/dao/FeedEntryStatusDAO.java | 2 +- .../java/com/commafeed/backend/dao/FeedEntryTagDAO.java | 2 +- .../com/commafeed/backend/dao/FeedSubscriptionDAO.java | 2 +- .../main/java/com/commafeed/backend/dao/GenericDAO.java | 2 +- .../src/main/java/com/commafeed/backend/dao/UserDAO.java | 2 +- .../main/java/com/commafeed/backend/dao/UserRoleDAO.java | 2 +- .../java/com/commafeed/backend/dao/UserSettingsDAO.java | 2 +- .../java/com/commafeed/backend/feed/FeedEntryKeyword.java | 2 +- .../main/java/com/commafeed/backend/feed/FeedFetcher.java | 2 +- .../backend/feed/FeedRefreshIntervalCalculator.java | 4 ++-- .../com/commafeed/backend/feed/FeedRefreshUpdater.java | 2 +- .../main/java/com/commafeed/backend/feed/FeedUtils.java | 4 ++-- .../java/com/commafeed/backend/rome/OPML11Parser.java | 6 +----- .../java/com/commafeed/backend/service/FeedService.java | 2 +- .../java/com/commafeed/backend/service/MailService.java | 4 ++-- .../java/com/commafeed/backend/service/UserService.java | 3 ++- .../frontend/auth/SecurityCheckFactoryProvider.java | 4 ++-- .../src/main/java/com/commafeed/frontend/model/Entry.java | 6 +++--- .../java/com/commafeed/frontend/resource/FeedREST.java | 8 ++++---- .../java/com/commafeed/frontend/resource/UserREST.java | 5 +++-- .../frontend/session/SessionHelperFactoryProvider.java | 2 +- .../commafeed/frontend/ws/WebSocketMessageBuilder.java | 2 +- .../com/commafeed/frontend/resource/UserRestTest.java | 4 ++-- 26 files changed, 39 insertions(+), 41 deletions(-) diff --git a/commafeed-server/src/main/java/com/commafeed/backend/FixedSizeSortedSet.java b/commafeed-server/src/main/java/com/commafeed/backend/FixedSizeSortedSet.java index acd1bf78..ae811579 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/FixedSizeSortedSet.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/FixedSizeSortedSet.java @@ -12,7 +12,7 @@ import java.util.List; */ public class FixedSizeSortedSet { - private List inner; + private final List inner; private final Comparator comparator; private final int capacity; 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 6fc78806..1eedbe4e 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 @@ -18,7 +18,7 @@ import com.querydsl.core.types.Predicate; @Singleton public class FeedCategoryDAO extends GenericDAO { - private QFeedCategory category = QFeedCategory.feedCategory; + private final QFeedCategory category = QFeedCategory.feedCategory; @Inject public FeedCategoryDAO(SessionFactory sessionFactory) { 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 ee446608..69f0d37d 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 @@ -21,7 +21,7 @@ import lombok.Getter; @Singleton public class FeedEntryDAO extends GenericDAO { - private QFeedEntry entry = QFeedEntry.feedEntry; + private final QFeedEntry entry = QFeedEntry.feedEntry; @Inject public FeedEntryDAO(SessionFactory sessionFactory) { 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 bda65daf..4eebc256 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 @@ -77,7 +77,7 @@ public class FeedEntryStatusDAO extends GenericDAO { private FeedEntryStatus handleStatus(User user, FeedEntryStatus status, FeedSubscription sub, FeedEntry entry) { if (status == null) { Date unreadThreshold = config.getApplicationSettings().getUnreadThreshold(); - boolean read = unreadThreshold == null ? false : entry.getUpdated().before(unreadThreshold); + boolean read = unreadThreshold != null && entry.getUpdated().before(unreadThreshold); status = new FeedEntryStatus(user, sub, entry); status.setRead(read); status.setMarkable(!read); 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 f0ef9388..1f7adf08 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 @@ -15,7 +15,7 @@ import com.commafeed.backend.model.User; @Singleton public class FeedEntryTagDAO extends GenericDAO { - private QFeedEntryTag tag = QFeedEntryTag.feedEntryTag; + private final QFeedEntryTag tag = QFeedEntryTag.feedEntryTag; @Inject public FeedEntryTagDAO(SessionFactory sessionFactory) { 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 53231851..3f32c95a 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 @@ -21,7 +21,7 @@ import com.querydsl.jpa.JPQLQuery; @Singleton public class FeedSubscriptionDAO extends GenericDAO { - private QFeedSubscription sub = QFeedSubscription.feedSubscription; + private final QFeedSubscription sub = QFeedSubscription.feedSubscription; @Inject public FeedSubscriptionDAO(SessionFactory sessionFactory) { 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 4cd8608e..ffd1b7de 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 @@ -15,7 +15,7 @@ import io.dropwizard.hibernate.AbstractDAO; public abstract class GenericDAO extends AbstractDAO { - private JPAQueryFactory factory; + private final JPAQueryFactory factory; protected GenericDAO(SessionFactory sessionFactory) { super(sessionFactory); 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 8b51e95c..23114dc2 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 @@ -11,7 +11,7 @@ import com.commafeed.backend.model.User; @Singleton public class UserDAO extends GenericDAO { - private QUser user = QUser.user; + private final QUser user = QUser.user; @Inject public UserDAO(SessionFactory sessionFactory) { 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 303d454e..ea4a682a 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 @@ -17,7 +17,7 @@ import com.commafeed.backend.model.UserRole.Role; @Singleton public class UserRoleDAO extends GenericDAO { - private QUserRole role = QUserRole.userRole; + private final QUserRole role = QUserRole.userRole; @Inject public UserRoleDAO(SessionFactory sessionFactory) { 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 0553ef84..0e68dc2e 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 @@ -12,7 +12,7 @@ import com.commafeed.backend.model.UserSettings; @Singleton public class UserSettingsDAO extends GenericDAO { - private QUserSettings settings = QUserSettings.userSettings; + private final QUserSettings settings = QUserSettings.userSettings; @Inject public UserSettingsDAO(SessionFactory sessionFactory) { diff --git a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedEntryKeyword.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedEntryKeyword.java index ce1af324..b82af2a2 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedEntryKeyword.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedEntryKeyword.java @@ -16,7 +16,7 @@ import lombok.RequiredArgsConstructor; public class FeedEntryKeyword { public enum Mode { - INCLUDE, EXCLUDE; + INCLUDE, EXCLUDE } private final String keyword; 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 450f6963..0380433c 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 @@ -73,7 +73,7 @@ public class FeedFetcher { boolean etagHeaderValueChanged = !StringUtils.equals(eTag, result.getETag()); String hash = DigestUtils.sha1Hex(content); - if (lastContentHash != null && hash != null && lastContentHash.equals(hash)) { + if (lastContentHash != null && lastContentHash.equals(hash)) { log.debug("content hash not modified: {}", feedUrl); throw new NotModifiedException("content hash not modified", lastModifiedHeaderValueChanged ? result.getLastModifiedSince() : null, 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 300ceaa7..58be2db3 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 @@ -13,8 +13,8 @@ import com.commafeed.backend.model.Feed; @Singleton public class FeedRefreshIntervalCalculator { - private boolean heavyLoad; - private int refreshIntervalMinutes; + private final boolean heavyLoad; + private final int refreshIntervalMinutes; @Inject public FeedRefreshIntervalCalculator(CommaFeedConfiguration config) { 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 2e4d5075..437c5570 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 @@ -88,7 +88,7 @@ public class FeedRefreshUpdater implements Managed { // lock on feed, make sure we are not updating the same feed twice at // the same time - String key1 = StringUtils.trimToEmpty("" + feed.getId()); + String key1 = StringUtils.trimToEmpty(String.valueOf(feed.getId())); // lock on content, make sure we are not updating the same entry // twice at the same time diff --git a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedUtils.java b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedUtils.java index 2f144d39..ed5bceae 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedUtils.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/feed/FeedUtils.java @@ -154,7 +154,7 @@ public class FeedUtils { for (Emit emit : emits) { int matchIndex = emit.getStart(); - sb.append(source.substring(prevIndex, matchIndex)); + sb.append(source, prevIndex, matchIndex); sb.append(HtmlEntities.HTML_TO_NUMERIC_MAP.get(emit.getKeyword())); prevIndex = emit.getEnd() + 1; } @@ -228,7 +228,7 @@ public class FeedUtils { if (index == -1) { return null; } - String encoding = pi.substring(index + 10, pi.length()); + String encoding = pi.substring(index + 10); encoding = encoding.substring(0, encoding.indexOf('"')); return encoding; } diff --git a/commafeed-server/src/main/java/com/commafeed/backend/rome/OPML11Parser.java b/commafeed-server/src/main/java/com/commafeed/backend/rome/OPML11Parser.java index 8a1eceab..3342a5c9 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/rome/OPML11Parser.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/rome/OPML11Parser.java @@ -23,11 +23,7 @@ public class OPML11Parser extends OPML10Parser { public boolean isMyType(Document document) { Element e = document.getRootElement(); - if (e.getName().equals("opml")) { - return true; - } - - return false; + return e.getName().equals("opml"); } 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 99cf3c66..c3bd9b67 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 @@ -22,7 +22,7 @@ public class FeedService { private final FeedDAO feedDAO; private final Set faviconFetchers; - private Favicon defaultFavicon; + private final Favicon defaultFavicon; @Inject public FeedService(FeedDAO feedDAO, Set faviconFetchers) { 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 b630bf4a..5b3d6000 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 @@ -41,9 +41,9 @@ public class MailService { Properties props = new Properties(); props.put("mail.smtp.auth", "true"); - props.put("mail.smtp.starttls.enable", "" + settings.isSmtpTls()); + props.put("mail.smtp.starttls.enable", String.valueOf(settings.isSmtpTls())); props.put("mail.smtp.host", settings.getSmtpHost()); - props.put("mail.smtp.port", "" + settings.getSmtpPort()); + props.put("mail.smtp.port", String.valueOf(settings.getSmtpPort())); Session session = Session.getInstance(props, new Authenticator() { @Override 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 9b957676..58c658cc 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 @@ -2,6 +2,7 @@ package com.commafeed.backend.service; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.Date; import java.util.Optional; import java.util.Set; @@ -123,7 +124,7 @@ public class UserService { } public void createDemoUser() { - register(CommaFeedApplication.USERNAME_DEMO, "demo", "demo@commafeed.com", Arrays.asList(Role.USER), true); + register(CommaFeedApplication.USERNAME_DEMO, "demo", "demo@commafeed.com", Collections.singletonList(Role.USER), true); } public void unregister(User user) { 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 efab5a31..8d0079bc 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 @@ -21,8 +21,8 @@ import lombok.RequiredArgsConstructor; @Singleton public class SecurityCheckFactoryProvider extends AbstractValueParamProvider { - private UserService userService; - private HttpServletRequest request; + private final UserService userService; + private final HttpServletRequest request; @Inject public SecurityCheckFactoryProvider(final MultivaluedParameterExtractorProvider extractorProvider, UserService userService, diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/model/Entry.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/Entry.java index eac70ad6..38b7fe8f 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/model/Entry.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/model/Entry.java @@ -1,7 +1,7 @@ package com.commafeed.frontend.model; import java.io.Serializable; -import java.util.Arrays; +import java.util.Collections; import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -158,13 +158,13 @@ public class Entry implements Serializable { SyndContentImpl content = new SyndContentImpl(); content.setValue(getContent()); - entry.setContents(Arrays. asList(content)); + entry.setContents(Collections. singletonList(content)); if (getEnclosureUrl() != null) { SyndEnclosureImpl enclosure = new SyndEnclosureImpl(); enclosure.setType(getEnclosureType()); enclosure.setUrl(getEnclosureUrl()); - entry.setEnclosures(Arrays. asList(enclosure)); + entry.setEnclosures(Collections. singletonList(enclosure)); } entry.setLink(getUrl()); 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 636ff6b8..6e67fc4a 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 @@ -3,7 +3,7 @@ package com.commafeed.frontend.resource; import java.io.InputStream; import java.io.StringWriter; import java.net.URI; -import java.util.Arrays; +import java.nio.charset.StandardCharsets; import java.util.Calendar; import java.util.Collections; import java.util.Comparator; @@ -171,7 +171,7 @@ public class FeedREST { entries.setErrorCount(subscription.getFeed().getErrorCount()); entries.setFeedLink(subscription.getFeed().getLink()); - List list = feedEntryStatusDAO.findBySubscriptions(user, Arrays.asList(subscription), unreadOnly, + List list = feedEntryStatusDAO.findBySubscriptions(user, Collections.singletonList(subscription), unreadOnly, entryKeywords, newerThanDate, offset, limit + 1, order, true, onlyIds, null); for (FeedEntryStatus status : list) { @@ -323,7 +323,7 @@ public class FeedREST { FeedSubscription subscription = feedSubscriptionDAO.findById(user, Long.valueOf(req.getId())); if (subscription != null) { - feedEntryService.markSubscriptionEntries(user, Arrays.asList(subscription), olderThan, entryKeywords); + feedEntryService.markSubscriptionEntries(user, Collections.singletonList(subscription), olderThan, entryKeywords); } return Response.ok().build(); } @@ -522,7 +522,7 @@ public class FeedREST { return Response.status(Status.FORBIDDEN).entity("Import is disabled for the demo account").build(); } try { - String opml = IOUtils.toString(input, "UTF-8"); + String opml = IOUtils.toString(input, StandardCharsets.UTF_8); opmlImporter.importOpml(user, opml); } catch (Exception e) { log.error(e.getMessage(), e); 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 59418b84..493d62cc 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 @@ -1,6 +1,6 @@ package com.commafeed.frontend.resource; -import java.util.Arrays; +import java.util.Collections; import java.util.Date; import java.util.Optional; import java.util.UUID; @@ -227,7 +227,8 @@ public class UserREST { public Response registerUser(@Valid @ApiParam(required = true) RegistrationRequest req, @Context @ApiParam(hidden = true) SessionHelper sessionHelper) { try { - User registeredUser = userService.register(req.getName(), req.getPassword(), req.getEmail(), Arrays.asList(Role.USER)); + User registeredUser = userService.register(req.getName(), req.getPassword(), req.getEmail(), + Collections.singletonList(Role.USER)); userService.login(req.getName(), req.getPassword()); sessionHelper.setLoggedInUser(registeredUser); return Response.ok().build(); 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 b9f099a0..d36595dc 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 @@ -17,7 +17,7 @@ import org.glassfish.jersey.server.spi.internal.ValueParamProvider; @Singleton public class SessionHelperFactoryProvider extends AbstractValueParamProvider { - private HttpServletRequest request; + private final HttpServletRequest request; @Inject public SessionHelperFactoryProvider(final MultivaluedParameterExtractorProvider extractorProvider, HttpServletRequest request) { diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/ws/WebSocketMessageBuilder.java b/commafeed-server/src/main/java/com/commafeed/frontend/ws/WebSocketMessageBuilder.java index cf35eb8d..b15b92ff 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/ws/WebSocketMessageBuilder.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/ws/WebSocketMessageBuilder.java @@ -7,7 +7,7 @@ import lombok.experimental.UtilityClass; @UtilityClass public class WebSocketMessageBuilder { - public static final String newFeedEntries(FeedSubscription subscription) { + public static String newFeedEntries(FeedSubscription subscription) { return String.format("%s:%s", "new-feed-entries", subscription.getId()); } diff --git a/commafeed-server/src/test/java/com/commafeed/frontend/resource/UserRestTest.java b/commafeed-server/src/test/java/com/commafeed/frontend/resource/UserRestTest.java index d6acbda1..a1ccdb4d 100644 --- a/commafeed-server/src/test/java/com/commafeed/frontend/resource/UserRestTest.java +++ b/commafeed-server/src/test/java/com/commafeed/frontend/resource/UserRestTest.java @@ -1,6 +1,6 @@ package com.commafeed.frontend.resource; -import java.util.Arrays; +import java.util.Collections; import java.util.Optional; import org.junit.jupiter.api.Test; @@ -76,7 +76,7 @@ class UserRestTest { userREST.registerUser(req, sessionHelper); - inOrder.verify(service).register("user", "password", "test@test.com", Arrays.asList(Role.USER)); + inOrder.verify(service).register("user", "password", "test@test.com", Collections.singletonList(Role.USER)); inOrder.verify(service).login("user", "password"); }