reformat code

Author: yaroot

build.sbt

@@ -3,5 +3,4 @@ name             := "gitbucket-pages-plugin"
 scalaVersion     := "2.12.4"
 version          := "1.7.0"
 gitbucketVersion := "4.23.0"
-scalacOptions    := Seq("-unchecked", "-deprecation", "-encoding", "utf8", "-feature")
-
+scalacOptions := Seq("-unchecked", "-deprecation", "-encoding", "utf8", "-feature")

src/main/scala/Plugin.scala

@@ -2,8 +2,8 @@ import gitbucket.core.controller.Context
 import gitbucket.core.controller.ControllerBase
 import gitbucket.core.plugin.Link
 import gitbucket.core.service.RepositoryService.RepositoryInfo
-import gitbucket.plugin.pages.{ PagesController, PagesHook }
-import io.github.gitbucket.solidbase.migration.{ SqlMigration, LiquibaseMigration }
+import gitbucket.plugin.pages.{PagesController, PagesHook}
+import io.github.gitbucket.solidbase.migration.{SqlMigration, LiquibaseMigration}
 import io.github.gitbucket.solidbase.model.Version
 
 class Plugin extends gitbucket.core.plugin.Plugin {
@@ -24,21 +24,21 @@ class Plugin extends gitbucket.core.plugin.Plugin {
     new Version(
       "1.1",
       new LiquibaseMigration("update/gitbucket-page_1.1.xml"),
-      new SqlMigration("update/gitbucket-page_1.1.sql")),
+      new SqlMigration("update/gitbucket-page_1.1.sql")
+    ),
     new Version("1.2"),
     new Version("1.3"),
     new Version("1.4.0"),
     new Version("1.5.0"),
     new Version("1.6.0"),
-    new Version("1.7.0"))
+    new Version("1.7.0")
+  )
 
-  override val controllers: Seq[(String, ControllerBase)] = Seq(
-    "/*" -> new PagesController)
+  override val controllers: Seq[(String, ControllerBase)] = Seq("/*" -> new PagesController)
 
   override val repositorySettingTabs = Seq(
-    (repository: RepositoryInfo, context: Context) => Some(Link("pages", "Pages", s"settings/pages")))
+    (repository: RepositoryInfo, context: Context) => Some(Link("pages", "Pages", s"settings/pages"))
+  )
 
-  override val repositoryHooks = Seq(
-    new PagesHook)
+  override val repositoryHooks = Seq(new PagesHook)
 }
-

src/main/scala/gitbucket/plugin/model/PageProfile.scala

@@ -2,5 +2,4 @@ package gitbucket.plugin.model
 
 import gitbucket.core.model._
 
-object Profile extends CoreProfile
-  with PagesComponent
+object Profile extends CoreProfile with PagesComponent

src/main/scala/gitbucket/plugin/model/Pages.scala

@@ -3,7 +3,8 @@ package gitbucket.plugin.model
 trait PagesComponent { self: gitbucket.core.model.Profile =>
   import profile.api._
 
-  implicit val psColumnType = MappedColumnType.base[PageSourceType, String](ps => ps.code, code => PageSourceType.valueOf(code))
+  implicit val psColumnType =
+    MappedColumnType.base[PageSourceType, String](ps => ps.code, code => PageSourceType.valueOf(code))
 
   lazy val Pages = TableQuery[Pages]
 
@@ -33,7 +34,4 @@ object PageSourceType {
   def valueOpt(code: String): Option[PageSourceType] = map.get(code)
 }
 
-case class Page(
-  userName: String,
-  repositoryName: String,
-  source: PageSourceType)
+case class Page(userName: String, repositoryName: String, source: PageSourceType)

src/main/scala/gitbucket/plugin/pages/PagesHook.scala

@@ -5,9 +5,7 @@ import gitbucket.plugin.model.PageSourceType
 import gitbucket.plugin.model.Profile.profile.blockingApi._
 import gitbucket.plugin.service.PagesService
 
-class PagesHook
-  extends PagesHookBase
-  with PagesService
+class PagesHook extends PagesHookBase with PagesService
 
 trait PagesHookBase extends RepositoryHook {
   self: PagesService =>

src/main/scala/gitbucket/plugin/pages/pages.scala

@@ -2,10 +2,10 @@ package gitbucket.plugin.pages
 
 import gitbucket.core.controller.ControllerBase
 import gitbucket.core.service.RepositoryService.RepositoryInfo
-import gitbucket.core.service.{ AccountService, RepositoryService }
+import gitbucket.core.service.{AccountService, RepositoryService}
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.SyntaxSugars._
-import gitbucket.core.util.{ Directory, JGitUtil, OwnerAuthenticator, ReferrerAuthenticator }
+import gitbucket.core.util.{Directory, JGitUtil, OwnerAuthenticator, ReferrerAuthenticator}
 import gitbucket.pages.html
 import gitbucket.plugin.model.PageSourceType
 import gitbucket.plugin.service.PagesService
@@ -19,20 +19,20 @@ import scala.annotation.tailrec
 import scala.language.implicitConversions
 
 class PagesController
-  extends PagesControllerBase
-  with AccountService
-  with OwnerAuthenticator
-  with PagesService
-  with RepositoryService
-  with ReferrerAuthenticator
+    extends PagesControllerBase
+    with AccountService
+    with OwnerAuthenticator
+    with PagesService
+    with RepositoryService
+    with ReferrerAuthenticator
 
 trait PagesControllerBase extends ControllerBase {
   self: AccountService with RepositoryService with PagesService with ReferrerAuthenticator with OwnerAuthenticator =>
   import PagesControllerBase._
 
-  val optionsForm = mapping(
-    "source" -> trim(label("Pages Source", text(required, pagesOption))))(
-      (source) => OptionsForm(PageSourceType.valueOf(source)))
+  val optionsForm = mapping("source" -> trim(label("Pages Source", text(required, pagesOption))))(
+    (source) => OptionsForm(PageSourceType.valueOf(source))
+  )
 
   val PAGES_BRANCHES = List("gb-pages", "gh-pages")
 
@@ -78,7 +78,12 @@ trait PagesControllerBase extends ControllerBase {
     }
   }
 
-  def renderFromBranch(repository: RepositoryService.RepositoryInfo, git: Git, path: String, branchObject: Option[ObjectId]): Any = {
+  def renderFromBranch(
+    repository: RepositoryService.RepositoryInfo,
+    git: Git,
+    path: String,
+    branchObject: Option[ObjectId]
+  ): Any = {
     val pagePair = branchObject
       .map(JGitUtil.getRevCommitFromId(git, _))
       .flatMap(getPageObjectId(git, path, _))
@@ -135,7 +140,7 @@ object PagesControllerBase {
         case head :: tail =>
           f(head) match {
             case Some(x) => Some(x)
-            case None => tail.collectFirstOpt(f)
+            case None    => tail.collectFirstOpt(f)
           }
         case Nil => None
       }
@@ -146,7 +151,7 @@ object PagesControllerBase {
     override def validate(name: String, value: String, messages: Messages): Option[String] =
       PageSourceType.valueOpt(value) match {
         case Some(_) => None
-        case None => Some("Pages source is invalid.")
+        case None    => Some("Pages source is invalid.")
       }
   }
 }

src/main/scala/gitbucket/plugin/service/PagesService.scala

@@ -1,6 +1,6 @@
 package gitbucket.plugin.service
 
-import gitbucket.plugin.model.{ Page, PageSourceType }
+import gitbucket.plugin.model.{Page, PageSourceType}
 import gitbucket.plugin.model.Profile._
 import gitbucket.plugin.model.Profile.profile.blockingApi._
 
@@ -21,7 +21,9 @@ trait PagesService {
       .map(t => t.source)
       .update(source)
 
-  def renameRepository(userName: String, oldRepositoryName: String, newRepositoryName: String)(implicit s: Session): Unit =
+  def renameRepository(userName: String, oldRepositoryName: String, newRepositoryName: String)(
+    implicit s: Session
+  ): Unit =
     Pages
       .filter(t => (t.userName === userName.bind) && (t.repositoryName === oldRepositoryName.bind))
       .map(t => t.repositoryName)