From 670d23c3c6d1771d6e6d2da129da8b5552346489 Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Sat, 30 Jun 2018 15:34:39 +0900 Subject: [PATCH] use foreach instead of map --- .../gitbucket/core/controller/ControllerBase.scala | 4 ++-- .../core/controller/PullRequestsController.scala | 12 ++++++------ .../controller/RepositorySettingsController.scala | 2 +- .../core/controller/RepositoryViewerController.scala | 2 +- .../gitbucket/core/controller/WikiController.scala | 4 ++-- .../scala/gitbucket/core/service/MergeService.scala | 2 +- .../gitbucket/core/service/RepositoryService.scala | 2 +- .../core/service/SystemSettingsService.scala | 6 +++--- .../core/servlet/GitRepositoryServlet.scala | 10 +++++----- src/main/scala/gitbucket/core/util/JGitUtil.scala | 4 ++-- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/main/scala/gitbucket/core/controller/ControllerBase.scala b/src/main/scala/gitbucket/core/controller/ControllerBase.scala index 107f4f134..94c42f61f 100644 --- a/src/main/scala/gitbucket/core/controller/ControllerBase.scala +++ b/src/main/scala/gitbucket/core/controller/ControllerBase.scala @@ -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) { diff --git a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala index 72bedbd1c..52e223c1c 100644 --- a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala +++ b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala @@ -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 => diff --git a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala index adfdfc49f..0807cd419 100644 --- a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala +++ b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala @@ -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) } diff --git a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala index ce03dc811..bcc20686c 100644 --- a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala +++ b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala @@ -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)) diff --git a/src/main/scala/gitbucket/core/controller/WikiController.scala b/src/main/scala/gitbucket/core/controller/WikiController.scala index 229897161..319f19f55 100644 --- a/src/main/scala/gitbucket/core/controller/WikiController.scala +++ b/src/main/scala/gitbucket/core/controller/WikiController.scala @@ -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) diff --git a/src/main/scala/gitbucket/core/service/MergeService.scala b/src/main/scala/gitbucket/core/service/MergeService.scala index 0c907ce7c..3eab6b331 100644 --- a/src/main/scala/gitbucket/core/service/MergeService.scala +++ b/src/main/scala/gitbucket/core/service/MergeService.scala @@ -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() } } diff --git a/src/main/scala/gitbucket/core/service/RepositoryService.scala b/src/main/scala/gitbucket/core/service/RepositoryService.scala index 60f2e532d..8b15a68b3 100644 --- a/src/main/scala/gitbucket/core/service/RepositoryService.scala +++ b/src/main/scala/gitbucket/core/service/RepositoryService.scala @@ -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 diff --git a/src/main/scala/gitbucket/core/service/SystemSettingsService.scala b/src/main/scala/gitbucket/core/service/SystemSettingsService.scala index df9109a6a..e4247628e 100644 --- a/src/main/scala/gitbucket/core/service/SystemSettingsService.scala +++ b/src/main/scala/gitbucket/core/service/SystemSettingsService.scala @@ -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) } } diff --git a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala index bbfc469ff..722bf5dcd 100644 --- a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala +++ b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala @@ -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 => diff --git a/src/main/scala/gitbucket/core/util/JGitUtil.scala b/src/main/scala/gitbucket/core/util/JGitUtil.scala index b9f08304f..0381fdbb9 100644 --- a/src/main/scala/gitbucket/core/util/JGitUtil.scala +++ b/src/main/scala/gitbucket/core/util/JGitUtil.scala @@ -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) {