Remove unused import statements (#2726)

build.sbt

@@ -10,8 +10,6 @@ val JgitVersion = "5.11.0.202103091610-r"
 
 lazy val root = (project in file("."))
   .enablePlugins(SbtTwirl, ScalatraPlugin)
-  .settings(
-    )
 
 sourcesInBase := false
 organization := Organization
@@ -75,7 +73,14 @@ libraryDependencies ++= Seq(
 )
 
 // Compiler settings
-scalacOptions := Seq("-deprecation", "-language:postfixOps", "-opt:l:method", "-feature")
+scalacOptions := Seq(
+  "-deprecation",
+  "-language:postfixOps",
+  "-opt:l:method",
+  "-feature",
+  "-Wunused:imports",
+  "-Wconf:cat=unused&src=twirl/.*:s,cat=unused&src=scala/gitbucket/core/model/[^/]+\\.scala:s"
+)
 compile / javacOptions ++= Seq("-target", "8", "-source", "8")
 Jetty / javaOptions += "-Dlogback.configurationFile=/logback-dev.xml"
 

src/main/scala/ScalatraBootstrap.scala

@@ -2,7 +2,6 @@ import java.util.EnumSet
 import javax.servlet._
 
 import gitbucket.core.controller.{ReleaseController, _}
-import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service.SystemSettingsService
 import gitbucket.core.servlet._
 import gitbucket.core.util.Directory

src/main/scala/gitbucket/core/api/ApiPlugin.scala

@@ -1,6 +1,6 @@
 package gitbucket.core.api
 
-import gitbucket.core.plugin.{PluginRegistry, PluginInfo}
+import gitbucket.core.plugin.PluginInfo
 
 case class ApiPlugin(
   id: String,

src/main/scala/gitbucket/core/api/ApiWebhook.scala

@@ -1,8 +1,6 @@
 package gitbucket.core.api
 
-import gitbucket.core.model.Profile.{RepositoryWebHookEvents, RepositoryWebHooks}
 import gitbucket.core.model.{RepositoryWebHook, WebHook}
-import gitbucket.core.util.RepositoryName
 
 /**
  * https://docs.github.com/en/rest/reference/repos#webhooks

src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala

@@ -1,6 +1,6 @@
 package gitbucket.core.controller
 
-import java.time.{LocalDateTime, ZoneId, ZoneOffset}
+import java.time.{LocalDateTime, ZoneOffset}
 import java.util.Date
 
 import gitbucket.core.settings.html

src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala

@@ -40,8 +40,6 @@ import org.json4s.jackson.Serialization
 import org.scalatra._
 import org.scalatra.i18n.Messages
 
-import scala.collection.JavaConverters.iterableAsScalaIterableConverter
-
 class RepositoryViewerController
     extends RepositoryViewerControllerBase
     with RepositoryService

src/main/scala/gitbucket/core/controller/api/ApiIssueCommentControllerBase.scala

@@ -4,7 +4,7 @@ import gitbucket.core.controller.{Context, ControllerBase}
 import gitbucket.core.service._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.{ReadableUsersAuthenticator, ReferrerAuthenticator, RepositoryName}
-import org.scalatra.{ActionResult, NoContent}
+import org.scalatra.ActionResult
 
 trait ApiIssueCommentControllerBase extends ControllerBase {
   self: AccountService

src/main/scala/gitbucket/core/controller/api/ApiIssueControllerBase.scala

@@ -5,7 +5,7 @@ import gitbucket.core.model.{Account, Issue}
 import gitbucket.core.service.{AccountService, IssueCreationService, IssuesService, MilestonesService}
 import gitbucket.core.service.IssuesService.IssueSearchCondition
 import gitbucket.core.service.PullRequestService.PullRequestLimit
-import gitbucket.core.util.{ReadableUsersAuthenticator, ReferrerAuthenticator, RepositoryName, UsersAuthenticator}
+import gitbucket.core.util.{ReadableUsersAuthenticator, ReferrerAuthenticator, RepositoryName}
 import gitbucket.core.util.Implicits._
 
 trait ApiIssueControllerBase extends ControllerBase {

src/main/scala/gitbucket/core/controller/api/ApiOrganizationControllerBase.scala

@@ -1,5 +1,5 @@
 package gitbucket.core.controller.api
-import gitbucket.core.api.{ApiGroup, CreateAGroup, ApiRepository, ApiUser, JsonFormat}
+import gitbucket.core.api.{ApiGroup, CreateAGroup, JsonFormat}
 import gitbucket.core.controller.ControllerBase
 import gitbucket.core.service.{AccountService, RepositoryService}
 import gitbucket.core.util.Implicits._

src/main/scala/gitbucket/core/controller/api/ApiReleaseControllerBase.scala

@@ -1,5 +1,5 @@
 package gitbucket.core.controller.api
-import java.io.{ByteArrayInputStream, File}
+import java.io.File
 
 import gitbucket.core.api._
 import gitbucket.core.controller.ControllerBase
@@ -9,7 +9,7 @@ import gitbucket.core.util.{FileUtil, ReferrerAuthenticator, RepositoryName, Wri
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.SyntaxSugars.defining
 import org.apache.commons.io.FileUtils
-import org.scalatra.{Created, NoContent}
+import org.scalatra.NoContent
 
 trait ApiReleaseControllerBase extends ControllerBase {
   self: AccountService with ReleaseService with ReferrerAuthenticator with WritableUsersAuthenticator =>

src/main/scala/gitbucket/core/controller/api/ApiRepositoryContentsControllerBase.scala

@@ -1,7 +1,6 @@
 package gitbucket.core.controller.api
 import gitbucket.core.api.{ApiContents, ApiError, CreateAFile, JsonFormat}
 import gitbucket.core.controller.ControllerBase
-import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service.{RepositoryCommitFileService, RepositoryService}
 import gitbucket.core.util.Directory.getRepositoryDir
 import gitbucket.core.util.JGitUtil.{FileInfo, getContentFromId, getFileList}

src/main/scala/gitbucket/core/model/AccountWebHookEvent.scala

@@ -1,8 +1,6 @@
 package gitbucket.core.model
 
-trait AccountWebHookEventComponent extends TemplateComponent {
-  self: Profile =>
-
+trait AccountWebHookEventComponent extends TemplateComponent { self: Profile =>
   import profile.api._
   import gitbucket.core.model.Profile.AccountWebHooks
 

src/main/scala/gitbucket/core/model/ReleaseAsset.scala

@@ -2,9 +2,7 @@ package gitbucket.core.model
 
 import java.util.Date
 
-trait ReleaseAssetComponent extends TemplateComponent {
-  self: Profile =>
-
+trait ReleaseAssetComponent extends TemplateComponent { self: Profile =>
   import profile.api._
   import self._
 

src/main/scala/gitbucket/core/model/ReleaseTag.scala

@@ -1,8 +1,6 @@
 package gitbucket.core.model
 
-trait ReleaseTagComponent extends TemplateComponent {
-  self: Profile =>
-
+trait ReleaseTagComponent extends TemplateComponent { self: Profile =>
   import profile.api._
   import self._
 

src/main/scala/gitbucket/core/service/ActivityService.scala

@@ -1,8 +1,6 @@
 package gitbucket.core.service
 
 import gitbucket.core.model.Activity
-import gitbucket.core.util.JGitUtil
-import gitbucket.core.model.Profile._
 import gitbucket.core.util.Directory._
 import org.json4s._
 import org.json4s.jackson.Serialization
@@ -11,10 +9,8 @@ import org.json4s.jackson.Serialization.{read, write}
 import scala.util.Using
 import java.io.FileOutputStream
 import java.nio.charset.StandardCharsets
-import java.util.UUID
 
 import gitbucket.core.controller.Context
-import gitbucket.core.model.activity.BaseActivityInfo
 import org.apache.commons.io.input.ReversedLinesFileReader
 
 import scala.collection.mutable.ListBuffer

src/main/scala/gitbucket/core/service/IssuesService.scala

@@ -5,17 +5,7 @@ import gitbucket.core.util.StringUtil._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.controller.Context
-import gitbucket.core.model.{
-  Account,
-  CommitState,
-  Issue,
-  IssueComment,
-  IssueLabel,
-  Label,
-  PullRequest,
-  Repository,
-  Role
-}
+import gitbucket.core.model.{Account, Issue, IssueComment, IssueLabel, Label, PullRequest, Repository, Role}
 import gitbucket.core.model.Profile._
 import gitbucket.core.model.Profile.profile._
 import gitbucket.core.model.Profile.profile.blockingApi._

src/main/scala/gitbucket/core/service/PrioritiesService.scala

@@ -3,7 +3,6 @@ package gitbucket.core.service
 import gitbucket.core.model.Priority
 import gitbucket.core.model.Profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
-import gitbucket.core.util.StringUtil
 
 trait PrioritiesService {
 

src/main/scala/gitbucket/core/service/RepositoryService.scala

@@ -12,7 +12,7 @@ import gitbucket.core.util.Directory.{getRepositoryDir, getRepositoryFilesDir, g
 import gitbucket.core.util.JGitUtil.FileInfo
 import org.apache.commons.io.FileUtils
 import org.eclipse.jgit.api.Git
-import org.eclipse.jgit.lib.{Repository => _, _}
+import org.eclipse.jgit.lib.{Repository => _}
 import scala.util.Using
 
 trait RepositoryService {

src/main/scala/gitbucket/core/service/WebHookService.scala

@@ -3,7 +3,6 @@ package gitbucket.core.service
 import fr.brouillard.oss.security.xhub.XHub
 import fr.brouillard.oss.security.xhub.XHub.{XHubConverter, XHubDigest}
 import gitbucket.core.api._
-import gitbucket.core.controller.Context
 import gitbucket.core.model.{
   Account,
   AccountWebHook,

src/main/scala/gitbucket/core/servlet/InitializeListener.scala

@@ -2,7 +2,6 @@ package gitbucket.core.servlet
 
 import java.io.{File, FileOutputStream}
 
-import com.typesafe.config.ConfigFactory
 import gitbucket.core.GitBucketCoreModule
 import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service.SystemSettingsService

src/main/scala/gitbucket/core/servlet/PluginControllerFilter.scala

@@ -1,7 +1,6 @@
 package gitbucket.core.servlet
 
 import javax.servlet._
-import javax.servlet.http.HttpServletRequest
 
 import gitbucket.core.controller.ControllerBase
 import gitbucket.core.plugin.PluginRegistry

src/main/scala/gitbucket/core/ssh/GitCommand.scala

@@ -4,7 +4,7 @@ import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.plugin.{GitRepositoryRouting, PluginRegistry}
 import gitbucket.core.service.{AccountService, DeployKeyService, RepositoryService, SystemSettingsService}
 import gitbucket.core.servlet.{CommitLogHook, Database}
-import gitbucket.core.util.{SyntaxSugars, Directory}
+import gitbucket.core.util.Directory
 import org.apache.sshd.server.{Environment, ExitCallback, SessionAware}
 import org.apache.sshd.server.command.{Command, CommandFactory}
 import org.apache.sshd.server.session.ServerSession

src/main/scala/gitbucket/core/ssh/SshServerListener.scala

@@ -1,6 +1,5 @@
 package gitbucket.core.ssh
 
-import java.io.File
 import java.util.concurrent.atomic.AtomicBoolean
 import javax.servlet.{ServletContextEvent, ServletContextListener}
 

src/main/scala/gitbucket/core/util/Authenticator.scala

@@ -5,7 +5,6 @@ import gitbucket.core.service.{AccountService, RepositoryService}
 import gitbucket.core.model.Role
 import RepositoryService.RepositoryInfo
 import Implicits._
-import SyntaxSugars._
 
 /**
  * Allows only oneself and administrators.

src/main/scala/gitbucket/core/util/HttpClientUtil.scala

@@ -1,6 +1,6 @@
 package gitbucket.core.util
 
-import java.net.{InetAddress, URL}
+import java.net.InetAddress
 
 import gitbucket.core.service.SystemSettingsService
 import org.apache.commons.net.util.SubnetUtils

src/main/scala/gitbucket/core/util/StringUtil.scala

@@ -12,7 +12,6 @@ import org.apache.commons.io.input.BOMInputStream
 import org.apache.commons.io.IOUtils
 
 import scala.util.control.Exception._
-import scala.util.matching.Regex.Match.unapply
 
 object StringUtil {
 

src/main/scala/gitbucket/core/util/TextAvatarUtil.scala

@@ -3,7 +3,7 @@ package gitbucket.core.util
 import java.io.ByteArrayOutputStream
 import java.awt.image.BufferedImage
 import javax.imageio.ImageIO
-import java.awt.{Color, Font, Graphics2D, RenderingHints}
+import java.awt.{Color, Font, RenderingHints}
 import java.awt.font.{FontRenderContext, TextLayout}
 import java.awt.geom.AffineTransform
 

src/test/scala/gitbucket/core/service/CommitStatusServiceSpec.scala

@@ -2,7 +2,6 @@ package gitbucket.core.service
 
 import gitbucket.core.model._
 import gitbucket.core.model.Profile._
-import gitbucket.core.model.Profile.profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
 import org.scalatest.funsuite.AnyFunSuite
 

src/test/scala/gitbucket/core/service/MergeServiceSpec.scala

@@ -21,7 +21,6 @@ import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.model._
 import gitbucket.core.model.Profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
-import gitbucket.core.service.WebHookService.WebHookPushPayload
 import org.eclipse.jetty.webapp.WebAppContext
 import org.eclipse.jetty.server.{Request, Server}
 import org.json4s.jackson.JsonMethods._