prepare Scala 3

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

@@ -38,21 +38,9 @@ class AccountController
     with RequestCache
 
 trait AccountControllerBase extends AccountManagementControllerBase {
-  self: AccountService
+  self: AccountService & RepositoryService & ActivityService & WikiService & LabelsService & SshKeyService &
-    with RepositoryService
+    GpgKeyService & OneselfAuthenticator & UsersAuthenticator & GroupManagerAuthenticator & ReadableUsersAuthenticator &
-    with ActivityService
+    AccessTokenService & WebHookService & PrioritiesService & RepositoryCreationService =>
-    with WikiService
-    with LabelsService
-    with SshKeyService
-    with GpgKeyService
-    with OneselfAuthenticator
-    with UsersAuthenticator
-    with GroupManagerAuthenticator
-    with ReadableUsersAuthenticator
-    with AccessTokenService
-    with WebHookService
-    with PrioritiesService
-    with RepositoryCreationService =>
 
   case class AccountNewForm(
     userName: String,

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

@@ -28,12 +28,8 @@ class DashboardController
     with RequestCache
 
 trait DashboardControllerBase extends ControllerBase {
-  self: IssuesService
+  self: IssuesService & PullRequestService & RepositoryService & AccountService & CommitStatusService &
-    with PullRequestService
+    UsersAuthenticator =>
-    with RepositoryService
-    with AccountService
-    with CommitStatusService
-    with UsersAuthenticator =>
 
   get("/dashboard/repos")(usersOnly {
     context.withLoginAccount { loginAccount =>

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

@@ -34,15 +34,8 @@ class IndexController
     with RequestCache
 
 trait IndexControllerBase extends ControllerBase {
-  self: RepositoryService
+  self: RepositoryService & ActivityService & AccountService & RepositorySearchService & UsersAuthenticator &
-    with ActivityService
+    ReferrerAuthenticator & AccessTokenService & AccountFederationService & OpenIDConnectService =>
-    with AccountService
-    with RepositorySearchService
-    with UsersAuthenticator
-    with ReferrerAuthenticator
-    with AccessTokenService
-    with AccountFederationService
-    with OpenIDConnectService =>
 
   case class SignInForm(userName: String, password: String, hash: Option[String])
 

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

@@ -34,21 +34,10 @@ class IssuesController
     with RequestCache
 
 trait IssuesControllerBase extends ControllerBase {
-  self: IssuesService
+  self: IssuesService & RepositoryService & AccountService & LabelsService & MilestonesService & ActivityService &
-    with RepositoryService
+    HandleCommentService & IssueCreationService & CustomFieldsService & ReadableUsersAuthenticator &
-    with AccountService
+    ReferrerAuthenticator & WritableUsersAuthenticator & PullRequestService & WebHookIssueCommentService &
-    with LabelsService
+    PrioritiesService =>
-    with MilestonesService
-    with ActivityService
-    with HandleCommentService
-    with IssueCreationService
-    with CustomFieldsService
-    with ReadableUsersAuthenticator
-    with ReferrerAuthenticator
-    with WritableUsersAuthenticator
-    with PullRequestService
-    with WebHookIssueCommentService
-    with PrioritiesService =>
 
   case class IssueCreateForm(
     title: String,

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

@@ -28,11 +28,7 @@ class LabelsController
     with WritableUsersAuthenticator
 
 trait LabelsControllerBase extends ControllerBase {
-  self: LabelsService
+  self: LabelsService & IssuesService & RepositoryService & ReferrerAuthenticator & WritableUsersAuthenticator =>
-    with IssuesService
-    with RepositoryService
-    with ReferrerAuthenticator
-    with WritableUsersAuthenticator =>
 
   case class LabelForm(labelName: String, color: String)
 

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

@@ -26,11 +26,8 @@ class MilestonesController
     with WritableUsersAuthenticator
 
 trait MilestonesControllerBase extends ControllerBase {
-  self: MilestonesService
+  self: MilestonesService & RepositoryService & CommitStatusService & ReferrerAuthenticator &
-    with RepositoryService
+    WritableUsersAuthenticator =>
-    with CommitStatusService
-    with ReferrerAuthenticator
-    with WritableUsersAuthenticator =>
 
   case class MilestoneForm(title: String, description: Option[String], dueDate: Option[java.util.Date])
 

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

@@ -28,11 +28,7 @@ class PrioritiesController
     with WritableUsersAuthenticator
 
 trait PrioritiesControllerBase extends ControllerBase {
-  self: PrioritiesService
+  self: PrioritiesService & IssuesService & RepositoryService & ReferrerAuthenticator & WritableUsersAuthenticator =>
-    with IssuesService
-    with RepositoryService
-    with ReferrerAuthenticator
-    with WritableUsersAuthenticator =>
 
   case class PriorityForm(priorityName: String, description: Option[String], color: String)
 

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

@@ -40,23 +40,10 @@ class PullRequestsController
     with RequestCache
 
 trait PullRequestsControllerBase extends ControllerBase {
-  self: RepositoryService
+  self: RepositoryService & AccountService & IssuesService & MilestonesService & LabelsService & CustomFieldsService &
-    with AccountService
+    CommitsService & ActivityService & PullRequestService & WebHookPullRequestService & ReadableUsersAuthenticator &
-    with IssuesService
+    ReferrerAuthenticator & WritableUsersAuthenticator & CommitStatusService & MergeService & ProtectedBranchService &
-    with MilestonesService
+    PrioritiesService =>
-    with LabelsService
-    with CustomFieldsService
-    with CommitsService
-    with ActivityService
-    with PullRequestService
-    with WebHookPullRequestService
-    with ReadableUsersAuthenticator
-    with ReferrerAuthenticator
-    with WritableUsersAuthenticator
-    with CommitStatusService
-    with MergeService
-    with ProtectedBranchService
-    with PrioritiesService =>
 
   val pullRequestForm = mapping(
     "title" -> trim(label("Title", text(required))),
@@ -569,7 +556,7 @@ trait PullRequestsControllerBase extends ControllerBase {
     val (originOwner, tmpOriginBranch) = parseCompareIdentifier(origin, forkedRepository.owner)
     val (forkedOwner, tmpForkedBranch) = parseCompareIdentifier(forked, forkedRepository.owner)
 
-    (for (
+    (for {
       originRepositoryName <-
         if (originOwner == forkedOwner) {
           Some(forkedRepository.name)
@@ -579,9 +566,9 @@ trait PullRequestsControllerBase extends ControllerBase {
               .find(_.userName == originOwner)
               .map(_.repositoryName)
           }
-        };
+        }
       originRepository <- getRepository(originOwner, originRepositoryName)
-    ) yield {
+    } yield {
       Using.resources(
         Git.open(getRepositoryDir(originRepository.owner, originRepository.name)),
         Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))

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

@@ -33,13 +33,8 @@ class ReleaseController
     with RequestCache
 
 trait ReleaseControllerBase extends ControllerBase {
-  self: RepositoryService
+  self: RepositoryService & AccountService & ReleaseService & ReadableUsersAuthenticator & ReferrerAuthenticator &
-    with AccountService
+    WritableUsersAuthenticator & ActivityService =>
-    with ReleaseService
-    with ReadableUsersAuthenticator
-    with ReferrerAuthenticator
-    with WritableUsersAuthenticator
-    with ActivityService =>
 
   case class ReleaseForm(
     name: String,

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

@@ -37,16 +37,8 @@ class RepositorySettingsController
     with RequestCache
 
 trait RepositorySettingsControllerBase extends ControllerBase {
-  self: RepositoryService
+  self: RepositoryService & AccountService & WebHookService & ProtectedBranchService & CommitStatusService &
-    with AccountService
+    DeployKeyService & CustomFieldsService & ActivityService & OwnerAuthenticator & UsersAuthenticator =>
-    with WebHookService
-    with ProtectedBranchService
-    with CommitStatusService
-    with DeployKeyService
-    with CustomFieldsService
-    with ActivityService
-    with OwnerAuthenticator
-    with UsersAuthenticator =>
 
   // for repository options
   case class OptionsForm(

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

@@ -65,21 +65,10 @@ class RepositoryViewerController
  * The repository viewer.
  */
 trait RepositoryViewerControllerBase extends ControllerBase {
-  self: RepositoryService
+  self: RepositoryService & RepositoryCommitFileService & AccountService & ActivityService & IssuesService &
-    with RepositoryCommitFileService
+    WebHookService & CommitsService & ReadableUsersAuthenticator & ReferrerAuthenticator & WritableUsersAuthenticator &
-    with AccountService
+    PullRequestService & CommitStatusService & WebHookPullRequestService & WebHookPullRequestReviewCommentService &
-    with ActivityService
+    ProtectedBranchService =>
-    with IssuesService
-    with WebHookService
-    with CommitsService
-    with ReadableUsersAuthenticator
-    with ReferrerAuthenticator
-    with WritableUsersAuthenticator
-    with PullRequestService
-    with CommitStatusService
-    with WebHookPullRequestService
-    with WebHookPullRequestReviewCommentService
-    with ProtectedBranchService =>
 
   ArchiveCommand.registerFormat("zip", new ZipFormat)
   ArchiveCommand.registerFormat("tar.gz", new TgzFormat)

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

@@ -29,7 +29,7 @@ case class Table(name: String, columns: Seq[Column])
 case class Column(name: String, primaryKey: Boolean)
 
 trait SystemSettingsControllerBase extends AccountManagementControllerBase {
-  self: AccountService with RepositoryService with AdminAuthenticator =>
+  self: AccountService & RepositoryService & AdminAuthenticator =>
 
   private val form = mapping(
     "baseUrl" -> trim(label("Base URL", optional(text()))),

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

@@ -10,7 +10,7 @@ import org.scalatra.servlet.ServletBase
 /**
  * Extends scalatra-forms to support the client-side validation and Ajax requests as well.
  */
-trait ValidationSupport extends FormSupport { self: ServletBase with JacksonJsonSupport with I18nSupport =>
+trait ValidationSupport extends FormSupport { self: ServletBase & JacksonJsonSupport & I18nSupport =>
 
   def get[T](path: String, form: ValueType[T])(action: T => Any): Route = {
     registerValidate(path, form)

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

@@ -29,13 +29,8 @@ class WikiController
     with RequestCache
 
 trait WikiControllerBase extends ControllerBase {
-  self: WikiService
+  self: WikiService & RepositoryService & AccountService & ActivityService & WebHookService &
-    with RepositoryService
+    ReadableUsersAuthenticator & ReferrerAuthenticator =>
-    with AccountService
-    with ActivityService
-    with WebHookService
-    with ReadableUsersAuthenticator
-    with ReferrerAuthenticator =>
 
   case class WikiPageEditForm(
     pageName: String,

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

@@ -15,7 +15,7 @@ import scala.jdk.CollectionConverters._
 import scala.util.Using
 
 trait ApiGitReferenceControllerBase extends ControllerBase {
-  self: ReferrerAuthenticator with WritableUsersAuthenticator =>
+  self: ReferrerAuthenticator & WritableUsersAuthenticator =>
 
   private val logger = LoggerFactory.getLogger(classOf[ApiGitReferenceControllerBase])
 

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

@@ -7,13 +7,8 @@ import gitbucket.core.util.{ReadableUsersAuthenticator, ReferrerAuthenticator, R
 import org.scalatra.ActionResult
 
 trait ApiIssueCommentControllerBase extends ControllerBase {
-  self: AccountService
+  self: AccountService & IssuesService & RepositoryService & HandleCommentService & MilestonesService &
-    with IssuesService
+    ReadableUsersAuthenticator & ReferrerAuthenticator =>
-    with RepositoryService
-    with HandleCommentService
-    with MilestonesService
-    with ReadableUsersAuthenticator
-    with ReferrerAuthenticator =>
   /*
    * i. List issue comments for a repository
    * https://docs.github.com/en/rest/reference/issues#list-issue-comments-for-a-repository

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

@@ -9,12 +9,8 @@ import gitbucket.core.util.{ReadableUsersAuthenticator, ReferrerAuthenticator, R
 import gitbucket.core.util.Implicits._
 
 trait ApiIssueControllerBase extends ControllerBase {
-  self: AccountService
+  self: AccountService & IssuesService & IssueCreationService & MilestonesService & ReadableUsersAuthenticator &
-    with IssuesService
+    ReferrerAuthenticator =>
-    with IssueCreationService
-    with MilestonesService
-    with ReadableUsersAuthenticator
-    with ReferrerAuthenticator =>
   /*
    * i. List issues
    * https://developer.github.com/v3/issues/#list-issues

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

@@ -7,11 +7,7 @@ import gitbucket.core.util._
 import org.scalatra.{Created, NoContent, UnprocessableEntity}
 
 trait ApiIssueLabelControllerBase extends ControllerBase {
-  self: AccountService
+  self: AccountService & IssuesService & LabelsService & ReferrerAuthenticator & WritableUsersAuthenticator =>
-    with IssuesService
-    with LabelsService
-    with ReferrerAuthenticator
-    with WritableUsersAuthenticator =>
 
   /*
    * i. List all labels for this repository

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

@@ -7,7 +7,7 @@ import gitbucket.core.util.Implicits._
 import org.scalatra.NoContent
 
 trait ApiIssueMilestoneControllerBase extends ControllerBase {
-  self: MilestonesService with WritableUsersAuthenticator with ReferrerAuthenticator =>
+  self: MilestonesService & WritableUsersAuthenticator & ReferrerAuthenticator =>
 
   /*
    * i. List milestones

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

@@ -6,7 +6,7 @@ import gitbucket.core.util.Implicits._
 import gitbucket.core.util.{AdminAuthenticator, UsersAuthenticator}
 
 trait ApiOrganizationControllerBase extends ControllerBase {
-  self: RepositoryService with AccountService with AdminAuthenticator with UsersAuthenticator =>
+  self: RepositoryService & AccountService & AdminAuthenticator & UsersAuthenticator =>
 
   /*
    * i. List your organizations

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

@@ -16,14 +16,8 @@ import scala.util.Using
 import scala.jdk.CollectionConverters._
 
 trait ApiPullRequestControllerBase extends ControllerBase {
-  self: AccountService
+  self: AccountService & IssuesService & PullRequestService & RepositoryService & MergeService & ReferrerAuthenticator &
-    with IssuesService
+    ReadableUsersAuthenticator & WritableUsersAuthenticator =>
-    with PullRequestService
-    with RepositoryService
-    with MergeService
-    with ReferrerAuthenticator
-    with ReadableUsersAuthenticator
-    with WritableUsersAuthenticator =>
 
   /*
    * i. Link Relations

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

@@ -11,7 +11,7 @@ import org.apache.commons.io.FileUtils
 import org.scalatra.NoContent
 
 trait ApiReleaseControllerBase extends ControllerBase {
-  self: AccountService with ReleaseService with ReferrerAuthenticator with WritableUsersAuthenticator =>
+  self: AccountService & ReleaseService & ReferrerAuthenticator & WritableUsersAuthenticator =>
 
   /**
    * i. List releases for a repository

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

@@ -12,15 +12,8 @@ import org.scalatra.NoContent
 import scala.util.Using
 
 trait ApiRepositoryBranchControllerBase extends ControllerBase {
-  self: RepositoryService
+  self: RepositoryService & AccountService & OwnerAuthenticator & UsersAuthenticator & GroupManagerAuthenticator &
-    with AccountService
+    ProtectedBranchService & ReferrerAuthenticator & ReadableUsersAuthenticator & WritableUsersAuthenticator =>
-    with OwnerAuthenticator
-    with UsersAuthenticator
-    with GroupManagerAuthenticator
-    with ProtectedBranchService
-    with ReferrerAuthenticator
-    with ReadableUsersAuthenticator
-    with WritableUsersAuthenticator =>
 
   /**
    * i. List branches

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

@@ -7,7 +7,7 @@ import gitbucket.core.util.{OwnerAuthenticator, ReferrerAuthenticator}
 import org.scalatra.NoContent
 
 trait ApiRepositoryCollaboratorControllerBase extends ControllerBase {
-  self: RepositoryService with AccountService with ReferrerAuthenticator with OwnerAuthenticator =>
+  self: RepositoryService & AccountService & ReferrerAuthenticator & OwnerAuthenticator =>
 
   /*
    * i. List repository collaborators

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

@@ -21,7 +21,7 @@ import scala.math.min
 import scala.util.Using
 
 trait ApiRepositoryCommitControllerBase extends ControllerBase {
-  self: AccountService with CommitsService with ProtectedBranchService with ReferrerAuthenticator =>
+  self: AccountService & CommitsService & ProtectedBranchService & ReferrerAuthenticator =>
   /*
    * i. List commits on a repository
    * https://developer.github.com/v3/repos/commits/#list-commits-on-a-repository

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

@@ -12,7 +12,7 @@ import org.eclipse.jgit.api.Git
 import scala.util.Using
 
 trait ApiRepositoryContentsControllerBase extends ControllerBase {
-  self: ReferrerAuthenticator with WritableUsersAuthenticator with RepositoryCommitFileService =>
+  self: ReferrerAuthenticator & WritableUsersAuthenticator & RepositoryCommitFileService =>
 
   /**
    * i. Get a repository README

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

@@ -15,16 +15,9 @@ import scala.concurrent.duration.Duration
 import scala.util.Using
 
 trait ApiRepositoryControllerBase extends ControllerBase {
-  self: RepositoryService
+  self: RepositoryService & ApiGitReferenceControllerBase & RepositoryCreationService & AccountService &
-    with ApiGitReferenceControllerBase
+    OwnerAuthenticator & UsersAuthenticator & GroupManagerAuthenticator & ReferrerAuthenticator &
-    with RepositoryCreationService
+    ReadableUsersAuthenticator & WritableUsersAuthenticator =>
-    with AccountService
-    with OwnerAuthenticator
-    with UsersAuthenticator
-    with GroupManagerAuthenticator
-    with ReferrerAuthenticator
-    with ReadableUsersAuthenticator
-    with WritableUsersAuthenticator =>
 
   /**
    * i. List your repositories

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

@@ -7,7 +7,7 @@ import gitbucket.core.util.Implicits._
 import gitbucket.core.util.{JGitUtil, ReferrerAuthenticator, WritableUsersAuthenticator}
 
 trait ApiRepositoryStatusControllerBase extends ControllerBase {
-  self: AccountService with CommitStatusService with ReferrerAuthenticator with WritableUsersAuthenticator =>
+  self: AccountService & CommitStatusService & ReferrerAuthenticator & WritableUsersAuthenticator =>
 
   /*
    * i. Create a status

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

@@ -8,7 +8,7 @@ import gitbucket.core.util.Implicits._
 import org.scalatra.NoContent
 
 trait ApiRepositoryWebhookControllerBase extends ControllerBase {
-  self: RepositoryService with WebHookService with ReferrerAuthenticator with WritableUsersAuthenticator =>
+  self: RepositoryService & WebHookService & ReferrerAuthenticator & WritableUsersAuthenticator =>
 
   /*
    * i. List repository webhooks

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

@@ -8,7 +8,7 @@ import gitbucket.core.util.StringUtil._
 import org.scalatra.NoContent
 
 trait ApiUserControllerBase extends ControllerBase {
-  self: RepositoryService with AccountService with AdminAuthenticator with UsersAuthenticator =>
+  self: RepositoryService & AccountService & AdminAuthenticator & UsersAuthenticator =>
 
   /**
    * i. Get a single user

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

@@ -16,7 +16,7 @@ import gitbucket.core.util.{FileUtil, StringUtil}
 import org.apache.commons.io.FileUtils
 
 trait CommitsService {
-  self: ActivityService with PullRequestService with WebHookPullRequestReviewCommentService =>
+  self: ActivityService & PullRequestService & WebHookPullRequestReviewCommentService =>
 
   def getCommitComments(owner: String, repository: String, commitId: String, includePullRequest: Boolean)(implicit
     s: Session

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

@@ -16,12 +16,8 @@ import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.util.Implicits._
 
 trait HandleCommentService {
-  self: RepositoryService
+  self: RepositoryService & IssuesService & ActivityService & WebHookService & WebHookIssueCommentService &
-    with IssuesService
+    WebHookPullRequestService =>
-    with ActivityService
-    with WebHookService
-    with WebHookIssueCommentService
-    with WebHookPullRequestService =>
 
   /**
    * @see [[https://github.com/gitbucket/gitbucket/wiki/CommentAction]]

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

@@ -10,7 +10,7 @@ import gitbucket.core.util.Implicits._
 
 trait IssueCreationService {
 
-  self: RepositoryService with WebHookIssueCommentService with LabelsService with IssuesService with ActivityService =>
+  self: RepositoryService & WebHookIssueCommentService & LabelsService & IssuesService & ActivityService =>
 
   def createIssue(
     repository: RepositoryInfo,

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

@@ -26,7 +26,7 @@ import gitbucket.core.plugin.PluginRegistry
 import scala.jdk.CollectionConverters._
 
 trait IssuesService {
-  self: AccountService with RepositoryService with LabelsService with PrioritiesService with MilestonesService =>
+  self: AccountService & RepositoryService & LabelsService & PrioritiesService & MilestonesService =>
   import IssuesService._
 
   def getIssue(owner: String, repository: String, issueId: String)(implicit s: Session) =

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

@@ -23,13 +23,8 @@ import scala.jdk.CollectionConverters._
 import scala.util.Using
 
 trait MergeService {
-  self: AccountService
+  self: AccountService & ActivityService & IssuesService & RepositoryService & PullRequestService &
-    with ActivityService
+    WebHookPullRequestService & WebHookService =>
-    with IssuesService
-    with RepositoryService
-    with PullRequestService
-    with WebHookPullRequestService
-    with WebHookService =>
 
   import MergeService._
 

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

@@ -25,13 +25,8 @@ import scala.jdk.CollectionConverters.*
 import scala.util.Using
 
 trait PullRequestService {
-  self: IssuesService
+  self: IssuesService & CommitsService & WebHookService & WebHookPullRequestService & RepositoryService & MergeService &
-    with CommitsService
+    ActivityService =>
-    with WebHookService
-    with WebHookPullRequestService
-    with RepositoryService
-    with MergeService
-    with ActivityService =>
   import PullRequestService.*
 
   def getPullRequest(owner: String, repository: String, issueId: Int)(implicit

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

@@ -8,7 +8,7 @@ import gitbucket.core.model.Profile.dateColumnType
 import gitbucket.core.util.JGitUtil
 
 trait ReleaseService {
-  self: AccountService with RepositoryService =>
+  self: AccountService & RepositoryService =>
 
   def createReleaseAsset(
     owner: String,

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

@@ -17,12 +17,8 @@ import org.eclipse.jgit.transport.{ReceiveCommand, ReceivePack}
 import scala.util.Using
 
 trait RepositoryCommitFileService {
-  self: AccountService
+  self: AccountService & ActivityService & IssuesService & PullRequestService & WebHookPullRequestService &
-    with ActivityService
+    RepositoryService =>
-    with IssuesService
-    with PullRequestService
-    with WebHookPullRequestService
-    with RepositoryService =>
 
   /**
    * Create multiple files by callback function.

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

@@ -46,12 +46,7 @@ object RepositoryCreationService {
 }
 
 trait RepositoryCreationService {
-  self: AccountService
+  self: AccountService & RepositoryService & LabelsService & WikiService & ActivityService & PrioritiesService =>
-    with RepositoryService
-    with LabelsService
-    with WikiService
-    with ActivityService
-    with PrioritiesService =>
 
   def canCreateRepository(repositoryOwner: String, loginAccount: Account)(implicit session: Session): Boolean = {
     repositoryOwner == loginAccount.userName || getGroupsByUserName(loginAccount.userName)

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

@@ -367,7 +367,7 @@ trait WebHookService {
 }
 
 trait WebHookPullRequestService extends WebHookService {
-  self: AccountService with RepositoryService with PullRequestService with IssuesService =>
+  self: AccountService & RepositoryService & PullRequestService & IssuesService =>
 
   import WebHookService._
   // https://developer.github.com/v3/activity/events/types/#issuesevent
@@ -513,7 +513,7 @@ trait WebHookPullRequestService extends WebHookService {
 }
 
 trait WebHookPullRequestReviewCommentService extends WebHookService {
-  self: AccountService with RepositoryService with PullRequestService with IssuesService with CommitsService =>
+  self: AccountService & RepositoryService & PullRequestService & IssuesService & CommitsService =>
   def callPullRequestReviewCommentWebHook(
     action: String,
     comment: CommitComment,
@@ -561,7 +561,7 @@ trait WebHookPullRequestReviewCommentService extends WebHookService {
 }
 
 trait WebHookIssueCommentService extends WebHookPullRequestService {
-  self: AccountService with RepositoryService with PullRequestService with IssuesService =>
+  self: AccountService & RepositoryService & PullRequestService & IssuesService =>
 
   import WebHookService._
   def callIssueCommentWebHook(

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

@@ -92,7 +92,7 @@ abstract class GitCommand extends Command with ServerSessionAware {
 }
 
 abstract class DefaultGitCommand(val owner: String, val repoName: String) extends GitCommand {
-  self: RepositoryService with AccountService with DeployKeyService =>
+  self: RepositoryService & AccountService & DeployKeyService =>
 
   protected def userName(authType: AuthType): String = {
     authType match {

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

@@ -25,7 +25,7 @@ trait OneselfAuthenticator { self: ControllerBase =>
 /**
  * Allows only the repository owner and administrators.
  */
-trait OwnerAuthenticator { self: ControllerBase with RepositoryService with AccountService =>
+trait OwnerAuthenticator { self: ControllerBase & RepositoryService & AccountService =>
   protected def ownerOnly(action: (RepositoryInfo) => Any) = { authenticate(action) }
   protected def ownerOnly[T](action: (T, RepositoryInfo) => Any) = (form: T) => { authenticate(action(form, _)) }
 
@@ -82,7 +82,7 @@ trait AdminAuthenticator { self: ControllerBase =>
 /**
  * Allows only guests and signed in users who can access the repository.
  */
-trait ReferrerAuthenticator { self: ControllerBase with RepositoryService with AccountService =>
+trait ReferrerAuthenticator { self: ControllerBase & RepositoryService & AccountService =>
   protected def referrersOnly(action: (RepositoryInfo) => Any) = { authenticate(action) }
   protected def referrersOnly[T](action: (T, RepositoryInfo) => Any) = (form: T) => { authenticate(action(form, _)) }
 
@@ -102,7 +102,7 @@ trait ReferrerAuthenticator { self: ControllerBase with RepositoryService with A
 /**
  * Allows only signed in users who have read permission for the repository.
  */
-trait ReadableUsersAuthenticator { self: ControllerBase with RepositoryService with AccountService =>
+trait ReadableUsersAuthenticator { self: ControllerBase & RepositoryService & AccountService =>
   protected def readableUsersOnly(action: (RepositoryInfo) => Any) = { authenticate(action) }
   protected def readableUsersOnly[T](action: (T, RepositoryInfo) => Any) = (form: T) => {
     authenticate(action(form, _))
@@ -124,7 +124,7 @@ trait ReadableUsersAuthenticator { self: ControllerBase with RepositoryService w
 /**
  * Allows only signed in users who have write permission for the repository.
  */
-trait WritableUsersAuthenticator { self: ControllerBase with RepositoryService with AccountService =>
+trait WritableUsersAuthenticator { self: ControllerBase & RepositoryService & AccountService =>
   protected def writableUsersOnly(action: (RepositoryInfo) => Any) = { authenticate(action) }
   protected def writableUsersOnly[T](action: (T, RepositoryInfo) => Any) = (form: T) => {
     authenticate(action(form, _))
@@ -151,7 +151,7 @@ trait WritableUsersAuthenticator { self: ControllerBase with RepositoryService w
 /**
  * Allows only the group managers.
  */
-trait GroupManagerAuthenticator { self: ControllerBase with AccountService =>
+trait GroupManagerAuthenticator { self: ControllerBase & AccountService =>
   protected def managersOnly(action: => Any) = { authenticate(action) }
   protected def managersOnly[T](action: T => Any) = (form: T) => { authenticate(action(form)) }