mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-04 20:45:58 +01:00
use foreach instead of map
This commit is contained in:
@@ -326,12 +326,12 @@ trait AccountManagementControllerBase extends ControllerBase {
|
||||
|
||||
protected def updateImage(userName: String, fileId: Option[String], clearImage: Boolean): Unit =
|
||||
if (clearImage) {
|
||||
getAccountByUserName(userName).flatMap(_.image).map { image =>
|
||||
getAccountByUserName(userName).flatMap(_.image).foreach { image =>
|
||||
new File(getUserUploadDir(userName), FileUtil.checkFilename(image)).delete()
|
||||
updateAvatarImage(userName, None)
|
||||
}
|
||||
} else {
|
||||
fileId.map { fileId =>
|
||||
fileId.foreach { fileId =>
|
||||
val filename = "avatar." + FileUtil.getExtension(session.getAndRemove(Keys.Session.Upload(fileId)).get)
|
||||
val uploadDir = getUserUploadDir(userName)
|
||||
if (!uploadDir.exists) {
|
||||
|
||||
@@ -352,10 +352,10 @@ trait PullRequestsControllerBase extends ControllerBase {
|
||||
|
||||
// close issue by commit message
|
||||
if (pullreq.requestBranch == repository.repository.defaultBranch) {
|
||||
commits.map { commit =>
|
||||
commits.foreach { commit =>
|
||||
closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name).foreach {
|
||||
issueId =>
|
||||
getIssue(repository.owner, repository.name, issueId.toString).map { issue =>
|
||||
getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
|
||||
callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount)
|
||||
PluginRegistry().getIssueHooks
|
||||
.foreach(
|
||||
@@ -469,7 +469,7 @@ trait PullRequestsControllerBase extends ControllerBase {
|
||||
commits.flatten.foreach { commit =>
|
||||
closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name).foreach {
|
||||
issueId =>
|
||||
getIssue(owner, name, issueId.toString).map { issue =>
|
||||
getIssue(owner, name, issueId.toString).foreach { issue =>
|
||||
callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount)
|
||||
PluginRegistry().getIssueHooks
|
||||
.foreach(_.closedByCommitComment(issue, repository, commit.fullMessage, loginAccount))
|
||||
@@ -483,14 +483,14 @@ trait PullRequestsControllerBase extends ControllerBase {
|
||||
owner,
|
||||
name
|
||||
).foreach { issueId =>
|
||||
getIssue(owner, name, issueId.toString).map { issue =>
|
||||
getIssue(owner, name, issueId.toString).foreach { issue =>
|
||||
callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount)
|
||||
PluginRegistry().getIssueHooks
|
||||
.foreach(_.closedByCommitComment(issue, repository, issueContent, loginAccount))
|
||||
}
|
||||
}
|
||||
closeIssuesFromMessage(form.message, loginAccount.userName, owner, name).foreach { issueId =>
|
||||
getIssue(owner, name, issueId.toString).map { issue =>
|
||||
getIssue(owner, name, issueId.toString).foreach { issue =>
|
||||
callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount)
|
||||
PluginRegistry().getIssueHooks
|
||||
.foreach(_.closedByCommitComment(issue, repository, issueContent, loginAccount))
|
||||
@@ -743,7 +743,7 @@ trait PullRequestsControllerBase extends ControllerBase {
|
||||
|
||||
// insert labels
|
||||
if (manageable) {
|
||||
form.labelNames.map { value =>
|
||||
form.labelNames.foreach { value =>
|
||||
val labels = getLabels(owner, name)
|
||||
value.split(",").foreach { labelName =>
|
||||
labels.find(_.labelName == labelName).map { label =>
|
||||
|
||||
@@ -229,7 +229,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
|
||||
post("/:owner/:repository/settings/collaborators")(ownerOnly { repository =>
|
||||
val collaborators = params("collaborators")
|
||||
removeCollaborators(repository.owner, repository.name)
|
||||
collaborators.split(",").withFilter(_.nonEmpty).map { collaborator =>
|
||||
collaborators.split(",").withFilter(_.nonEmpty).foreach { collaborator =>
|
||||
val userName :: role :: Nil = collaborator.split(":").toList
|
||||
addCollaborator(repository.owner, repository.name, userName, role)
|
||||
}
|
||||
|
||||
@@ -1066,7 +1066,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
|
||||
if (branch == repository.repository.defaultBranch) {
|
||||
closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name).foreach {
|
||||
issueId =>
|
||||
getIssue(repository.owner, repository.name, issueId.toString).map { issue =>
|
||||
getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
|
||||
callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount)
|
||||
PluginRegistry().getIssueHooks
|
||||
.foreach(_.closedByCommitComment(issue, repository, message, loginAccount))
|
||||
|
||||
@@ -180,7 +180,7 @@ trait WikiControllerBase extends ControllerBase {
|
||||
loginAccount,
|
||||
form.message.getOrElse(""),
|
||||
Some(form.id)
|
||||
).map {
|
||||
).foreach {
|
||||
commitId =>
|
||||
updateLastActivityDate(repository.owner, repository.name)
|
||||
recordEditWikiPageActivity(
|
||||
@@ -224,7 +224,7 @@ trait WikiControllerBase extends ControllerBase {
|
||||
loginAccount,
|
||||
form.message.getOrElse(""),
|
||||
None
|
||||
).map {
|
||||
).foreach {
|
||||
commitId =>
|
||||
updateLastActivityDate(repository.owner, repository.name)
|
||||
recordCreateWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName)
|
||||
|
||||
@@ -196,7 +196,7 @@ object MergeService {
|
||||
refUpdate.setNewObjectId(newObjectId)
|
||||
refUpdate.setForceUpdate(force)
|
||||
refUpdate.setRefLogIdent(committer)
|
||||
refLogMessage.map(refUpdate.setRefLogMessage(_, true))
|
||||
refLogMessage.foreach(refUpdate.setRefLogMessage(_, true))
|
||||
refUpdate.update()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -67,7 +67,7 @@ trait RepositoryService { self: AccountService =>
|
||||
getAccountByUserName(newUserName).foreach { account =>
|
||||
(Repositories filter { t =>
|
||||
t.byRepository(oldUserName, oldRepositoryName)
|
||||
} firstOption).map { repository =>
|
||||
} firstOption).foreach { repository =>
|
||||
Repositories insert repository.copy(userName = newUserName, repositoryName = newRepositoryName)
|
||||
|
||||
val webHooks = RepositoryWebHooks.filter(_.byRepository(oldUserName, oldRepositoryName)).list
|
||||
|
||||
@@ -41,7 +41,7 @@ trait SystemSettingsService {
|
||||
}
|
||||
props.setProperty(LdapAuthentication, settings.ldapAuthentication.toString)
|
||||
if (settings.ldapAuthentication) {
|
||||
settings.ldap.map { ldap =>
|
||||
settings.ldap.foreach { ldap =>
|
||||
props.setProperty(LdapHost, ldap.host)
|
||||
ldap.port.foreach(x => props.setProperty(LdapPort, x.toString))
|
||||
ldap.bindDN.foreach(x => props.setProperty(LdapBindDN, x))
|
||||
@@ -58,11 +58,11 @@ trait SystemSettingsService {
|
||||
}
|
||||
props.setProperty(OidcAuthentication, settings.oidcAuthentication.toString)
|
||||
if (settings.oidcAuthentication) {
|
||||
settings.oidc.map { oidc =>
|
||||
settings.oidc.foreach { oidc =>
|
||||
props.setProperty(OidcIssuer, oidc.issuer.getValue)
|
||||
props.setProperty(OidcClientId, oidc.clientID.getValue)
|
||||
props.setProperty(OidcClientSecret, oidc.clientSecret.getValue)
|
||||
oidc.jwsAlgorithm.map { x =>
|
||||
oidc.jwsAlgorithm.foreach { x =>
|
||||
props.setProperty(OidcJwsAlgorithm, x.getName)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -296,9 +296,9 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
|
||||
createIssueComment(owner, repository, commit)
|
||||
// close issues
|
||||
if (refName(1) == "heads" && branchName == defaultBranch && command.getType == ReceiveCommand.Type.UPDATE) {
|
||||
getAccountByUserName(pusher).map { pusherAccount =>
|
||||
getAccountByUserName(pusher).foreach { pusherAccount =>
|
||||
closeIssuesFromMessage(commit.fullMessage, pusher, owner, repository).foreach { issueId =>
|
||||
getIssue(owner, repository, issueId.toString).map { issue =>
|
||||
getIssue(owner, repository, issueId.toString).foreach { issue =>
|
||||
callIssuesWebHook("closed", repositoryInfo, issue, baseUrl, pusherAccount)
|
||||
PluginRegistry().getIssueHooks
|
||||
.foreach(_.closedByCommitComment(issue, repositoryInfo, commit.fullMessage, pusherAccount))
|
||||
@@ -318,7 +318,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
|
||||
c.id == pull.commitIdTo
|
||||
}.isDefined) {
|
||||
markMergeAndClosePullRequest(pusher, owner, repository, pull)
|
||||
getAccountByUserName(pusher).map { pusherAccount =>
|
||||
getAccountByUserName(pusher).foreach { pusherAccount =>
|
||||
callPullRequestWebHook("closed", repositoryInfo, pull.issueId, baseUrl, pusherAccount)
|
||||
}
|
||||
}
|
||||
@@ -347,7 +347,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
|
||||
case ReceiveCommand.Type.CREATE | ReceiveCommand.Type.UPDATE |
|
||||
ReceiveCommand.Type.UPDATE_NONFASTFORWARD =>
|
||||
updatePullRequests(owner, repository, branchName)
|
||||
getAccountByUserName(pusher).map { pusherAccount =>
|
||||
getAccountByUserName(pusher).foreach { pusherAccount =>
|
||||
callPullRequestWebHookByRequestBranch(
|
||||
"synchronize",
|
||||
repositoryInfo,
|
||||
@@ -439,7 +439,7 @@ class WikiCommitHook(owner: String, repository: String, pusher: String, baseUrl:
|
||||
}
|
||||
}
|
||||
|
||||
commitIds.map {
|
||||
commitIds.foreach {
|
||||
case (oldCommitId, newCommitId) =>
|
||||
val commits = using(Git.open(Directory.getWikiRepositoryDir(owner, repository))) { git =>
|
||||
JGitUtil.getCommitLog(git, oldCommitId, newCommitId).flatMap { commit =>
|
||||
|
||||
@@ -390,7 +390,7 @@ object JGitUtil {
|
||||
lazy val newParentsMap = newCommit.getParents.map(_ -> newCommit).toMap
|
||||
useTreeWalk(newCommit) { walk =>
|
||||
while (walk.next) {
|
||||
rest.remove(walk.getNameString -> walk.getObjectId(0)).map {
|
||||
rest.remove(walk.getNameString -> walk.getObjectId(0)).foreach {
|
||||
case (tuple, _) =>
|
||||
if (newParentsMap.isEmpty) {
|
||||
nextResult +:= tupleAdd(tuple, newCommit)
|
||||
@@ -400,7 +400,7 @@ object JGitUtil {
|
||||
}
|
||||
}
|
||||
}
|
||||
rest.values.map {
|
||||
rest.values.foreach {
|
||||
case (tuple, parentsMap) =>
|
||||
val restParentsMap = parentsMap - newCommit
|
||||
if (restParentsMap.isEmpty) {
|
||||
|
||||
Reference in New Issue
Block a user