sameip: fix boxing

maxcom · Jul 31, 2024 · a9938a6 · a9938a6
1 parent 2262648
commit a9938a6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/src/main/scala/ru/org/linux/sameip/SameIpDao.scala b/src/main/scala/ru/org/linux/sameip/SameIpDao.scala
@@ -55,7 +55,6 @@ class SameIpDao(dataSource: DataSource) {
 
     params.put("limit", Integer.valueOf(limit))
 
-
     namedJdbcTemplate.query(
       "SELECT groups.title as group_title, topics.title, topics.id as topic_id, " +
         "m.id as cid, m.postdate, m.deleted, del_info.reason, " +

diff --git a/src/main/scala/ru/org/linux/sameip/SameIpService.scala b/src/main/scala/ru/org/linux/sameip/SameIpService.scala
@@ -24,7 +24,7 @@ import ru.org.linux.user.UserService
 class SameIpService(userService: UserService, msgbaseDao: MsgbaseDao, textService: MessageTextService,
                     sameIpDao: SameIpDao) {
   def getPosts(ip: Option[String], userAgent: Option[Int], score: Option[Int], limit: Int): collection.Seq[PreparedPostListItem] = {
-    prepareCommentList(sameIpDao.getComments(ip, userAgent, score, limit))
+    prepareCommentList(sameIpDao.getComments(ip = ip, userAgent = userAgent, score = score, limit = limit))
   }
 
   private def prepareCommentList(items: collection.Seq[PostListItem]): collection.Seq[PreparedPostListItem] = {

diff --git a/src/main/scala/ru/org/linux/spring/SameIPController.scala b/src/main/scala/ru/org/linux/spring/SameIPController.scala
@@ -66,13 +66,17 @@ class SameIPController(ipBlockDao: IPBlockDao, userService: UserService, userAge
     }.orNull
 
     val rowsLimit = 50
-    val posts = sameIpService.getPosts(Option(ipMask), Option(userAgent), Option(score), rowsLimit)
+
+    val userAgentOpt = Option[Integer](userAgent).map(_.toInt)
+    val scoreOpt = Option[Integer](score).map(_.toInt)
+
+    val posts = sameIpService.getPosts(ip = Option(ipMask), userAgent = userAgentOpt, score = scoreOpt, limit = rowsLimit)
 
     mv.getModel.put("comments", posts.asJava)
     mv.getModel.put("hasMoreComments", posts.size == rowsLimit)
     mv.getModel.put("rowsLimit", rowsLimit)
 
-    val users = userService.getUsersWithAgent(ipMask, userAgent, rowsLimit)
+    val users = userService.getUsersWithAgent(ip = Option(ipMask), userAgent = userAgentOpt, limit = rowsLimit)
 
     mv.getModel.put("users", users)
     mv.getModel.put("hasMoreUsers", users.size == rowsLimit)

diff --git a/src/main/scala/ru/org/linux/user/UserService.scala b/src/main/scala/ru/org/linux/user/UserService.scala
@@ -379,7 +379,7 @@ class UserService(siteConfig: SiteConfig, userDao: UserDao, ignoreListDao: Ignor
 
   def isFreezable(user: User, by: User): Boolean = by.isModerator && !user.isModerator
 
-  def getUsersWithAgent(@Nullable ip: String, @Nullable userAgent: Integer, limit: Int): java.util.List[UserAndAgent] = {
-    userDao.getUsersWithAgent(ip, userAgent, limit)
+  def getUsersWithAgent(ip: Option[String], userAgent: Option[Int], limit: Int): java.util.List[UserAndAgent] = {
+    userDao.getUsersWithAgent(ip.orNull, userAgent.map(Integer.valueOf).orNull, limit)
   }
 }