diff options
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | src/main/java/com/juick/service/SubscriptionServiceImpl.java | 8 | ||||
| -rw-r--r-- | src/main/java/com/juick/www/api/activity/helpers/ContextTypeFilter.java | 4 |
3 files changed, 7 insertions, 7 deletions
@@ -336,7 +336,7 @@ <version>3.2.5</version> </requireMavenVersion> <requireJavaVersion> - <version>(11,)</version> + <version>(17,)</version> </requireJavaVersion> </rules> </configuration> diff --git a/src/main/java/com/juick/service/SubscriptionServiceImpl.java b/src/main/java/com/juick/service/SubscriptionServiceImpl.java index ca813c67..0b8d9f26 100644 --- a/src/main/java/com/juick/service/SubscriptionServiceImpl.java +++ b/src/main/java/com/juick/service/SubscriptionServiceImpl.java @@ -66,13 +66,13 @@ public class SubscriptionServiceImpl extends BaseJdbcService implements Subscrip List<User> users = ListUtils.union(subscribers, mentionedUsers); List<Integer> tags = tagService.getMessageTagsIDs(mid); List<String> tagsStr = tagService.getMessageTags(mid).stream().map(t -> t.getTag().getName()) - .collect(Collectors.toList()); + .toList(); - Set<Integer> set = new HashSet<>(users.stream() + Set<Integer> set = users.stream() .filter(u -> !u.isBanned()) .map(User::getUid) .filter(u -> Collections.disjoint(tagService.getUserBLTags(u), tagsStr)) - .collect(Collectors.toList())); + .collect(Collectors.toSet()); if (!tags.isEmpty()) { List<Integer> tagUsers = getNamedParameterJdbcTemplate().queryForList( @@ -118,7 +118,7 @@ public class SubscriptionServiceImpl extends BaseJdbcService implements Subscrip @Override public List<User> getUsersSubscribedToUserRecommendations(final int uid, final Message msg) { List<String> msgTags = tagService.getMessageTags(msg.getMid()).stream().map(t -> t.getTag().getName()) - .collect(Collectors.toList()); + .toList(); if (msg.getLikes() == 1) { return userService.getUserReaders(uid).stream() .filter(u -> !u.equals(msg.getUser())) diff --git a/src/main/java/com/juick/www/api/activity/helpers/ContextTypeFilter.java b/src/main/java/com/juick/www/api/activity/helpers/ContextTypeFilter.java index e8a1dfab..475e15bf 100644 --- a/src/main/java/com/juick/www/api/activity/helpers/ContextTypeFilter.java +++ b/src/main/java/com/juick/www/api/activity/helpers/ContextTypeFilter.java @@ -21,9 +21,9 @@ public class ContextTypeFilter { @Override public boolean equals(Object obj) { - if (obj == null || !(obj instanceof String)) { + if (!(obj instanceof String)) { return true; } - return ((String)obj).equals("Context"); + return obj.equals("Context"); } } |