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

Merge pull request #2086 from xuwei-k/foreach

Browse Source 
use foreach instead of map
This commit is contained in:
Naoki Takezoe
2018-07-01 01:33:02 +09:00
committed by GitHub
parent 3466097ab1 670d23c3c6
commit 79e5fb5dd8
10 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -326,12 +326,12 @@ trait AccountManagementControllerBase extends ControllerBase {
protected def updateImage(userName: String, fileId: Option[String], clearImage: Boolean): Unit = protected def updateImage(userName: String, fileId: Option[String], clearImage: Boolean): Unit =
if (clearImage) { if (clearImage) {
getAccountByUserName(userName).flatMap(_.image).map { image => getAccountByUserName(userName).flatMap(_.image).foreach { image =>
new File(getUserUploadDir(userName), FileUtil.checkFilename(image)).delete() new File(getUserUploadDir(userName), FileUtil.checkFilename(image)).delete()
updateAvatarImage(userName, None) updateAvatarImage(userName, None)
} }
} else { } else {
fileId.map { fileId => fileId.foreach { fileId =>
val filename = "avatar." + FileUtil.getExtension(session.getAndRemove(Keys.Session.Upload(fileId)).get) val filename = "avatar." + FileUtil.getExtension(session.getAndRemove(Keys.Session.Upload(fileId)).get)
val uploadDir = getUserUploadDir(userName) val uploadDir = getUserUploadDir(userName)
if (!uploadDir.exists) { if (!uploadDir.exists) {

12
src/main/scala/gitbucket/core/controller/PullRequestsController.scala
View File

@@ -352,10 +352,10 @@ trait PullRequestsControllerBase extends ControllerBase {
// close issue by commit message // close issue by commit message
if (pullreq.requestBranch == repository.repository.defaultBranch) { if (pullreq.requestBranch == repository.repository.defaultBranch) {
commits.map { commit => commits.foreach { commit =>
closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name).foreach { closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name).foreach {
issueId => 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) callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount)
PluginRegistry().getIssueHooks PluginRegistry().getIssueHooks
.foreach( .foreach(
@@ -469,7 +469,7 @@ trait PullRequestsControllerBase extends ControllerBase {
commits.flatten.foreach { commit => commits.flatten.foreach { commit =>
closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name).foreach { closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name).foreach {
issueId => issueId =>
getIssue(owner, name, issueId.toString).map { issue => getIssue(owner, name, issueId.toString).foreach { issue =>
callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount) callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount)
PluginRegistry().getIssueHooks PluginRegistry().getIssueHooks
.foreach(_.closedByCommitComment(issue, repository, commit.fullMessage, loginAccount)) .foreach(_.closedByCommitComment(issue, repository, commit.fullMessage, loginAccount))
@@ -483,14 +483,14 @@ trait PullRequestsControllerBase extends ControllerBase {
owner, owner,
name name
).foreach { issueId => ).foreach { issueId =>
getIssue(owner, name, issueId.toString).map { issue => getIssue(owner, name, issueId.toString).foreach { issue =>
callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount) callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount)
PluginRegistry().getIssueHooks PluginRegistry().getIssueHooks
.foreach(_.closedByCommitComment(issue, repository, issueContent, loginAccount)) .foreach(_.closedByCommitComment(issue, repository, issueContent, loginAccount))
} }
} }
closeIssuesFromMessage(form.message, loginAccount.userName, owner, name).foreach { issueId => 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) callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount)
PluginRegistry().getIssueHooks PluginRegistry().getIssueHooks
.foreach(_.closedByCommitComment(issue, repository, issueContent, loginAccount)) .foreach(_.closedByCommitComment(issue, repository, issueContent, loginAccount))
@@ -743,7 +743,7 @@ trait PullRequestsControllerBase extends ControllerBase {
// insert labels // insert labels
if (manageable) { if (manageable) {
form.labelNames.map { value => form.labelNames.foreach { value =>
val labels = getLabels(owner, name) val labels = getLabels(owner, name)
value.split(",").foreach { labelName => value.split(",").foreach { labelName =>
labels.find(_.labelName == labelName).map { label => labels.find(_.labelName == labelName).map { label =>

2
src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
View File

@@ -229,7 +229,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
post("/:owner/:repository/settings/collaborators")(ownerOnly { repository => post("/:owner/:repository/settings/collaborators")(ownerOnly { repository =>
val collaborators = params("collaborators") val collaborators = params("collaborators")
removeCollaborators(repository.owner, repository.name) removeCollaborators(repository.owner, repository.name)
collaborators.split(",").withFilter(_.nonEmpty).map { collaborator => collaborators.split(",").withFilter(_.nonEmpty).foreach { collaborator =>
val userName :: role :: Nil = collaborator.split(":").toList val userName :: role :: Nil = collaborator.split(":").toList
addCollaborator(repository.owner, repository.name, userName, role) addCollaborator(repository.owner, repository.name, userName, role)
} }

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

@@ -1066,7 +1066,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
if (branch == repository.repository.defaultBranch) { if (branch == repository.repository.defaultBranch) {
closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name).foreach { closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name).foreach {
issueId => 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) callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount)
PluginRegistry().getIssueHooks PluginRegistry().getIssueHooks
.foreach(_.closedByCommitComment(issue, repository, message, loginAccount)) .foreach(_.closedByCommitComment(issue, repository, message, loginAccount))

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

@@ -180,7 +180,7 @@ trait WikiControllerBase extends ControllerBase {
loginAccount, loginAccount,
form.message.getOrElse(""), form.message.getOrElse(""),
Some(form.id) Some(form.id)
).map { ).foreach {
commitId => commitId =>
updateLastActivityDate(repository.owner, repository.name) updateLastActivityDate(repository.owner, repository.name)
recordEditWikiPageActivity( recordEditWikiPageActivity(
@@ -224,7 +224,7 @@ trait WikiControllerBase extends ControllerBase {
loginAccount, loginAccount,
form.message.getOrElse(""), form.message.getOrElse(""),
None None
).map { ).foreach {
commitId => commitId =>
updateLastActivityDate(repository.owner, repository.name) updateLastActivityDate(repository.owner, repository.name)
recordCreateWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName) recordCreateWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName)

2
src/main/scala/gitbucket/core/service/MergeService.scala
View File

@@ -196,7 +196,7 @@ object MergeService {
refUpdate.setNewObjectId(newObjectId) refUpdate.setNewObjectId(newObjectId)
refUpdate.setForceUpdate(force) refUpdate.setForceUpdate(force)
refUpdate.setRefLogIdent(committer) refUpdate.setRefLogIdent(committer)
refLogMessage.map(refUpdate.setRefLogMessage(_, true)) refLogMessage.foreach(refUpdate.setRefLogMessage(_, true))
refUpdate.update() refUpdate.update()
} }
} }

2
src/main/scala/gitbucket/core/service/RepositoryService.scala
View File

@@ -67,7 +67,7 @@ trait RepositoryService { self: AccountService =>
getAccountByUserName(newUserName).foreach { account => getAccountByUserName(newUserName).foreach { account =>
(Repositories filter { t => (Repositories filter { t =>
t.byRepository(oldUserName, oldRepositoryName) t.byRepository(oldUserName, oldRepositoryName)
} firstOption).map { repository => } firstOption).foreach { repository =>
Repositories insert repository.copy(userName = newUserName, repositoryName = newRepositoryName) Repositories insert repository.copy(userName = newUserName, repositoryName = newRepositoryName)
val webHooks = RepositoryWebHooks.filter(_.byRepository(oldUserName, oldRepositoryName)).list val webHooks = RepositoryWebHooks.filter(_.byRepository(oldUserName, oldRepositoryName)).list

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

@@ -41,7 +41,7 @@ trait SystemSettingsService {
} }
props.setProperty(LdapAuthentication, settings.ldapAuthentication.toString) props.setProperty(LdapAuthentication, settings.ldapAuthentication.toString)
if (settings.ldapAuthentication) { if (settings.ldapAuthentication) {
settings.ldap.map { ldap => settings.ldap.foreach { ldap =>
props.setProperty(LdapHost, ldap.host) props.setProperty(LdapHost, ldap.host)
ldap.port.foreach(x => props.setProperty(LdapPort, x.toString)) ldap.port.foreach(x => props.setProperty(LdapPort, x.toString))
ldap.bindDN.foreach(x => props.setProperty(LdapBindDN, x)) ldap.bindDN.foreach(x => props.setProperty(LdapBindDN, x))
@@ -58,11 +58,11 @@ trait SystemSettingsService {
} }
props.setProperty(OidcAuthentication, settings.oidcAuthentication.toString) props.setProperty(OidcAuthentication, settings.oidcAuthentication.toString)
if (settings.oidcAuthentication) { if (settings.oidcAuthentication) {
settings.oidc.map { oidc => settings.oidc.foreach { oidc =>
props.setProperty(OidcIssuer, oidc.issuer.getValue) props.setProperty(OidcIssuer, oidc.issuer.getValue)
props.setProperty(OidcClientId, oidc.clientID.getValue) props.setProperty(OidcClientId, oidc.clientID.getValue)
props.setProperty(OidcClientSecret, oidc.clientSecret.getValue) props.setProperty(OidcClientSecret, oidc.clientSecret.getValue)
oidc.jwsAlgorithm.map { x => oidc.jwsAlgorithm.foreach { x =>
props.setProperty(OidcJwsAlgorithm, x.getName) props.setProperty(OidcJwsAlgorithm, x.getName)
} }
} }

10
src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
View File

@@ -296,9 +296,9 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
createIssueComment(owner, repository, commit) createIssueComment(owner, repository, commit)
// close issues // close issues
if (refName(1) == "heads" && branchName == defaultBranch && command.getType == ReceiveCommand.Type.UPDATE) { 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 => 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) callIssuesWebHook("closed", repositoryInfo, issue, baseUrl, pusherAccount)
PluginRegistry().getIssueHooks PluginRegistry().getIssueHooks
.foreach(_.closedByCommitComment(issue, repositoryInfo, commit.fullMessage, pusherAccount)) .foreach(_.closedByCommitComment(issue, repositoryInfo, commit.fullMessage, pusherAccount))
@@ -318,7 +318,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
c.id == pull.commitIdTo c.id == pull.commitIdTo
}.isDefined) { }.isDefined) {
markMergeAndClosePullRequest(pusher, owner, repository, pull) markMergeAndClosePullRequest(pusher, owner, repository, pull)
getAccountByUserName(pusher).map { pusherAccount => getAccountByUserName(pusher).foreach { pusherAccount =>
callPullRequestWebHook("closed", repositoryInfo, pull.issueId, baseUrl, 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 | case ReceiveCommand.Type.CREATE | ReceiveCommand.Type.UPDATE |
ReceiveCommand.Type.UPDATE_NONFASTFORWARD => ReceiveCommand.Type.UPDATE_NONFASTFORWARD =>
updatePullRequests(owner, repository, branchName) updatePullRequests(owner, repository, branchName)
getAccountByUserName(pusher).map { pusherAccount => getAccountByUserName(pusher).foreach { pusherAccount =>
callPullRequestWebHookByRequestBranch( callPullRequestWebHookByRequestBranch(
"synchronize", "synchronize",
repositoryInfo, repositoryInfo,
@@ -439,7 +439,7 @@ class WikiCommitHook(owner: String, repository: String, pusher: String, baseUrl:
} }
} }
commitIds.map { commitIds.foreach {
case (oldCommitId, newCommitId) => case (oldCommitId, newCommitId) =>
val commits = using(Git.open(Directory.getWikiRepositoryDir(owner, repository))) { git => val commits = using(Git.open(Directory.getWikiRepositoryDir(owner, repository))) { git =>
JGitUtil.getCommitLog(git, oldCommitId, newCommitId).flatMap { commit => JGitUtil.getCommitLog(git, oldCommitId, newCommitId).flatMap { commit =>

4
src/main/scala/gitbucket/core/util/JGitUtil.scala
View File

@@ -390,7 +390,7 @@ object JGitUtil {
lazy val newParentsMap = newCommit.getParents.map(_ -> newCommit).toMap lazy val newParentsMap = newCommit.getParents.map(_ -> newCommit).toMap
useTreeWalk(newCommit) { walk => useTreeWalk(newCommit) { walk =>
while (walk.next) { while (walk.next) {
rest.remove(walk.getNameString -> walk.getObjectId(0)).map { rest.remove(walk.getNameString -> walk.getObjectId(0)).foreach {
case (tuple, _) => case (tuple, _) =>
if (newParentsMap.isEmpty) { if (newParentsMap.isEmpty) {
nextResult +:= tupleAdd(tuple, newCommit) nextResult +:= tupleAdd(tuple, newCommit)
@@ -400,7 +400,7 @@ object JGitUtil {
} }
} }
} }
rest.values.map { rest.values.foreach {
case (tuple, parentsMap) => case (tuple, parentsMap) =>
val restParentsMap = parentsMap - newCommit val restParentsMap = parentsMap - newCommit
if (restParentsMap.isEmpty) { if (restParentsMap.isEmpty) {