Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-01-08 16:42:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace using by scala.util.Using

Browse Source
This commit is contained in:
Naoki Takezoe
2019-08-06 22:27:38 +09:00
parent eb6398654d
commit 7ace37cd07
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/gitbucket/core/controller/ReleasesController.scala
View File

@@ -8,9 +8,9 @@ import gitbucket.core.util.Directory._
import gitbucket.core.util.Implicits._
import org.scalatra.forms._
import gitbucket.core.releases.html
import gitbucket.core.util.SyntaxSugars.using
import org.apache.commons.io.FileUtils
import org.eclipse.jgit.api.Git
import scala.util.Using
class ReleaseController
extends ReleaseControllerBase
@@ -130,7 +130,7 @@ trait ReleaseControllerBase extends ControllerBase {
val Seq(previousTag, currentTag) = multiParams("splat")
val previousTagId = repository.tags.collectFirst { case x if x.name == previousTag => x.id }.getOrElse("")
val commitLog = using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
val commitLog = Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
val commits = JGitUtil.getCommitLog(git, previousTagId, currentTag).reverse
commits
.map { commit =>

4
src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
View File

@@ -996,7 +996,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
val mode = treeWalk.getFileMode.getBits
JGitUtil.openFile(git, repository, commit.getTree, treeWalk.getPathString) { in =>
val tempFile = File.createTempFile("gitbucket", ".archive")
val size = using(new FileOutputStream(tempFile)) { out =>
val size = Using.resource(new FileOutputStream(tempFile)) { out =>
IOUtils.copy(
EolStreamTypeUtil.wrapInputStream(
in,
@@ -1013,7 +1013,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
val entry: ArchiveEntry = entryCreator(entryPath, size, date, mode)
archive.putArchiveEntry(entry)
using(new FileInputStream(tempFile)) { in =>
Using.resource(new FileInputStream(tempFile)) { in =>
IOUtils.copy(in, archive)
}
archive.closeArchiveEntry()

4
src/main/scala/gitbucket/core/controller/api/ApiPullRequestControllerBase.scala
View File

@@ -8,10 +8,10 @@ import gitbucket.core.service.PullRequestService.PullRequestLimit
import gitbucket.core.util.Directory.getRepositoryDir
import gitbucket.core.util.Implicits._
import gitbucket.core.util.JGitUtil.CommitInfo
import gitbucket.core.util.SyntaxSugars.using
import gitbucket.core.util._
import org.eclipse.jgit.api.Git
import org.scalatra.NoContent
import scala.util.Using
import scala.jdk.CollectionConverters._
@@ -173,7 +173,7 @@ trait ApiPullRequestControllerBase extends ControllerBase {
issueId =>
getPullRequest(owner, name, issueId) map {
case (issue, pullreq) =>
using(Git.open(getRepositoryDir(owner, name))) { git =>
Using.resource(Git.open(getRepositoryDir(owner, name))) { git =>
val oldId = git.getRepository.resolve(pullreq.commitIdFrom)
val newId = git.getRepository.resolve(pullreq.commitIdTo)
val repoFullName = RepositoryName(repository)

6
src/main/scala/gitbucket/core/controller/api/ApiRepositoryContentsControllerBase.scala
View File

@@ -5,10 +5,10 @@ import gitbucket.core.service.{RepositoryCommitFileService, RepositoryService}
import gitbucket.core.util.Directory.getRepositoryDir
import gitbucket.core.util.JGitUtil.{FileInfo, getContentFromId, getFileList}
import gitbucket.core.util._
import gitbucket.core.util.SyntaxSugars.using
import gitbucket.core.view.helpers.{isRenderable, renderMarkup}
import gitbucket.core.util.Implicits._
import org.eclipse.jgit.api.Git
import scala.util.Using
trait ApiRepositoryContentsControllerBase extends ControllerBase {
self: ReferrerAuthenticator with WritableUsersAuthenticator with RepositoryCommitFileService =>
@@ -45,7 +45,7 @@ trait ApiRepositoryContentsControllerBase extends ControllerBase {
getFileList(git, revision, dirName).find(f => f.name.equals(fileName))
}
using(Git.open(getRepositoryDir(params("owner"), params("repository")))) { git =>
Using.resource(Git.open(getRepositoryDir(params("owner"), params("repository")))) { git =>
val fileList = getFileList(git, refStr, path)
if (fileList.isEmpty) { // file or NotFound
getFileInfo(git, refStr, path)
@@ -113,7 +113,7 @@ trait ApiRepositoryContentsControllerBase extends ControllerBase {
data <- extractFromJsonBody[CreateAFile]
} yield {
val branch = data.branch.getOrElse(repository.repository.defaultBranch)
val commit = using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
val commit = Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
revCommit.name
}

6
src/main/scala/gitbucket/core/service/RepositoryCreationService.scala
View File

@@ -4,7 +4,6 @@ import java.nio.file.Files
import java.util.concurrent.ConcurrentHashMap
import gitbucket.core.model.Profile.profile.blockingApi._
import gitbucket.core.util.SyntaxSugars._
import gitbucket.core.util.Directory._
import gitbucket.core.util.{FileUtil, JGitUtil, LockUtil}
import gitbucket.core.model.{Account, Role}
@@ -18,6 +17,7 @@ import org.eclipse.jgit.lib.{Constants, FileMode}
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.Future
import scala.util.Using
object RepositoryCreationService {
@@ -107,7 +107,7 @@ trait RepositoryCreationService {
JGitUtil.initRepository(gitdir)
if (initOption == "README" || initOption == "EMPTY_COMMIT") {
using(Git.open(gitdir)) { git =>
Using.resource(Git.open(gitdir)) { git =>
val builder = DirCache.newInCore.builder()
val inserter = git.getRepository.newObjectInserter()
val headId = git.getRepository.resolve(Constants.HEAD + "^{commit}")
@@ -148,7 +148,7 @@ trait RepositoryCreationService {
copyRepositoryDir.foreach { dir =>
try {
using(Git.open(dir)) { git =>
Using.resource(Git.open(dir)) { git =>
git.push().setRemote(gitdir.toURI.toString).setPushAll().setPushTags().call()
}
} finally {