Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-06 13:35:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

prepare Scala 3

Browse Source
This commit is contained in:
xuwei-k
2021-06-07 20:16:18 +09:00
parent f683439c73
commit 5973c8cb85
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/scala/gitbucket/core/service/WebHookService.scala
View File

@@ -127,7 +127,7 @@ trait WebHookService {
ctype = ctype, ctype = ctype,
token = token token = token
) )
events.map { event: WebHook.Event => events.map { (event: WebHook.Event) =>
RepositoryWebHookEvents insert RepositoryWebHookEvent(owner, repository, url, event) RepositoryWebHookEvents insert RepositoryWebHookEvent(owner, repository, url, event)
} }
} }
@@ -145,7 +145,7 @@ trait WebHookService {
.map(w => (w.ctype, w.token)) .map(w => (w.ctype, w.token))
.update((ctype, token)) .update((ctype, token))
RepositoryWebHookEvents.filter(_.byRepositoryWebHook(owner, repository, url)).delete RepositoryWebHookEvents.filter(_.byRepositoryWebHook(owner, repository, url)).delete
events.map { event: WebHook.Event => events.map { (event: WebHook.Event) =>
RepositoryWebHookEvents insert RepositoryWebHookEvent(owner, repository, url, event) RepositoryWebHookEvents insert RepositoryWebHookEvent(owner, repository, url, event)
} }
} }
@@ -164,7 +164,7 @@ trait WebHookService {
.map(w => (w.url, w.ctype, w.token)) .map(w => (w.url, w.ctype, w.token))
.update((url, ctype, token)) .update((url, ctype, token))
RepositoryWebHookEvents.filter(_.byRepositoryWebHook(owner, repository, url)).delete RepositoryWebHookEvents.filter(_.byRepositoryWebHook(owner, repository, url)).delete
events.map { event: WebHook.Event => events.map { (event: WebHook.Event) =>
RepositoryWebHookEvents insert RepositoryWebHookEvent(owner, repository, url, event) RepositoryWebHookEvents insert RepositoryWebHookEvent(owner, repository, url, event)
} }
} }
@@ -229,7 +229,7 @@ trait WebHookService {
token: Option[String] token: Option[String]
)(implicit s: Session): Unit = { )(implicit s: Session): Unit = {
AccountWebHooks insert AccountWebHook(owner, url, ctype, token) AccountWebHooks insert AccountWebHook(owner, url, ctype, token)
events.map { event: WebHook.Event => events.map { (event: WebHook.Event) =>
AccountWebHookEvents insert AccountWebHookEvent(owner, url, event) AccountWebHookEvents insert AccountWebHookEvent(owner, url, event)
} }
} }
@@ -243,7 +243,7 @@ trait WebHookService {
)(implicit s: Session): Unit = { )(implicit s: Session): Unit = {
AccountWebHooks.filter(_.byPrimaryKey(owner, url)).map(w => (w.ctype, w.token)).update((ctype, token)) AccountWebHooks.filter(_.byPrimaryKey(owner, url)).map(w => (w.ctype, w.token)).update((ctype, token))
AccountWebHookEvents.filter(_.byAccountWebHook(owner, url)).delete AccountWebHookEvents.filter(_.byAccountWebHook(owner, url)).delete
events.map { event: WebHook.Event => events.map { (event: WebHook.Event) =>
AccountWebHookEvents insert AccountWebHookEvent(owner, url, event) AccountWebHookEvents insert AccountWebHookEvent(owner, url, event)
} }
} }

6
src/main/scala/gitbucket/core/util/EditorConfigUtil.scala
View File

@@ -28,7 +28,7 @@ object EditorConfigUtil {
} }
private def getRevTree: RevTree = { private def getRevTree: RevTree = {
Using.resource(repo.newObjectReader()) { reader: ObjectReader => Using.resource(repo.newObjectReader()) { (reader: ObjectReader) =>
val revWalk = new RevWalk(reader) val revWalk = new RevWalk(reader)
val id = repo.resolve(revStr) val id = repo.resolve(revStr)
val commit = revWalk.parseCommit(id) val commit = revWalk.parseCommit(id)
@@ -37,7 +37,7 @@ object EditorConfigUtil {
} }
override def exists(): Boolean = { override def exists(): Boolean = {
Using.resource(repo.newObjectReader()) { reader: ObjectReader => Using.resource(repo.newObjectReader()) { (reader: ObjectReader) =>
try { try {
val treeWalk = Option(TreeWalk.forPath(reader, removeInitialSlash(path), getRevTree)) val treeWalk = Option(TreeWalk.forPath(reader, removeInitialSlash(path), getRevTree))
treeWalk.isDefined treeWalk.isDefined
@@ -60,7 +60,7 @@ object EditorConfigUtil {
} }
override def openReader(): Reader = { override def openReader(): Reader = {
Using.resource(repo.newObjectReader) { reader: ObjectReader => Using.resource(repo.newObjectReader) { (reader: ObjectReader) =>
val treeWalk = TreeWalk.forPath(reader, removeInitialSlash(path), getRevTree) val treeWalk = TreeWalk.forPath(reader, removeInitialSlash(path), getRevTree)
new InputStreamReader(reader.open(treeWalk.getObjectId(0)).openStream, StandardCharsets.UTF_8) new InputStreamReader(reader.open(treeWalk.getObjectId(0)).openStream, StandardCharsets.UTF_8)
} }