Use ControlUtil.

src/main/scala/app/SearchController.scala

@@ -1,6 +1,7 @@
 package app
 
 import util._
+import ControlUtil._
 import service._
 import jp.sf.amateras.scalatra.forms._
 
@@ -26,8 +27,7 @@ trait SearchControllerBase extends ControllerBase { self: RepositoryService
   }
 
   get("/:owner/:repository/search")(referrersOnly { repository =>
-    val query  = params("q").trim
+    defining(params("q").trim, params.getOrElse("type", "code")){ case (query, target) =>
-    val target = params.getOrElse("type", "code")
       val page   = try {
         val i = params.getOrElse("page", "1").toInt
         if(i <= 0) 1 else i
@@ -46,6 +46,7 @@ trait SearchControllerBase extends ControllerBase { self: RepositoryService
           countIssues(repository.owner, repository.name, query),
           query, page, repository)
       }
+    }
   })
 
 }

src/main/scala/app/UserManagementController.scala

@@ -3,6 +3,7 @@ package app
 import service._
 import util.AdminAuthenticator
 import util.StringUtil._
+import util.ControlUtil._
 import jp.sf.amateras.scalatra.forms._
 
 class UserManagementController extends UserManagementControllerBase
@@ -107,16 +108,15 @@ trait UserManagementControllerBase extends AccountManagementControllerBase {
   })
 
   get("/admin/users/:groupName/_editgroup")(adminOnly {
-    val groupName = params("groupName")
+    defining(params("groupName")){ groupName =>
       admin.users.html.group(getAccountByUserName(groupName), getGroupMembers(groupName))
+    }
   })
 
   post("/admin/users/:groupName/_editgroup", editGroupForm)(adminOnly { form =>
-    val groupName = params("groupName")
+    defining(params("groupName"), form.memberNames.map(_.split(",").toList).getOrElse(Nil)){ case (groupName, memberNames) =>
       getAccountByUserName(groupName).map { account =>
         updateGroup(groupName, form.url)
-
-      val memberNames = form.memberNames.map(_.split(",").toList).getOrElse(Nil)
         updateGroupMembers(form.groupName, memberNames)
 
         getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
@@ -130,6 +130,7 @@ trait UserManagementControllerBase extends AccountManagementControllerBase {
         redirect("/admin/users")
 
       } getOrElse NotFound
+    }
   })
 
   post("/admin/users/_usercheck")(adminOnly {

src/main/scala/service/PullRequestService.scala

@@ -2,14 +2,14 @@ package service
 
 import scala.slick.driver.H2Driver.simple._
 import Database.threadLocalSession
-
 import model._
+import util.ControlUtil._
 
 trait PullRequestService { self: IssuesService =>
   import PullRequestService._
 
-  def getPullRequest(owner: String, repository: String, issueId: Int): Option[(Issue, PullRequest)] = {
+  def getPullRequest(owner: String, repository: String, issueId: Int): Option[(Issue, PullRequest)] =
-    val issue = getIssue(owner, repository, issueId.toString)
+    defining(getIssue(owner, repository, issueId.toString)){ issue =>
       if(issue.isDefined){
         Query(PullRequests).filter(_.byPrimaryKey(owner, repository, issueId)).firstOption match {
           case Some(pullreq) => Some((issue.get, pullreq))

src/main/scala/service/RepositorySearchService.scala

@@ -10,7 +10,8 @@ import scala.collection.mutable.ListBuffer
 import org.eclipse.jgit.lib.FileMode
 import org.eclipse.jgit.api.Git
 
-trait RepositorySearchService { self: IssuesService =>
+trait
+RepositorySearchService { self: IssuesService =>
   import RepositorySearchService._
 
   def countIssues(owner: String, repository: String, query: String): Int =

src/main/scala/service/SystemSettingsService.scala

@@ -1,12 +1,13 @@
 package service
 
 import util.Directory._
+import util.ControlUtil._
 import SystemSettingsService._
 
 trait SystemSettingsService {
 
   def saveSystemSettings(settings: SystemSettings): Unit = {
-    val props = new java.util.Properties()
+    defining(new java.util.Properties()){ props =>
       props.setProperty(AllowAccountRegistration, settings.allowAccountRegistration.toString)
       props.setProperty(Gravatar, settings.gravatar.toString)
       props.setProperty(Notification, settings.notification.toString)
@@ -33,10 +34,11 @@ trait SystemSettingsService {
       }
       props.store(new java.io.FileOutputStream(GitBucketConf), null)
     }
+  }
 
 
   def loadSystemSettings(): SystemSettings = {
-    val props = new java.util.Properties()
+    defining(new java.util.Properties()){ props =>
       if(GitBucketConf.exists){
         props.load(new java.io.FileInputStream(GitBucketConf))
       }
@@ -69,6 +71,7 @@ trait SystemSettingsService {
         }
       )
     }
+  }
 
 }
 
@@ -119,20 +122,20 @@ object SystemSettingsService {
   private val LdapUserNameAttribute = "ldap.username_attribute"
   private val LdapMailAddressAttribute = "ldap.mail_attribute"
 
-  private def getValue[A: ClassTag](props: java.util.Properties, key: String, default: A): A = {
+  private def getValue[A: ClassTag](props: java.util.Properties, key: String, default: A): A =
-    val value = props.getProperty(key)
+    defining(props.getProperty(key)){ value =>
       if(value == null || value.isEmpty) default
       else convertType(value).asInstanceOf[A]
     }
 
-  private def getOptionValue[A: ClassTag](props: java.util.Properties, key: String, default: Option[A]): Option[A] = {
+  private def getOptionValue[A: ClassTag](props: java.util.Properties, key: String, default: Option[A]): Option[A] =
-    val value = props.getProperty(key)
+    defining(props.getProperty(key)){ value =>
       if(value == null || value.isEmpty) default
       else Some(convertType(value)).asInstanceOf[Option[A]]
     }
 
-  private def convertType[A: ClassTag](value: String) = {
+  private def convertType[A: ClassTag](value: String) =
-    val c = implicitly[ClassTag[A]].runtimeClass
+    defining(implicitly[ClassTag[A]].runtimeClass){ c =>
       if(c == classOf[Boolean])  value.toBoolean
       else if(c == classOf[Int]) value.toInt
       else value

src/main/scala/service/WikiService.scala

@@ -34,9 +34,9 @@ object WikiService {
 trait WikiService {
   import WikiService._
 
-  def createWikiRepository(loginAccount: model.Account, owner: String, repository: String): Unit = {
+  def createWikiRepository(loginAccount: model.Account, owner: String, repository: String): Unit =
     LockUtil.lock(s"${owner}/${repository}/wiki"){
-      val dir = Directory.getWikiRepositoryDir(owner, repository)
+      defining(Directory.getWikiRepositoryDir(owner, repository)){ dir =>
         if(!dir.exists){
           try {
             JGitUtil.initRepository(dir)
@@ -54,20 +54,20 @@ trait WikiService {
    */
   def getWikiPage(owner: String, repository: String, pageName: String): Option[WikiPageInfo] = {
     using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
-      if(!JGitUtil.isEmpty(git)){
+      optionIf(!JGitUtil.isEmpty(git)){
         JGitUtil.getFileList(git, "master", ".").find(_.name == pageName + ".md").map { file =>
           WikiPageInfo(file.name, new String(git.getRepository.open(file.id).getBytes, "UTF-8"), file.committer, file.time)
         }
-      } else None
+      }
     }
   }
 
   /**
    * Returns the content of the specified file.
    */
-  def getFileContent(owner: String, repository: String, path: String): Option[Array[Byte]] = {
+  def getFileContent(owner: String, repository: String, path: String): Option[Array[Byte]] =
     using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
-      if(!JGitUtil.isEmpty(git)){
+      optionIf(!JGitUtil.isEmpty(git)){
         val index = path.lastIndexOf('/')
         val parentPath = if(index < 0) "."  else path.substring(0, index)
         val fileName   = if(index < 0) path else path.substring(index + 1)
@@ -75,7 +75,6 @@ trait WikiService {
         JGitUtil.getFileList(git, "master", parentPath).find(_.name == fileName).map { file =>
           git.getRepository.open(file.id).getBytes
         }
-      } else None
       }
     }
 
@@ -98,36 +97,31 @@ trait WikiService {
       content: String, committer: model.Account, message: String): Option[String] = {
 
     LockUtil.lock(s"${owner}/${repository}/wiki"){
+      defining(Directory.getWikiWorkDir(owner, repository)){ workDir =>
         // clone working copy
-      val workDir = Directory.getWikiWorkDir(owner, repository)
         cloneOrPullWorkingCopy(workDir, owner, repository)
 
         // write as file
         using(Git.open(workDir)){ git =>
-        val file = new File(workDir, newPageName + ".md")
+          defining(new File(workDir, newPageName + ".md")){ file =>
-        val added = if(!file.exists || FileUtils.readFileToString(file, "UTF-8") != content){
+            val added = executeIf(!file.exists || FileUtils.readFileToString(file, "UTF-8") != content){
               FileUtils.writeStringToFile(file, content, "UTF-8")
               git.add.addFilepattern(file.getName).call
-          true
-        } else {
-          false
             }
 
             // delete file
-        val deleted = if(currentPageName != "" && currentPageName != newPageName){
+            val deleted = executeIf(currentPageName != "" && currentPageName != newPageName){
               git.rm.addFilepattern(currentPageName + ".md").call
-          true
-        } else {
-          false
             }
 
             // commit and push
-        if(added || deleted){
+            optionIf(added || deleted){
-          val commit = git.commit.setCommitter(committer.userName, committer.mailAddress).setMessage(message).call
+              defining(git.commit.setCommitter(committer.userName, committer.mailAddress).setMessage(message).call){ commit =>
                 git.push.call
                 Some(commit.getName)
-        } else {
+              }
-          None
+            }
+          }
         }
       }
     }
@@ -139,8 +133,8 @@ trait WikiService {
   def deleteWikiPage(owner: String, repository: String, pageName: String,
                      committer: String, mailAddress: String, message: String): Unit = {
     LockUtil.lock(s"${owner}/${repository}/wiki"){
+      defining(Directory.getWikiWorkDir(owner, repository)){ workDir =>
         // clone working copy
-      val workDir = Directory.getWikiWorkDir(owner, repository)
         cloneOrPullWorkingCopy(workDir, owner, repository)
 
         // delete file
@@ -155,20 +149,19 @@ trait WikiService {
         }
       }
     }
+  }
 
   private def cloneOrPullWorkingCopy(workDir: File, owner: String, repository: String): Unit = {
     if(!workDir.exists){
-      val git =
       Git.cloneRepository
         .setURI(Directory.getWikiRepositoryDir(owner, repository).toURI.toString)
         .setDirectory(workDir)
         .call
-      git.getRepository.close  // close .git resources.
+        .getRepository
-    } else {
+        .close
-      using(Git.open(workDir)){ git =>
+    } else using(Git.open(workDir)){ git =>
       git.pull.call
     }
   }
-  }
 
 }

src/main/scala/servlet/AutoUpdateListener.scala

@@ -6,7 +6,9 @@ import org.apache.commons.io.FileUtils
 import javax.servlet.ServletContextEvent
 import org.apache.commons.io.IOUtils
 import org.slf4j.LoggerFactory
-import util.Directory
+import util.Directory._
+import util.ControlUtil._
+import org.eclipse.jgit.api.Git
 
 object AutoUpdate {
   
@@ -26,15 +28,14 @@ object AutoUpdate {
      */
     def update(conn: Connection): Unit = {
       val sqlPath = s"update/${majorVersion}_${minorVersion}.sql"
-      val in = Thread.currentThread.getContextClassLoader.getResourceAsStream(sqlPath)
+
+      using(Thread.currentThread.getContextClassLoader.getResourceAsStream(sqlPath)){ in =>
         if(in != null){
           val sql = IOUtils.toString(in, "UTF-8")
-        val stmt = conn.createStatement()
+          using(conn.createStatement()){ stmt =>
-        try {
             logger.debug(sqlPath + "=" + sql)
             stmt.executeUpdate(sql)
-        } finally {
+          }
-          stmt.close()
         }
       }
     }
@@ -56,16 +57,17 @@ object AutoUpdate {
       override def update(conn: Connection): Unit = {
         super.update(conn)
         // Fix wiki repository configuration
-        val rs = conn.createStatement.executeQuery("SELECT USER_NAME, REPOSITORY_NAME FROM REPOSITORY")
+        using(conn.createStatement.executeQuery("SELECT USER_NAME, REPOSITORY_NAME FROM REPOSITORY")){ rs =>
           while(rs.next){
-          val wikidir = Directory.getWikiRepositoryDir(rs.getString("USER_NAME"), rs.getString("REPOSITORY_NAME"))
+            using(Git.open(getWikiRepositoryDir(rs.getString("USER_NAME"), rs.getString("REPOSITORY_NAME")))){ git =>
-          val repository = org.eclipse.jgit.api.Git.open(wikidir).getRepository
+              defining(git.getRepository.getConfig){ config =>
-          val config = repository.getConfig
                 if(!config.getBoolean("http", "receivepack", false)){
                   config.setBoolean("http", null, "receivepack", true)
                   config.save
                 }
-          repository.close
+              }
+            }
+          }
         }
       }
     },
@@ -82,7 +84,7 @@ object AutoUpdate {
   /**
    * The version file (GITBUCKET_HOME/version).
    */
-  val versionFile = new File(Directory.GitBucketHome, "version")
+  val versionFile = new File(GitBucketHome, "version")
   
   /**
    * Returns the current version from the version file.
@@ -113,14 +115,14 @@ class AutoUpdateListener extends org.h2.server.web.DbStarter {
   private val logger = LoggerFactory.getLogger(classOf[AutoUpdateListener])
   
   override def contextInitialized(event: ServletContextEvent): Unit = {
-    event.getServletContext.setInitParameter("db.url", s"jdbc:h2:${Directory.DatabaseHome}")
+    event.getServletContext.setInitParameter("db.url", s"jdbc:h2:${DatabaseHome}")
     super.contextInitialized(event)
     logger.debug("H2 started")
     
     logger.debug("Start schema update")
-    val conn = getConnection()
+    defining(getConnection()){ conn =>
       try {
-      val currentVersion = getCurrentVersion()
+        defining(getCurrentVersion()){ currentVersion =>
           if(currentVersion == headVersion){
             logger.debug("No update")
           } else {
@@ -129,6 +131,7 @@ class AutoUpdateListener extends org.h2.server.web.DbStarter {
             conn.commit()
             logger.debug("Updated from " + currentVersion.versionString + " to " + headVersion.versionString)
           }
+        }
       } catch {
         case ex: Throwable => {
           logger.error("Failed to schema update", ex)
@@ -136,6 +139,7 @@ class AutoUpdateListener extends org.h2.server.web.DbStarter {
           conn.rollback()
         }
       }
+    }
     logger.debug("End schema update")
   }
   

src/main/scala/util/ControlUtil.scala

@@ -33,5 +33,18 @@ object ControlUtil {
       git.getRepository.close
     }
 
+  def executeIf(condition: => Boolean)(action: => Unit): Boolean =
+    if(condition){
+      action
+      true
+    } else {
+      false
+    }
 
+  def optionIf[T](condition: => Boolean)(action: => Option[T]): Option[T] =
+    if(condition){
+      action
+    } else {
+      None
+    }
 }

src/main/scala/util/JGitUtil.scala

@@ -69,29 +69,17 @@ object JGitUtil {
         rev.getFullMessage,
         rev.getParents().map(_.name).toList)
 
-    val summary = {
+    val summary = defining(fullMessage.trim.indexOf("\n")){ i =>
-      val i = fullMessage.trim.indexOf("\n")
+      defining(if(i >= 0) fullMessage.trim.substring(0, i).trim else fullMessage){ firstLine =>
-      val firstLine = if(i >= 0){
+        if(firstLine.length > shortMessage.length) shortMessage else firstLine
-        fullMessage.trim.substring(0, i).trim
-      } else {
-        fullMessage
-      }
-      if(firstLine.length > shortMessage.length){
-        shortMessage
-      } else {
-        firstLine
       }
     }
 
-    val description = {
+    val description = defining(fullMessage.trim.indexOf("\n")){ i =>
-      val i = fullMessage.trim.indexOf("\n")
+      optionIf(i >= 0){
-      if(i >= 0){
         Some(fullMessage.trim.substring(i).trim)
-      } else {
-        None
       }
     }
-
   }
 
   case class DiffInfo(changeType: ChangeType, oldPath: String, newPath: String, oldContent: Option[String], newContent: Option[String])
@@ -462,26 +450,21 @@ object JGitUtil {
     }
   }
 
-  def initRepository(dir: java.io.File): Unit = {
+  def initRepository(dir: java.io.File): Unit =
     using(new RepositoryBuilder().setGitDir(dir).setBare.build){ repository =>
       repository.create
       setReceivePack(repository)
     }
-  }
 
-  def cloneRepository(from: java.io.File, to: java.io.File): Unit = {
+  def cloneRepository(from: java.io.File, to: java.io.File): Unit =
-    val git = Git.cloneRepository.setURI(from.toURI.toString).setDirectory(to).setBare(true).call
+    using(Git.cloneRepository.setURI(from.toURI.toString).setDirectory(to).setBare(true).call){ git =>
-    try {
       setReceivePack(git.getRepository)
-    } finally {
-      git.getRepository.close
-    }
     }
 
   def isEmpty(git: Git): Boolean = git.getRepository.resolve(Constants.HEAD) == null
 
-  private def setReceivePack(repository: org.eclipse.jgit.lib.Repository): Unit = {
+  private def setReceivePack(repository: org.eclipse.jgit.lib.Repository): Unit =
-    val config = repository.getConfig
+    defining(repository.getConfig){ config =>
       config.setBoolean("http", null, "receivepack", true)
       config.save
     }

src/main/scala/util/LDAPUtil.scala

@@ -1,10 +1,9 @@
 package util
 
-import service.SystemSettingsService.Ldap
+import util.ControlUtil._
 import service.SystemSettingsService
 import com.novell.ldap._
 import service.SystemSettingsService.Ldap
-import scala.Some
 import scala.annotation.tailrec
 
 /**
@@ -96,12 +95,10 @@ object LDAPUtil {
     }
   }
 
-  private def findMailAddress(conn: LDAPConnection, userDN: String, mailAttribute: String): Option[String] = {
+  private def findMailAddress(conn: LDAPConnection, userDN: String, mailAttribute: String): Option[String] =
-    val results = conn.search(userDN, LDAPConnection.SCOPE_BASE, null, Array[String](mailAttribute), false)
+    defining(conn.search(userDN, LDAPConnection.SCOPE_BASE, null, Array[String](mailAttribute), false)){ results =>
-    if (results.hasMore) {
+      optionIf (results.hasMore) {
         Option(results.next.getAttribute(mailAttribute)).map(_.getStringValue)
-    } else {
-      None
       }
     }
 }

src/main/scala/util/LockUtil.scala

@@ -2,6 +2,7 @@ package util
 
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.locks.{ReentrantLock, Lock}
+import util.ControlUtil._
 
 object LockUtil {
 
@@ -23,8 +24,7 @@ object LockUtil {
   /**
    * Synchronizes a given function which modifies the working copy of the wiki repository.
    */
-  def lock[T](key: String)(f: => T): T = {
+  def lock[T](key: String)(f: => T): T = defining(getLockObject(key)){ lock =>
-    val lock = getLockObject(key)
     try {
       lock.lock()
       f

src/main/scala/util/StringUtil.scala

@@ -2,11 +2,12 @@ package util
 
 import java.net.{URLDecoder, URLEncoder}
 import org.mozilla.universalchardet.UniversalDetector
+import util.ControlUtil._
 
 object StringUtil {
 
-  def sha1(value: String): String = {
+  def sha1(value: String): String =
-    val md = java.security.MessageDigest.getInstance("SHA-1")
+    defining(java.security.MessageDigest.getInstance("SHA-1")){ md =>
       md.update(value.getBytes)
       md.digest.map(b => "%02x".format(b)).mkString
     }
@@ -28,8 +29,8 @@ object StringUtil {
 
   def convertFromByteArray(content: Array[Byte]): String = new String(content, detectEncoding(content))
 
-  def detectEncoding(content: Array[Byte]): String = {
+  def detectEncoding(content: Array[Byte]): String =
-    val detector = new UniversalDetector(null)
+    defining(new UniversalDetector(null)){ detector =>
       detector.handleData(content, 0, content.length)
       detector.dataEnd()
       detector.getDetectedCharset match {

src/main/scala/util/Validations.scala

@@ -25,10 +25,7 @@ trait Validations {
    */
   def date(constraints: Constraint*): SingleValueType[java.util.Date] =
     new SingleValueType[java.util.Date]((pattern("\\d{4}-\\d{2}-\\d{2}") +: constraints): _*){
-      def convert(value: String): java.util.Date = {
+      def convert(value: String): java.util.Date = new java.text.SimpleDateFormat("yyyy-MM-dd").parse(value)
-        val formatter = new java.text.SimpleDateFormat("yyyy-MM-dd")
-        formatter.parse(value)
-      }
     }
 
 }